Fix the build of those ports. Remove USE_AUTOTOOLS and switch

to USE=autoreconf:build instead. Other minor changes here and
there.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@20008 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 29 insertions, 263 deletions

diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index a2d232771..9c32c7202 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -17,14 +17,13 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
-USES=		gettext libtool gmake pathfix pkgconfig python:build \
+USES=		autoreconf:build gettext libtool gmake pathfix pkgconfig python:build \
 		shebangfix
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 		intlhack
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -36,6 +35,6 @@ python_OLD_CMD=	/usr/bin/env python
 python_CMD=	${PYTHON_CMD}
 
 pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/lang/cjs/pkg-plist b/lang/cjs/pkg-plist
index 90dbd62b2..a5f98e32c 100644
--- a/lang/cjs/pkg-plist
+++ b/lang/cjs/pkg-plist
@@ -61,13 +61,3 @@ libdata/pkgconfig/cjs-internals-1.0.pc
 %%DATADIR%%-1.0/tweener/equations.js
 %%DATADIR%%-1.0/tweener/tweenList.js
 %%DATADIR%%-1.0/tweener/tweener.js
-@dirrm lib/cjs/girepository-1.0
-@dirrm lib/cjs-1.0
-@dirrm lib/cjs
-@dirrm include/cjs-1.0/gi
-@dirrm include/cjs-1.0/cjs-dbus
-@dirrm include/cjs-1.0/cjs
-@dirrm include/cjs-1.0
-@dirrm %%DATADIR%%-1.0/tweener
-@dirrm %%DATADIR%%-1.0/overrides
-@dirrm %%DATADIR%%-1.0
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 8bc19f62f..1b0f1422f 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -36,12 +36,12 @@ RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
 		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-USES=		gettext gmake libtool pathfix python pkgconfig
+USES=		autoreconf:build gettext gmake libtool pathfix \
+		python:2 pkgconfig
 USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
 		gtk30 intlhack libgnomekbd
 USE_XORG=	x11 xfixes sm
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-compile-warnings=no
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 3f93cdf6c..c4c1d20bf 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -276,28 +276,3 @@ share/locale/vi/LC_MESSAGES/cinnamon-control-center-timezones.mo
 share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-timezones.mo
 share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-timezones.mo
 share/polkit-1/rules.d/cinnamon-control-center.rules
-@dirrmtry share/locale/ilo/LC_MESSAGES
-@dirrmtry share/locale/ilo
-@dirrm share/cinnamon-control-center/ui/datetime
-@dirrm share/cinnamon-control-center/ui
-@dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices
-@dirrm share/cinnamon-control-center/icons/hicolor/48x48
-@dirrm share/cinnamon-control-center/icons/hicolor/32x32/status
-@dirrm share/cinnamon-control-center/icons/hicolor/32x32/devices
-@dirrm share/cinnamon-control-center/icons/hicolor/32x32
-@dirrm share/cinnamon-control-center/icons/hicolor/24x24/status
-@dirrm share/cinnamon-control-center/icons/hicolor/24x24/devices
-@dirrm share/cinnamon-control-center/icons/hicolor/24x24
-@dirrm share/cinnamon-control-center/icons/hicolor/22x22/status
-@dirrm share/cinnamon-control-center/icons/hicolor/22x22
-@dirrm share/cinnamon-control-center/icons/hicolor/16x16/status
-@dirrm share/cinnamon-control-center/icons/hicolor/16x16/devices
-@dirrm share/cinnamon-control-center/icons/hicolor/16x16
-@dirrm share/cinnamon-control-center/icons/hicolor
-@dirrm share/cinnamon-control-center/icons
-@dirrm share/cinnamon-control-center/datetime
-@dirrm share/cinnamon-control-center
-@dirrm lib/cinnamon-control-center-1/panels
-@dirrm lib/cinnamon-control-center-1
-@dirrm include/cinnamon-control-center-1/libcinnamon-control-center
-@dirrm include/cinnamon-control-center-1
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index eecc9ab76..c40cb5895 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -28,12 +28,12 @@ LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 RUN_DEPENDS=	cinnamon-session:${PORTSDIR}/x11/cinnamon-session \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		autoreconf:build gettext gmake libtool pathfix \
+		pkgconfig tar:xz
 USE_GNOME=	gnomehier gnomeprefix intlhack libgnomekbd \
 		libxslt:build
 USE_XORG=	xxf86misc
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/cinnamon-settings-daemon/pkg-plist b/sysutils/cinnamon-settings-daemon/pkg-plist
index 86e297022..4302cc4cd 100644
--- a/sysutils/cinnamon-settings-daemon/pkg-plist
+++ b/sysutils/cinnamon-settings-daemon/pkg-plist
@@ -181,62 +181,5 @@ share/locale/zh_TW/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/cinnamon-settings-daemon.mo
 share/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy
 share/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
-@dirrm %%DATADIR%%/icons/hicolor/64x64
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
 @comment this is done in libcanberra
 @comment @dirrm lib/cinnamon-settings-daemon-3.0
-@dirrm %%DATADIR%%-3.0
-@dirrm %%DATADIR%%
-@dirrm lib/cinnamon-settings-daemon-3.0
-@dirrm include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon
-@dirrm include/cinnamon-settings-daemon-3.0
-@dirrmtry etc/cinnamon-settings-daemon/xrandr
-@dirrmtry etc/cinnamon-settings-daemon
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 39149531b..4bc733b80 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -23,12 +23,12 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USES=		desktop-file-utils gettext gmake libtool pathfix \
+USES=		autoreconf:build desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig python:2 shared-mime-info
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
 		libxml2 pygobject3
+GNU_CONFIGURE=	yes	
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -86,6 +86,6 @@ post-patch:
 		${WRKSRC}/data/merge_action_strings
 
 pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index 7ab73de99..1c8c6f0a1 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -68,20 +68,3 @@ share/mime/packages/nemo.xml
 %%DATADIR%%/nemo-extras.placeholder
 %%DATADIR%%/nemo-suggested.placeholder
 share/polkit-1/actions/org.nemo.root.policy
-@dirrm %%DATADIR%%/icons/hicolor/48x48/emblems
-@dirrm %%DATADIR%%/icons/hicolor/48x48
-@dirrm %%DATADIR%%/icons/hicolor/24x24/emblems
-@dirrm %%DATADIR%%/icons/hicolor/24x24
-@dirrm %%DATADIR%%/icons/hicolor/16x16/emblems
-@dirrm %%DATADIR%%/icons/hicolor/16x16
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/actions
-@dirrm %%DATADIR%%
-@dirrmtry share/mime/application
-@dirrmtry share/gtksourceview-3.0/language-specs
-@dirrmtry share/gtksourceview-3.0
-@dirrmtry share/gtksourceview-2.0/language-specs
-@dirrmtry share/gtksourceview-2.0
-@dirrm include/nemo/libnemo-extension
-@dirrm include/nemo
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 1106a3487..d627f0ed2 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -21,23 +21,26 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop
 RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity
 
-USES=		execinfo gettext libtool gmake pathfix pkgconfig python
+USES=		autoreconf:build execinfo gettext libtool gmake \
+		pathfix pkgconfig python:2
 USE_GNOME=	gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \
-		introspection:build
-USE_AUTOTOOLS=	libtoolize autoconf automake
+		intlhack introspection:build
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
-CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=unused-function
+CFLAGS+=	-I${LOCALBASE}/include -Wno-error=unused-function
 LDFLAGS+=	-L${LOCALBASE}/lib
 PATHFIX_MAKEFILEIN=	Makefile.am
 CONFIGURE_ENV=	LIBS="-lexecinfo"
 CONFIGURE_ARGS=	--enable-compile-warnings=maximum
+MAKE_ARGS=	V=1
 GLIB_SCHEMAS=	org.cinnamon.muffin.gschema.xml
 INSTALL_TARGET=	install-strip
 
 pre-configure:
-		@cd ${WRKSRC} && ${SH} autogen.sh
+		@cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} autogen.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|REQUIRED_AUTOMAKE_VERSION=1.10|REQUIRED_AUTOMAKE_VERSION=1.14|g' \
diff --git a/x11-wm/muffin/pkg-plist b/x11-wm/muffin/pkg-plist
index 0b17a06e5..7817f3093 100644
--- a/x11-wm/muffin/pkg-plist
+++ b/x11-wm/muffin/pkg-plist
@@ -134,57 +134,3 @@ share/locale/zh_CN/LC_MESSAGES/muffin.mo
 share/locale/zh_HK/LC_MESSAGES/muffin.mo
 share/locale/zh_TW/LC_MESSAGES/muffin.mo
 %%DATADIR%%/icons/muffin-window-demo.png
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ig/LC_MESSAGES
-@dirrmtry share/locale/ig
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/ha/LC_MESSAGES
-@dirrmtry share/locale/ha
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm lib/muffin/plugins
-@dirrm lib/muffin
-@dirrm include/muffin/meta
-@dirrm include/muffin
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 4d8d9c7cd..7ae88f1bf 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -18,11 +18,10 @@ RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
 USE_XORG=	x11 xrandr xext
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix gtk30 introspection:build
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 PATHFIX_MAKEFILEIN=	Makefile.am
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index 9b4ea42d8..4d21acebe 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -17,18 +17,18 @@ BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
-USES=		gettext gmake libtool pathfix pkgconfig python tar:xz
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig \
+		python:2 tar:xz
 USE_GNOME=	gnomehier gnomemenus3 gnomeprefix gtk30 intlhack \
 		introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-menus/pkg-plist b/x11/cinnamon-menus/pkg-plist
index 1b9f5d7ac..fead2ebd7 100644
--- a/x11/cinnamon-menus/pkg-plist
+++ b/x11/cinnamon-menus/pkg-plist
@@ -6,4 +6,3 @@ lib/libcinnamon-menu-3.so.0.0.1
 lib/girepository-1.0/CMenu-3.0.typelib
 libdata/pkgconfig/libcinnamon-menu-3.0.pc
 share/gir-1.0/CMenu-3.0.gir
-@dirrm include/cinnamon-menus-3.0
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 152f90374..fe6c4ae21 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper \
 		gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		gnome-keyring>=0:${PORTSDIR}/security/gnome-keyring
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig tar:xz
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
-USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libgnomekbd libxml2
+USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index 651438099..5afe83ed7 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -19,13 +19,13 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
 		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
-USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		autoreconf:build execinfo gettext gmake libtool \
+		pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intlhack
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
-USE_GNOME=	gnomeprefix gtk30 intltool
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtoolize autoconf automake
 PATHFIX_MAKEFILEIN=	Makefile.am
 CONFIGURE_ARGS=	--disable-docbook-docs
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
@@ -36,6 +36,6 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.cinnamon.SessionManager.gschema.xml
 
 pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-session/pkg-plist b/x11/cinnamon-session/pkg-plist
index 095b03294..f4e6359b0 100644
--- a/x11/cinnamon-session/pkg-plist
+++ b/x11/cinnamon-session/pkg-plist
@@ -120,14 +120,3 @@ share/locale/zh_CN/LC_MESSAGES/cinnamon-session-3.0.mo
 share/locale/zh_HK/LC_MESSAGES/cinnamon-session-3.0.mo
 share/locale/zh_TW/LC_MESSAGES/cinnamon-session-3.0.mo
 share/locale/zu/LC_MESSAGES/cinnamon-session-3.0.mo
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/ig/LC_MESSAGES
-@dirrmtry share/locale/ig
-@dirrmtry share/locale/ha/LC_MESSAGES
-@dirrmtry share/locale/ha
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry %%DATADIR%%
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index a22483a0f..915727d4b 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -38,12 +38,11 @@ RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 
 WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
 
-USES=		gettext gmake libtool pathfix pkgconfig python shebangfix
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig python shebangfix
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 \
 		gnomeprefix gtk30 intlhack introspection:build
 # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
 SHEBANG_FILES=	files/usr/bin/cinnamon2d
-USE_AUTOTOOLS=	libtoolize autoconf automake
 USE_XORG=	x11 xfixes sm
 USE_GSTREAMER=	theora vp8 ogg
 INSTALLS_ICONS=	yes
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index 123bd1510..f94dc7163 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -683,61 +683,3 @@ share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
-@dirrm %%DATADIR%%/theme
-@dirrm %%DATADIR%%/search_providers
-@dirrm %%DATADIR%%/js/ui/appSwitcher
-@dirrm %%DATADIR%%/js/ui
-@dirrm %%DATADIR%%/js/perf
-@dirrm %%DATADIR%%/js/misc
-@dirrm %%DATADIR%%/js
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/faces
-@dirrm %%DATADIR%%/desklets/photoframe@cinnamon.org
-@dirrm %%DATADIR%%/desklets/launcher@cinnamon.org
-@dirrm %%DATADIR%%/desklets/clock@cinnamon.org
-@dirrm %%DATADIR%%/desklets
-@dirrm %%DATADIR%%/bumpmaps
-@dirrm %%DATADIR%%/applets/xrandr@cinnamon.org
-@dirrm %%DATADIR%%/applets/workspace-switcher@cinnamon.org
-@dirrm %%DATADIR%%/applets/windows-quick-list@cinnamon.org
-@dirrm %%DATADIR%%/applets/window-list@cinnamon.org
-@dirrm %%DATADIR%%/applets/user@cinnamon.org
-@dirrm %%DATADIR%%/applets/trash@cinnamon.org
-@dirrm %%DATADIR%%/applets/systray@cinnamon.org
-@dirrm %%DATADIR%%/applets/spacer@cinnamon.org
-@dirrm %%DATADIR%%/applets/sound@cinnamon.org
-@dirrm %%DATADIR%%/applets/show-desktop@cinnamon.org
-@dirrm %%DATADIR%%/applets/settings@cinnamon.org
-@dirrm %%DATADIR%%/applets/settings-example@cinnamon.org
-@dirrm %%DATADIR%%/applets/separator@cinnamon.org
-@dirrm %%DATADIR%%/applets/scale@cinnamon.org
-@dirrm %%DATADIR%%/applets/removable-drives@cinnamon.org
-@dirrm %%DATADIR%%/applets/recent@cinnamon.org
-@dirrm %%DATADIR%%/applets/power@cinnamon.org
-@dirrm %%DATADIR%%/applets/panel-launchers@cinnamon.org
-@dirrm %%DATADIR%%/applets/notifications@cinnamon.org
-@dirrm %%DATADIR%%/applets/network@cinnamon.org
-@dirrm %%DATADIR%%/applets/menu@cinnamon.org
-@dirrm %%DATADIR%%/applets/keyboard@cinnamon.org/flags
-@dirrm %%DATADIR%%/applets/keyboard@cinnamon.org
-@dirrm %%DATADIR%%/applets/expo@cinnamon.org
-@dirrm %%DATADIR%%/applets/calendar@cinnamon.org
-@dirrm %%DATADIR%%/applets/brightness@cinnamon.org
-@dirrm %%DATADIR%%/applets/a11y@cinnamon.org
-@dirrm %%DATADIR%%/applets
-@dirrm %%DATADIR%%-session/sessions
-@dirrm %%DATADIR%%
-@dirrm libexec/cinnamon
-@dirrm lib/cinnamon-settings/modules
-@dirrm lib/cinnamon-settings/data/spices
-@dirrm lib/cinnamon-settings/data
-@dirrm lib/cinnamon-settings/bin
-@dirrm lib/cinnamon-settings-users
-@dirrm lib/cinnamon-settings
-@dirrm lib/cinnamon-screensaver-lock-dialog
-@dirrm lib/cinnamon-menu-editor/cme
-@dirrm lib/cinnamon-menu-editor
-@dirrm lib/cinnamon-looking-glass
-@dirrm lib/cinnamon-json-makepot
-@dirrm lib/cinnamon-desktop-editor
-@dirrm lib/cinnamon