49 files changed, 188 insertions, 41 deletions

diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 41855aa787e6..774f91a8ae26 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -39,7 +39,7 @@ RUN_DEPENDS+=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 .else
 MAKE_ARGS+=	NO_GUI=yes
 .endif
-USE_AUTOTOOLS=	autoconf:213 libtool:13
+USE_AUTOTOOLS=	autoconf:213 libtool:15
 .if defined(NO_AUTOKEY) && defined(PACKAGE_BUILDING)
 INGORE =	"cannot be build in batch mode whithout automated DES key generation"
 .endif
diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index 72f034b3c62c..167a35b24c44 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A powerful Bible study application for KDE3
 LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index 72f034b3c62c..167a35b24c44 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A powerful Bible study application for KDE3
 LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index 72f034b3c62c..167a35b24c44 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A powerful Bible study application for KDE3
 LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 72f034b3c62c..167a35b24c44 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A powerful Bible study application for KDE3
 LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index 8b391463a722..a26f54b96fe1 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 USE_REINPLACE=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile
index b88081ee0b08..e4592d82f118 100644
--- a/misc/gkrellmfmonitor/Makefile
+++ b/misc/gkrellmfmonitor/Makefile
@@ -24,8 +24,8 @@ PLIST_FILES=	libexec/gkrellm/plugins/fmonitor.so
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 ALL_TARGET=	fmonitor.so
-CFLAGS+=	-fPIC `gtk12-config --cflags` `imlib-config --cflags-gdk`
-MAKE_ARGS=	CC="${CC} ${CFLAGS}" GTK_LIB="`gtk12-config --libs`"
+CFLAGS+=	-fPIC `${GTK_CONFIG} --cflags` `imlib-config --cflags-gdk`
+MAKE_ARGS=	CC="${CC} ${CFLAGS}" GTK_LIB="`${GTK_CONFIG} --libs`"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fmonitor.so ${PREFIX}/libexec/gkrellm/plugins
diff --git a/misc/gtl/Makefile b/misc/gtl/Makefile
index 58334309f92b..441d676cf679 100644
--- a/misc/gtl/Makefile
+++ b/misc/gtl/Makefile
@@ -20,7 +20,6 @@ RESTRICTED=	License forbids redistribution (source or binary)
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
 USE_GNOME=	lthack
 USE_GCC=	3.3	# Won't build with 3.4
 
diff --git a/misc/kaddressbook-plugins/Makefile b/misc/kaddressbook-plugins/Makefile
index 70003a2219cb..912b31671277 100644
--- a/misc/kaddressbook-plugins/Makefile
+++ b/misc/kaddressbook-plugins/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/kaddressbook-plugins/pkg-plist b/misc/kaddressbook-plugins/pkg-plist
index 82c9ec651818..513d62f2d944 100644
--- a/misc/kaddressbook-plugins/pkg-plist
+++ b/misc/kaddressbook-plugins/pkg-plist
@@ -1,5 +1,7 @@
+lib/kde3/libkaddrbk_geo_xxport.a
 lib/kde3/libkaddrbk_geo_xxport.la
 lib/kde3/libkaddrbk_geo_xxport.so
+lib/kde3/libkaddrbk_gmx_xxport.a
 lib/kde3/libkaddrbk_gmx_xxport.la
 lib/kde3/libkaddrbk_gmx_xxport.so
 share/applications/kdeaddons-kaddressbook-plugins-3.5.1
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index b2d4677406cd..708675143bc8 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE}
 
diff --git a/misc/kdeedu3/pkg-plist b/misc/kdeedu3/pkg-plist
index c334aa59c8d0..c0ae4b5bd831 100644
--- a/misc/kdeedu3/pkg-plist
+++ b/misc/kdeedu3/pkg-plist
@@ -49,31 +49,42 @@ include/libkiten/kromajiedit.h
 include/libkiten/rad.h
 include/libkiten/widgets.h
 include/simclockinterface.h
+lib/kde3/kfile_drgeo.a
 lib/kde3/kfile_drgeo.la
 lib/kde3/kfile_drgeo.so
+lib/kde3/kfile_kig.a
 lib/kde3/kfile_kig.la
 lib/kde3/kfile_kig.so
+lib/kde3/libkeducapart.a
 lib/kde3/libkeducapart.la
 lib/kde3/libkeducapart.so
+lib/kde3/libkigpart.a
 lib/kde3/libkigpart.la
 lib/kde3/libkigpart.so
+lib/kde3/libkmplotpart.a
 lib/kde3/libkmplotpart.la
 lib/kde3/libkmplotpart.so
+lib/libextdate.a
 lib/libextdate.la
 lib/libextdate.so
 lib/libextdate.so.3
+lib/libkdeeducore.a
 lib/libkdeeducore.la
 lib/libkdeeducore.so
 lib/libkdeeducore.so.3
+lib/libkdeeduplot.a
 lib/libkdeeduplot.la
 lib/libkdeeduplot.so
 lib/libkdeeduplot.so.3
+lib/libkdeeduui.a
 lib/libkdeeduui.la
 lib/libkdeeduui.so
 lib/libkdeeduui.so.3
+lib/libkiten.a
 lib/libkiten.la
 lib/libkiten.so
 lib/libkiten.so.1
+lib/libkvoctraincore.a
 lib/libkvoctraincore.la
 lib/libkvoctraincore.so
 lib/libkvoctraincore.so.0
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index b2d4677406cd..708675143bc8 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE}
 
diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist
index c334aa59c8d0..c0ae4b5bd831 100644
--- a/misc/kdeedu4/pkg-plist
+++ b/misc/kdeedu4/pkg-plist
@@ -49,31 +49,42 @@ include/libkiten/kromajiedit.h
 include/libkiten/rad.h
 include/libkiten/widgets.h
 include/simclockinterface.h
+lib/kde3/kfile_drgeo.a
 lib/kde3/kfile_drgeo.la
 lib/kde3/kfile_drgeo.so
+lib/kde3/kfile_kig.a
 lib/kde3/kfile_kig.la
 lib/kde3/kfile_kig.so
+lib/kde3/libkeducapart.a
 lib/kde3/libkeducapart.la
 lib/kde3/libkeducapart.so
+lib/kde3/libkigpart.a
 lib/kde3/libkigpart.la
 lib/kde3/libkigpart.so
+lib/kde3/libkmplotpart.a
 lib/kde3/libkmplotpart.la
 lib/kde3/libkmplotpart.so
+lib/libextdate.a
 lib/libextdate.la
 lib/libextdate.so
 lib/libextdate.so.3
+lib/libkdeeducore.a
 lib/libkdeeducore.la
 lib/libkdeeducore.so
 lib/libkdeeducore.so.3
+lib/libkdeeduplot.a
 lib/libkdeeduplot.la
 lib/libkdeeduplot.so
 lib/libkdeeduplot.so.3
+lib/libkdeeduui.a
 lib/libkdeeduui.la
 lib/libkdeeduui.so
 lib/libkdeeduui.so.3
+lib/libkiten.a
 lib/libkiten.la
 lib/libkiten.so
 lib/libkiten.so.1
+lib/libkvoctraincore.a
 lib/libkvoctraincore.la
 lib/libkvoctraincore.so
 lib/libkvoctraincore.so.0
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 7acd17c54199..e2e833f5a58e 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -29,7 +30,7 @@ USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 DO_NOT_COMPILE+=klaptopdaemon kmilo
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist
index dd5e3c34fcee..e7f5117ec760 100644
--- a/misc/kdeutils3/pkg-plist
+++ b/misc/kdeutils3/pkg-plist
@@ -29,58 +29,84 @@ include/ksim/progress.h
 include/ksim/themeloader.h
 include/ksim/themetypes.h
 include/kwidgetstreamer.h
+lib/kde3/ark.a
 lib/kde3/ark.la
 lib/kde3/ark.so
+lib/kde3/irkick.a
 lib/kde3/irkick.la
 lib/kde3/irkick.so
+lib/kde3/kcalc.a
 lib/kde3/kcalc.la
 lib/kde3/kcalc.so
+lib/kde3/kcharselect_panelapplet.a
 lib/kde3/kcharselect_panelapplet.la
 lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kcmlirc.a
 lib/kde3/kcm_kcmlirc.la
 lib/kde3/kcm_kcmlirc.so
+lib/kde3/kcm_kdf.a
 lib/kde3/kcm_kdf.la
 lib/kde3/kcm_kdf.so
+lib/kde3/kcm_kwallet.a
 lib/kde3/kcm_kwallet.la
 lib/kde3/kcm_kwallet.so
+lib/kde3/kedit.a
 lib/kde3/kedit.la
 lib/kde3/kedit.so
+lib/kde3/ksim_cpu.a
 lib/kde3/ksim_cpu.la
 lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.a
 lib/kde3/ksim_disk.la
 lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.a
 lib/kde3/ksim_filesystem.la
 lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.a
 lib/kde3/ksim_net.la
 lib/kde3/ksim_net.so
+lib/kde3/ksim_panelextension.a
 lib/kde3/ksim_panelextension.la
 lib/kde3/ksim_panelextension.so
+lib/kde3/ksim_sensors.a
 lib/kde3/ksim_sensors.la
 lib/kde3/ksim_sensors.so
+lib/kde3/ksim_snmp.a
 lib/kde3/ksim_snmp.la
 lib/kde3/ksim_snmp.so
+lib/kde3/libarkpart.a
 lib/kde3/libarkpart.la
 lib/kde3/libarkpart.so
+lib/kde3/libkbyteseditwidget.a
 lib/kde3/libkbyteseditwidget.la
 lib/kde3/libkbyteseditwidget.so
+lib/kde3/libkhexedit2part.a
 lib/kde3/libkhexedit2part.la
 lib/kde3/libkhexedit2part.so
+lib/kde3/libkregexpeditorgui.a
 lib/kde3/libkregexpeditorgui.la
 lib/kde3/libkregexpeditorgui.so
+lib/libkdeinit_ark.a
 lib/libkdeinit_ark.la
 lib/libkdeinit_ark.so
+lib/libkdeinit_irkick.a
 lib/libkdeinit_irkick.la
 lib/libkdeinit_irkick.so
+lib/libkdeinit_kcalc.a
 lib/libkdeinit_kcalc.la
 lib/libkdeinit_kcalc.so
+lib/libkdeinit_kedit.a
 lib/libkdeinit_kedit.la
 lib/libkdeinit_kedit.so
+lib/libkhexeditcommon.a
 lib/libkhexeditcommon.la
 lib/libkhexeditcommon.so
 lib/libkhexeditcommon.so.0
+lib/libkregexpeditorcommon.a
 lib/libkregexpeditorcommon.la
 lib/libkregexpeditorcommon.so
 lib/libkregexpeditorcommon.so.1
+lib/libksimcore.a
 lib/libksimcore.la
 lib/libksimcore.so
 lib/libksimcore.so.1
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 7acd17c54199..e2e833f5a58e 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -29,7 +30,7 @@ USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 DO_NOT_COMPILE+=klaptopdaemon kmilo
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index dd5e3c34fcee..e7f5117ec760 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/pkg-plist
@@ -29,58 +29,84 @@ include/ksim/progress.h
 include/ksim/themeloader.h
 include/ksim/themetypes.h
 include/kwidgetstreamer.h
+lib/kde3/ark.a
 lib/kde3/ark.la
 lib/kde3/ark.so
+lib/kde3/irkick.a
 lib/kde3/irkick.la
 lib/kde3/irkick.so
+lib/kde3/kcalc.a
 lib/kde3/kcalc.la
 lib/kde3/kcalc.so
+lib/kde3/kcharselect_panelapplet.a
 lib/kde3/kcharselect_panelapplet.la
 lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kcmlirc.a
 lib/kde3/kcm_kcmlirc.la
 lib/kde3/kcm_kcmlirc.so
+lib/kde3/kcm_kdf.a
 lib/kde3/kcm_kdf.la
 lib/kde3/kcm_kdf.so
+lib/kde3/kcm_kwallet.a
 lib/kde3/kcm_kwallet.la
 lib/kde3/kcm_kwallet.so
+lib/kde3/kedit.a
 lib/kde3/kedit.la
 lib/kde3/kedit.so
+lib/kde3/ksim_cpu.a
 lib/kde3/ksim_cpu.la
 lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.a
 lib/kde3/ksim_disk.la
 lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.a
 lib/kde3/ksim_filesystem.la
 lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.a
 lib/kde3/ksim_net.la
 lib/kde3/ksim_net.so
+lib/kde3/ksim_panelextension.a
 lib/kde3/ksim_panelextension.la
 lib/kde3/ksim_panelextension.so
+lib/kde3/ksim_sensors.a
 lib/kde3/ksim_sensors.la
 lib/kde3/ksim_sensors.so
+lib/kde3/ksim_snmp.a
 lib/kde3/ksim_snmp.la
 lib/kde3/ksim_snmp.so
+lib/kde3/libarkpart.a
 lib/kde3/libarkpart.la
 lib/kde3/libarkpart.so
+lib/kde3/libkbyteseditwidget.a
 lib/kde3/libkbyteseditwidget.la
 lib/kde3/libkbyteseditwidget.so
+lib/kde3/libkhexedit2part.a
 lib/kde3/libkhexedit2part.la
 lib/kde3/libkhexedit2part.so
+lib/kde3/libkregexpeditorgui.a
 lib/kde3/libkregexpeditorgui.la
 lib/kde3/libkregexpeditorgui.so
+lib/libkdeinit_ark.a
 lib/libkdeinit_ark.la
 lib/libkdeinit_ark.so
+lib/libkdeinit_irkick.a
 lib/libkdeinit_irkick.la
 lib/libkdeinit_irkick.so
+lib/libkdeinit_kcalc.a
 lib/libkdeinit_kcalc.la
 lib/libkdeinit_kcalc.so
+lib/libkdeinit_kedit.a
 lib/libkdeinit_kedit.la
 lib/libkdeinit_kedit.so
+lib/libkhexeditcommon.a
 lib/libkhexeditcommon.la
 lib/libkhexeditcommon.so
 lib/libkhexeditcommon.so.0
+lib/libkregexpeditorcommon.a
 lib/libkregexpeditorcommon.la
 lib/libkregexpeditorcommon.so
 lib/libkregexpeditorcommon.so.1
+lib/libksimcore.a
 lib/libksimcore.la
 lib/libksimcore.so
 lib/libksimcore.so.1
diff --git a/misc/kfile-plugins/Makefile b/misc/kfile-plugins/Makefile
index 4ba653a6cb1a..159c3389f983 100644
--- a/misc/kfile-plugins/Makefile
+++ b/misc/kfile-plugins/Makefile
@@ -23,7 +23,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/kfile-plugins/pkg-plist b/misc/kfile-plugins/pkg-plist
index f5a2595c158f..11d513265086 100644
--- a/misc/kfile-plugins/pkg-plist
+++ b/misc/kfile-plugins/pkg-plist
@@ -1,16 +1,23 @@
 bin/lnkforward
+lib/kde3/kfile_cert.a
 lib/kde3/kfile_cert.la
 lib/kde3/kfile_cert.so
+lib/kde3/kfile_desktop.a
 lib/kde3/kfile_desktop.la
 lib/kde3/kfile_desktop.so
+lib/kde3/kfile_folder.a
 lib/kde3/kfile_folder.la
 lib/kde3/kfile_folder.so
+lib/kde3/kfile_html.a
 lib/kde3/kfile_html.la
 lib/kde3/kfile_html.so
+lib/kde3/kfile_lnk.a
 lib/kde3/kfile_lnk.la
 lib/kde3/kfile_lnk.so
+lib/kde3/kfile_mhtml.a
 lib/kde3/kfile_mhtml.la
 lib/kde3/kfile_mhtml.so
+lib/kde3/kfile_txt.a
 lib/kde3/kfile_txt.la
 lib/kde3/kfile_txt.so
 share/applications/kdeaddons-kfile-plugins-3.5.1
diff --git a/misc/kicker-applets/Makefile b/misc/kicker-applets/Makefile
index f361462a9121..05f970d3d602 100644
--- a/misc/kicker-applets/Makefile
+++ b/misc/kicker-applets/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/kicker-applets/pkg-plist b/misc/kicker-applets/pkg-plist
index cd7768e5df1b..6570b8a19be3 100644
--- a/misc/kicker-applets/pkg-plist
+++ b/misc/kicker-applets/pkg-plist
@@ -1,11 +1,16 @@
+lib/kde3/kbinaryclock_panelapplet.a
 lib/kde3/kbinaryclock_panelapplet.la
 lib/kde3/kbinaryclock_panelapplet.so
+lib/kde3/kolourpicker_panelapplet.a
 lib/kde3/kolourpicker_panelapplet.la
 lib/kde3/kolourpicker_panelapplet.so
+lib/kde3/ktimemon_panelapplet.a
 lib/kde3/ktimemon_panelapplet.la
 lib/kde3/ktimemon_panelapplet.so
+lib/kde3/math_panelapplet.a
 lib/kde3/math_panelapplet.la
 lib/kde3/math_panelapplet.so
+lib/kde3/mediacontrol_panelapplet.a
 lib/kde3/mediacontrol_panelapplet.la
 lib/kde3/mediacontrol_panelapplet.so
 share/applications/kdeaddons-kicker-applets-3.5.1
diff --git a/misc/knewsticker-scripts/Makefile b/misc/knewsticker-scripts/Makefile
index ffc9ad71dc97..144fc57b0cb8 100644
--- a/misc/knewsticker-scripts/Makefile
+++ b/misc/knewsticker-scripts/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/konq-plugins-kde4/Makefile b/misc/konq-plugins-kde4/Makefile
index eec9a7ecfee7..a693b8992906 100644
--- a/misc/konq-plugins-kde4/Makefile
+++ b/misc/konq-plugins-kde4/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/konq-plugins-kde4/pkg-plist b/misc/konq-plugins-kde4/pkg-plist
index 011a13c4829f..2aaa138f7cfb 100644
--- a/misc/konq-plugins-kde4/pkg-plist
+++ b/misc/konq-plugins-kde4/pkg-plist
@@ -3,54 +3,79 @@ bin/fsview
 bin/jpegorient
 bin/kio_media_realfolder
 bin/orient.py
+lib/kde3/kcm_kuick.a
 lib/kde3/kcm_kuick.la
 lib/kde3/kcm_kuick.so
+lib/kde3/konq_sidebarnews.a
 lib/kde3/konq_sidebarnews.la
 lib/kde3/konq_sidebarnews.so
+lib/kde3/konqsidebar_delicious.a
 lib/kde3/konqsidebar_delicious.la
 lib/kde3/konqsidebar_delicious.so
+lib/kde3/konqsidebar_mediaplayer.a
 lib/kde3/konqsidebar_mediaplayer.la
 lib/kde3/konqsidebar_mediaplayer.so
+lib/kde3/konqsidebar_metabar.a
 lib/kde3/konqsidebar_metabar.la
 lib/kde3/konqsidebar_metabar.so
+lib/kde3/libakregatorkonqfeedicon.a
 lib/kde3/libakregatorkonqfeedicon.la
 lib/kde3/libakregatorkonqfeedicon.so
+lib/kde3/libakregatorkonqplugin.a
 lib/kde3/libakregatorkonqplugin.la
 lib/kde3/libakregatorkonqplugin.so
+lib/kde3/libarkplugin.a
 lib/kde3/libarkplugin.la
 lib/kde3/libarkplugin.so
+lib/kde3/libautorefresh.a
 lib/kde3/libautorefresh.la
 lib/kde3/libautorefresh.so
+lib/kde3/libbabelfishplugin.a
 lib/kde3/libbabelfishplugin.la
 lib/kde3/libbabelfishplugin.so
+lib/kde3/libcrashesplugin.a
 lib/kde3/libcrashesplugin.la
 lib/kde3/libcrashesplugin.so
+lib/kde3/libdirfilterplugin.a
 lib/kde3/libdirfilterplugin.la
 lib/kde3/libdirfilterplugin.so
+lib/kde3/libdomtreeviewerplugin.a
 lib/kde3/libdomtreeviewerplugin.la
 lib/kde3/libdomtreeviewerplugin.so
+lib/kde3/libfsviewpart.a
 lib/kde3/libfsviewpart.la
 lib/kde3/libfsviewpart.so
+lib/kde3/libkhtmlsettingsplugin.a
 lib/kde3/libkhtmlsettingsplugin.la
 lib/kde3/libkhtmlsettingsplugin.so
+lib/kde3/libkimgallery.a
 lib/kde3/libkimgallery.la
 lib/kde3/libkimgallery.so
+lib/kde3/libkuickplugin.a
 lib/kde3/libkuickplugin.la
 lib/kde3/libkuickplugin.so
+lib/kde3/libmfkonqmficon.a
 lib/kde3/libmfkonqmficon.la
 lib/kde3/libmfkonqmficon.so
+lib/kde3/libminitoolsplugin.a
 lib/kde3/libminitoolsplugin.la
 lib/kde3/libminitoolsplugin.so
+lib/kde3/librellinksplugin.a
 lib/kde3/librellinksplugin.la
 lib/kde3/librellinksplugin.so
+lib/kde3/libsearchbarplugin.a
 lib/kde3/libsearchbarplugin.la
 lib/kde3/libsearchbarplugin.so
+lib/kde3/libuachangerplugin.a
 lib/kde3/libuachangerplugin.la
 lib/kde3/libuachangerplugin.so
+lib/kde3/libvalidatorsplugin.a
 lib/kde3/libvalidatorsplugin.la
 lib/kde3/libvalidatorsplugin.so
+lib/kde3/libwebarchiverplugin.a
 lib/kde3/libwebarchiverplugin.la
 lib/kde3/libwebarchiverplugin.so
+lib/kde3/webarchivethumbnail.a
 lib/kde3/webarchivethumbnail.la
 lib/kde3/webarchivethumbnail.so
 share/applications/kdeaddons-konq-plugins-3.5.1
diff --git a/misc/konq-plugins/Makefile b/misc/konq-plugins/Makefile
index eec9a7ecfee7..a693b8992906 100644
--- a/misc/konq-plugins/Makefile
+++ b/misc/konq-plugins/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/konq-plugins/pkg-plist b/misc/konq-plugins/pkg-plist
index 011a13c4829f..2aaa138f7cfb 100644
--- a/misc/konq-plugins/pkg-plist
+++ b/misc/konq-plugins/pkg-plist
@@ -3,54 +3,79 @@ bin/fsview
 bin/jpegorient
 bin/kio_media_realfolder
 bin/orient.py
+lib/kde3/kcm_kuick.a
 lib/kde3/kcm_kuick.la
 lib/kde3/kcm_kuick.so
+lib/kde3/konq_sidebarnews.a
 lib/kde3/konq_sidebarnews.la
 lib/kde3/konq_sidebarnews.so
+lib/kde3/konqsidebar_delicious.a
 lib/kde3/konqsidebar_delicious.la
 lib/kde3/konqsidebar_delicious.so
+lib/kde3/konqsidebar_mediaplayer.a
 lib/kde3/konqsidebar_mediaplayer.la
 lib/kde3/konqsidebar_mediaplayer.so
+lib/kde3/konqsidebar_metabar.a
 lib/kde3/konqsidebar_metabar.la
 lib/kde3/konqsidebar_metabar.so
+lib/kde3/libakregatorkonqfeedicon.a
 lib/kde3/libakregatorkonqfeedicon.la
 lib/kde3/libakregatorkonqfeedicon.so
+lib/kde3/libakregatorkonqplugin.a
 lib/kde3/libakregatorkonqplugin.la
 lib/kde3/libakregatorkonqplugin.so
+lib/kde3/libarkplugin.a
 lib/kde3/libarkplugin.la
 lib/kde3/libarkplugin.so
+lib/kde3/libautorefresh.a
 lib/kde3/libautorefresh.la
 lib/kde3/libautorefresh.so
+lib/kde3/libbabelfishplugin.a
 lib/kde3/libbabelfishplugin.la
 lib/kde3/libbabelfishplugin.so
+lib/kde3/libcrashesplugin.a
 lib/kde3/libcrashesplugin.la
 lib/kde3/libcrashesplugin.so
+lib/kde3/libdirfilterplugin.a
 lib/kde3/libdirfilterplugin.la
 lib/kde3/libdirfilterplugin.so
+lib/kde3/libdomtreeviewerplugin.a
 lib/kde3/libdomtreeviewerplugin.la
 lib/kde3/libdomtreeviewerplugin.so
+lib/kde3/libfsviewpart.a
 lib/kde3/libfsviewpart.la
 lib/kde3/libfsviewpart.so
+lib/kde3/libkhtmlsettingsplugin.a
 lib/kde3/libkhtmlsettingsplugin.la
 lib/kde3/libkhtmlsettingsplugin.so
+lib/kde3/libkimgallery.a
 lib/kde3/libkimgallery.la
 lib/kde3/libkimgallery.so
+lib/kde3/libkuickplugin.a
 lib/kde3/libkuickplugin.la
 lib/kde3/libkuickplugin.so
+lib/kde3/libmfkonqmficon.a
 lib/kde3/libmfkonqmficon.la
 lib/kde3/libmfkonqmficon.so
+lib/kde3/libminitoolsplugin.a
 lib/kde3/libminitoolsplugin.la
 lib/kde3/libminitoolsplugin.so
+lib/kde3/librellinksplugin.a
 lib/kde3/librellinksplugin.la
 lib/kde3/librellinksplugin.so
+lib/kde3/libsearchbarplugin.a
 lib/kde3/libsearchbarplugin.la
 lib/kde3/libsearchbarplugin.so
+lib/kde3/libuachangerplugin.a
 lib/kde3/libuachangerplugin.la
 lib/kde3/libuachangerplugin.so
+lib/kde3/libvalidatorsplugin.a
 lib/kde3/libvalidatorsplugin.la
 lib/kde3/libvalidatorsplugin.so
+lib/kde3/libwebarchiverplugin.a
 lib/kde3/libwebarchiverplugin.la
 lib/kde3/libwebarchiverplugin.so
+lib/kde3/webarchivethumbnail.a
 lib/kde3/webarchivethumbnail.la
 lib/kde3/webarchivethumbnail.so
 share/applications/kdeaddons-konq-plugins-3.5.1
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 16975e1d16a7..c99664898465 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hank@millerfarm.com
 COMMENT=	Recipe database for cooks
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 OPTIONS=	SQLITE "Support for SQLite backend" on \
diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile
index 16975e1d16a7..c99664898465 100644
--- a/misc/krecipes/Makefile
+++ b/misc/krecipes/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hank@millerfarm.com
 COMMENT=	Recipe database for cooks
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 OPTIONS=	SQLITE "Support for SQLite backend" on \
diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile
index d8c7d231f510..81bda9a682df 100644
--- a/misc/ksig/Makefile
+++ b/misc/ksig/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index d307e93731df..086b92a438df 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES=	http://www.m-j-s.net/pub/kde/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE/Qt log file viewer
 
-USE_KDELIBS_VER=	3
+USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,-O2 ,,g ; \
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index 0923d483081e..382379043a8b 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -21,7 +21,7 @@ OPTIONS+=	DB4 "Support for DB4" off
 OPTIONS+=	PAM "Support for PAM (Experimental)" off
 OPTIONS+=	PGSQL "Support for PostgreSQL (Experimental)" off
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 INSTALLS_SHLIB=	yes
 
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index bb486b60d23b..b93af5233cff 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -16,8 +16,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Modular Calendar Access Library
 
-USE_AUTOTOOLS=	libltdl:15 libtool:13
-HAS_CONFIGURE=	yes
+USE_AUTOTOOLS=	libltdl:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-mstore --with-icap \
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 9b8e0d33a046..d2ff69c3a099 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A GNOME application designed to manage cyclic tasks
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix gnometarget
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index 80a5f5cb4ef2..0a891f728eec 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -18,7 +18,7 @@ COMMENT=	ISO-C & Perl API and CLI for generating Universally Unique Identifiers
 CONFLICTS=	e2fsprogs-libuuid-[0-9]*
 
 USE_GCC=	3.2+
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-shared --enable-static
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index 63b8429e8408..13243829b6d9 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pybliographer
 PORTVERSION=	1.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
 USE_GNOME=	glib12 gnomehack gnomeprefix
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/misc/pybliographer/pkg-plist b/misc/pybliographer/pkg-plist
index a68b42de95db..70d8b74a6cdb 100644
--- a/misc/pybliographer/pkg-plist
+++ b/misc/pybliographer/pkg-plist
@@ -7,6 +7,7 @@ bin/pybliographic
 bin/pybtex
 include/bibtex.h
 lib/libbibtex.a
+lib/libbibtex.la
 lib/libbibtex.so
 lib/libbibtex.so.1
 lib/pybliographer/_bibtexmodule.so
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 3b68899cbfc6..f188a9712a99 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/misc/renamedlgplugins/Makefile b/misc/renamedlgplugins/Makefile
index 13b63a7ab181..fe877d4069a9 100644
--- a/misc/renamedlgplugins/Makefile
+++ b/misc/renamedlgplugins/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
diff --git a/misc/renamedlgplugins/pkg-plist b/misc/renamedlgplugins/pkg-plist
index f97a55ace477..f2114e7ccd32 100644
--- a/misc/renamedlgplugins/pkg-plist
+++ b/misc/renamedlgplugins/pkg-plist
@@ -1,5 +1,7 @@
+lib/kde3/librenaudioplugin.a
 lib/kde3/librenaudioplugin.la
 lib/kde3/librenaudioplugin.so
+lib/kde3/librenimageplugin.a
 lib/kde3/librenimageplugin.la
 lib/kde3/librenimageplugin.so
 share/applications/kdeaddons-renamedlg-plugins-3.5.1
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index 6e1a6609de0e..d83cab88c66e 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A library required by smssend (same author)
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	autoconf:259 libtool:13:inc
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index c8ce1afbb557..4fb36ecbbe7c 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	talkfilters
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hyperrealm.com/talkfilters/
 
@@ -15,7 +16,7 @@ COMMENT=	Set of filters to convert English text to various stereotyped dialects
 
 CONFLICTS=	jive* chef* filters-*
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/misc/talkfilters/pkg-plist b/misc/talkfilters/pkg-plist
index d71c0f44c3f4..701b51b25e09 100644
--- a/misc/talkfilters/pkg-plist
+++ b/misc/talkfilters/pkg-plist
@@ -19,5 +19,6 @@ bin/warez
 bin/wrap
 include/talkfilters.h
 lib/libtalkfilters.a
+lib/libtalkfilters.la
 lib/libtalkfilters.so
 lib/libtalkfilters.so.1
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index c893ea2c4753..dcb17beefb6c 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -20,7 +20,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 OPTIONS=	CDDB "CDDB support" on \
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index c893ea2c4753..dcb17beefb6c 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -20,7 +20,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 OPTIONS=	CDDB "CDDB support" on \
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index d98596420b13..47d01fc0ae4d 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-iconbox
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -25,7 +25,7 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
index ec35fc321013..06ca32b19d59 100644
--- a/misc/xfce4-iconbox/pkg-plist
+++ b/misc/xfce4-iconbox/pkg-plist
@@ -1,4 +1,6 @@
 bin/xfce4-iconbox
+lib/xfce4/mcs-plugins/xfce4-iconbox_settings.a
+lib/xfce4/mcs-plugins/xfce4-iconbox_settings.la
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.so
 share/applications/xfce-iconbox-settings.desktop
 share/icons/hicolor/48x48/apps/xfce4-iconbox.png
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 028c8086466c..c3ec420e7dbd 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-weather-plugin
 PORTVERSION=	0.4.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 
@@ -23,7 +23,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/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist
index 7d432f36c90c..2efe89a211f5 100644
--- a/misc/xfce4-weather-plugin/pkg-plist
+++ b/misc/xfce4-weather-plugin/pkg-plist
@@ -1,3 +1,5 @@
+lib/xfce4/panel-plugins/libweather.a
+lib/xfce4/panel-plugins/libweather.la
 lib/xfce4/panel-plugins/libweather.so
 share/xfce4/weather/icons/liquid/1.png
 share/xfce4/weather/icons/liquid/10.png