Conversion to a single libtool environment.

Approved by:	portmgr (kris)

8 files changed, 27 insertions, 6 deletions

diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index d4ea5bf7f2d1..daa9b14fe358 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk20
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/bmp/General/libalarm.so
 
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index aa4fe57bc45b..217e067fcf03 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-clocks kde misc
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -21,7 +22,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 18482e01ce1f..cb17412c7442 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -6,22 +6,31 @@ bin/kweatherreport
 bin/kweatherservice
 bin/kworldclock
 include/AmorIface.h
+lib/kde3/eyes_panelapplet.a
 lib/kde3/eyes_panelapplet.la
 lib/kde3/eyes_panelapplet.so
+lib/kde3/fifteen_panelapplet.a
 lib/kde3/fifteen_panelapplet.la
 lib/kde3/fifteen_panelapplet.so
+lib/kde3/kcm_weather.a
 lib/kde3/kcm_weather.la
 lib/kde3/kcm_weather.so
+lib/kde3/kcm_weatherservice.a
 lib/kde3/kcm_weatherservice.la
 lib/kde3/kcm_weatherservice.so
+lib/kde3/kmoon_panelapplet.a
 lib/kde3/kmoon_panelapplet.la
 lib/kde3/kmoon_panelapplet.so
+lib/kde3/kweatherreport.a
 lib/kde3/kweatherreport.la
 lib/kde3/kweatherreport.so
+lib/kde3/weather_panelapplet.a
 lib/kde3/weather_panelapplet.la
 lib/kde3/weather_panelapplet.so
+lib/kde3/ww_panelapplet.a
 lib/kde3/ww_panelapplet.la
 lib/kde3/ww_panelapplet.so
+lib/libkdeinit_kweatherreport.a
 lib/libkdeinit_kweatherreport.la
 lib/libkdeinit_kweatherreport.so
 share/applications/kde/amor.desktop
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index aa4fe57bc45b..217e067fcf03 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-clocks kde misc
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -21,7 +22,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 18482e01ce1f..cb17412c7442 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -6,22 +6,31 @@ bin/kweatherreport
 bin/kweatherservice
 bin/kworldclock
 include/AmorIface.h
+lib/kde3/eyes_panelapplet.a
 lib/kde3/eyes_panelapplet.la
 lib/kde3/eyes_panelapplet.so
+lib/kde3/fifteen_panelapplet.a
 lib/kde3/fifteen_panelapplet.la
 lib/kde3/fifteen_panelapplet.so
+lib/kde3/kcm_weather.a
 lib/kde3/kcm_weather.la
 lib/kde3/kcm_weather.so
+lib/kde3/kcm_weatherservice.a
 lib/kde3/kcm_weatherservice.la
 lib/kde3/kcm_weatherservice.so
+lib/kde3/kmoon_panelapplet.a
 lib/kde3/kmoon_panelapplet.la
 lib/kde3/kmoon_panelapplet.so
+lib/kde3/kweatherreport.a
 lib/kde3/kweatherreport.la
 lib/kde3/kweatherreport.so
+lib/kde3/weather_panelapplet.a
 lib/kde3/weather_panelapplet.la
 lib/kde3/weather_panelapplet.so
+lib/kde3/ww_panelapplet.a
 lib/kde3/ww_panelapplet.la
 lib/kde3/ww_panelapplet.so
+lib/libkdeinit_kweatherreport.a
 lib/libkdeinit_kweatherreport.la
 lib/libkdeinit_kweatherreport.so
 share/applications/kde/amor.desktop
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index aae3b5243343..06283ee18d27 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-datetime-plugin
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR=	xfce4
@@ -24,7 +24,7 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-plist b/x11-clocks/xfce4-datetime-plugin/pkg-plist
index af30f70e36f7..fa60784c4331 100644
--- a/x11-clocks/xfce4-datetime-plugin/pkg-plist
+++ b/x11-clocks/xfce4-datetime-plugin/pkg-plist
@@ -1,2 +1,3 @@
+lib/xfce4/panel-plugins/libdatetime.la
 lib/xfce4/panel-plugins/libdatetime.so
 @dirrmtry lib/xfce4/panel-plugins
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index cd2e60d3b7a5..a9b5f273911d 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/xmms/General/libalarm.so