Convert x11-toolkits/libxfce4gui and all dependent ports to USES=libtool.

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.

5 files changed, 8 insertions, 12 deletions

diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
index a1c5ebb46186..76f3981e8fe6 100644
--- 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
index 034a798f673c..17441067a799 100644
--- 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
index aa0afaf6571b..36285518df89 100644
--- 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
index f3f44bf634d7..1bc464a25a89 100644
--- 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
index 162d8ab4999d..3592c515be2d 100644
--- 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