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

8 files changed, 12 insertions, 85 deletions

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