Convert x11-toolkits/libxfce4gui and all dependent ports to USES=libt…

…ool. And USES=tar:bzip2 here and there. deskutils/xfce4-notification-daemon: - Don't patch Makefile.am. - Link with -lgmodule-2.0 explicitly now that libgtk-x11-2.0.la does not imply it. x11/xfce4-wmdock-plugin: - Make it fetchable.
yurkis · May 6, 2014 · 1f99368 · 1f99368
1 parent b73bb11
commit 1f99368
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 47 deletions.
diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-generic-slider
 PORTVERSION=	0.0.20100827
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	CRITICAL/
 

diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	1.7.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -17,9 +17,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		gettext pkgconfig gmake
-USE_AUTOTOOLS=	libtool
+USES=		gettext gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libgui libutil panel xfconf
 INSTALLS_ICONS=	yes

diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -3,9 +3,9 @@ bin/xfce4-notes-settings
 bin/xfce4-popup-notes
 etc/xdg/autostart/xfce4-notes-autostart.desktop
 lib/xfce4/panel-plugins/libnotes.a
-lib/xfce4/panel-plugins/libnotes.la
 lib/xfce4/panel-plugins/libnotes.so
 lib/xfce4/panel-plugins/libnotes.so.0
+lib/xfce4/panel-plugins/libnotes.so.0.0.0
 share/applications/xfce4-notes.desktop
 share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
 share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png

diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	notification-daemon
 PORTVERSION=	0.3.7
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	CRITICAL/
 PKGNAMEPREFIX=	xfce4-
@@ -22,7 +22,7 @@ RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	librsvg2
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil libgui
@@ -59,12 +59,11 @@ CONFIGURE_ARGS+=	--disable-close-button
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(notification-daemon-xfce\)-1.0|\1|' \
-		${WRKSRC}/src/daemon/Makefile.am \
 		${WRKSRC}/src/daemon/Makefile.in \
-		${WRKSRC}/src/themes/bubble/Makefile.am \
 		${WRKSRC}/src/themes/bubble/Makefile.in \
-		${WRKSRC}/src/themes/standard/Makefile.am \
 		${WRKSRC}/src/themes/standard/Makefile.in
+	@${REINPLACE_CMD} '/GTK_LIBS =/s/$$/ -lgmodule-2.0/' \
+		${WRKSRC}/src/daemon/Makefile.in
 .if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e 's|\(USE_NLS=\)yes|\1no|' ${WRKSRC}/configure
 .endif

diff --git a/deskutils/xfce4-notification-daemon/pkg-plist b/deskutils/xfce4-notification-daemon/pkg-plist
@@ -1,6 +1,5 @@
 bin/notification-settings
 lib/xfce4/notification-daemon-xfce/engines/libstandard.a
-lib/xfce4/notification-daemon-xfce/engines/libstandard.la
 lib/xfce4/notification-daemon-xfce/engines/libstandard.so
 libexec/xfce4/notification-daemon-xfce
 share/applications/notification-settings.desktop

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.6.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/archive/xfprint/${PORTVERSION:R}
@@ -20,8 +20,7 @@ RUN_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_BZIP2=	yes
-USES=		gettext pkgconfig gmake pathfix
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libutil xfconf

diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
@@ -8,15 +8,13 @@ include/xfce4/libxfprint/printer.h
 include/xfce4/libxfprint/printer-list-window.h
 include/xfce4/libxfprint/printer-queue-window.h
 include/xfce4/libxfprint/printing-system.h
-lib/libxfprint.so.0
-lib/libxfprint.so
-lib/libxfprint.la
 lib/libxfprint.a
+lib/libxfprint.so
+lib/libxfprint.so.0
+lib/libxfprint.so.0.0.1
 %%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.a
-%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
 %%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.so
 %%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.a
-%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.la
 %%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.so
 libdata/pkgconfig/xfprint-1.0.pc
 share/applications/xfprint.desktop

diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-minicmd-plugin
 PORTVERSION=	0.4
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
@@ -12,11 +12,8 @@ MAINTAINER=	[email protected]
 COMMENT=	Displays a mini-command line on the xfce4-panel
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	libgui configenv panel
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-minicmd-plugin/pkg-plist b/sysutils/xfce4-minicmd-plugin/pkg-plist
@@ -1,5 +1,4 @@
 lib/xfce4/panel-plugins/libminicmd.a
-lib/xfce4/panel-plugins/libminicmd.la
 lib/xfce4/panel-plugins/libminicmd.so
 share/xfce4/panel-plugins/minicmd.desktop
 @dirrmtry share/xfce4/panel-plugins

diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxfce4gui
 PORTVERSION=	4.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/archive/libxfcegui4/${PORTVERSION:R}
@@ -13,15 +13,13 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	[email protected]
 COMMENT=	Various Gtk widgets for the Xfce Desktop
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_BZIP2=	yes
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack libglade2
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil
 USE_XORG=	sm x11
-USES=	pathfix pkgconfig gmake
 
 CONFIGURE_ARGS+=--disable-gladeui
 

diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
@@ -44,11 +44,9 @@ include/xfce4/libxfcegui4/xfce_systemtray.h
 include/xfce4/libxfcegui4/xfce_togglebutton.h
 include/xfce4/libxfcegui4/xinerama.h
 lib/libxfcegui4.a
-lib/libxfcegui4.la
 lib/libxfcegui4.so
-lib/libxfcegui4.so.7
+lib/libxfcegui4.so.4.3.0
 lib/libglade/2.0/libxfce4.a
-lib/libglade/2.0/libxfce4.la
 lib/libglade/2.0/libxfce4.so
 libdata/pkgconfig/libxfcegui4-1.0.pc
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html

diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-quicklauncher-plugin
 PORTVERSION=	1.9.4
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -15,8 +15,7 @@ COMMENT=	Quicklauncher plugin for Xfce
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		gettext pkgconfig gmake
+USES=		gettext gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libgui panel
 

diff --git a/x11/xfce4-quicklauncher-plugin/pkg-plist b/x11/xfce4-quicklauncher-plugin/pkg-plist
@@ -1,4 +1,3 @@
-lib/xfce4/panel-plugins/libquicklauncher.la
 lib/xfce4/panel-plugins/libquicklauncher.so
 share/locale/cs/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
 share/locale/el/LC_MESSAGES/xfce4-quicklauncher-plugin.mo

diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	verve-plugin
 PORTVERSION=	1.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
@@ -18,12 +18,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20 intltool intlhack
 USE_XFCE=	configenv panel libexo libgui libutil
-USES=		pkgconfig pathfix gmake
 
 OPTIONS_DEFINE=	NLS DBUS
 OPTIONS_DEFAULT=	NLS DBUS

diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
@@ -3,16 +3,16 @@
 
 PORTNAME=	xfce4-wmdock-plugin
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.ibh.de/~ellguth/develop/
+MASTER_SITES=	XFCE/src/panel-plugins/xfce4-wmdock-plugin/0.6
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	[email protected]
 COMMENT=	WMdock plugin for Xfce
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gettext pkgconfig gmake
+USES=		gettext gmake libtool pkgconfig tar:bzip2
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20 intltool intlhack libwnck
 USE_XFCE=	configenv libgui libutil panel

diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-xfapplet-plugin
 PORTVERSION=	0.1.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -17,8 +17,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libpanelappletmm-2.6.so:${PORTSDIR}/x11-toolkits/libpanelappletmm
 
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack orbit2
 USE_XFCE=	configenv libgui libutil panel