Conversion to a single libtool environment.

Approved by:	portmgr (kris)

62 files changed, 187 insertions, 87 deletions

diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index 3ff027e542f9..746474999fdd 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	baghira
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,16 +17,13 @@ COMMENT=	An Aqua like window decoration and widget style for KDE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-release
 
-BROKEN=		Incorrect pkg-plist
-
 #EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
 
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
+USE_AUTOTOOLS=	libtool:15
 
 # XXX - Workaround for a badly rolled tarball.
 #pre-configure:
diff --git a/x11-themes/baghira/pkg-plist b/x11-themes/baghira/pkg-plist
index 166093fb2aba..12fc7cb3d197 100644
--- a/x11-themes/baghira/pkg-plist
+++ b/x11-themes/baghira/pkg-plist
@@ -1,34 +1,33 @@
-include/baghirasidebar.h
-include/linkview.h
-include/listboxlink.h
-include/dndlistbox.h
-include/baghirasidebariface.h
 bin/bab
-lib/libbaghirastarter.so
+lib/libbaghirastarter.a
 lib/libbaghirastarter.la
-lib/kde3/kstyle_baghira_config.so
+lib/libbaghirastarter.so
+lib/kde3/b_menu_panelapplet.a
+lib/kde3/b_menu_panelapplet.la
+lib/kde3/b_menu_panelapplet.so
+lib/kde3/kstyle_baghira_config.a
 lib/kde3/kstyle_baghira_config.la
-lib/kde3/kwin_baghira_config.so
-lib/kde3/kwin_baghira_config.la
-lib/kde3/kwin3_baghira.so
+lib/kde3/kstyle_baghira_config.so
+lib/kde3/kwin3_baghira.a
 lib/kde3/kwin3_baghira.la
-lib/kde3/b_menu_panelapplet.so
-lib/kde3/b_menu_panelapplet.la
-lib/kde3/plugins/styles/baghira.so
+lib/kde3/kwin3_baghira.so
+lib/kde3/kwin_baghira_config.a
+lib/kde3/kwin_baghira_config.la
+lib/kde3/kwin_baghira_config.so
+lib/kde3/plugins/styles/baghira.a
 lib/kde3/plugins/styles/baghira.la
-lib/kde3/konqsidebar_baghirasidebar.so
-lib/kde3/konqsidebar_baghirasidebar.la
-lib/usermanager_panelapplet.so
+lib/kde3/plugins/styles/baghira.so
+lib/usermanager_panelapplet.a
 lib/usermanager_panelapplet.la
+lib/usermanager_panelapplet.so
 share/apps/kdisplay/color-schemes/AquaBlue.kcsrc
 share/apps/kdisplay/color-schemes/AquaGraphite.kcsrc
+share/apps/kicker/applets/b_menuapplet.desktop
 share/apps/kicker/applets/starter.desktop
 share/apps/kicker/applets/usermanager.desktop
 share/apps/kwin/baghira.desktop
 share/apps/kstyle/themes/baghira.themerc
 share/apps/baghira/poof.png
-share/apps/konqsidebartng/add/baghirasidebar_add.desktop
-share/apps/konqsidebartng/entries/baghirasidebar.desktop
 share/icons/crystalsvg/48x48/apps/baghira_blue.png
 share/icons/crystalsvg/48x48/apps/baghira.png
 share/icons/crystalsvg/16x16/apps/baghira_blue.png
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index c68d7f2821da..7d2f7ee250d2 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	buffy
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	buffy02
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/x11-themes/buffy/pkg-plist b/x11-themes/buffy/pkg-plist
index 959774106f60..01fcb0d28227 100644
--- a/x11-themes/buffy/pkg-plist
+++ b/x11-themes/buffy/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libbuffy.a
+lib/gtk/themes/engines/libbuffy.la
 lib/gtk/themes/engines/libbuffy.so
 share/themes/buffyEro/ICON.png
 share/themes/buffyEro/README.html
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index 74cbdae01f1e..7ed38bc89712 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clean-theme-gtk
 PORTVERSION=	1.2.x
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	clean___
@@ -19,7 +19,7 @@ COMMENT=	The Clean GTK theme engine
 WRKSRC=		${WRKDIR}/gtk-clean-theme
 
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/x11-themes/clean-theme-gtk/pkg-plist b/x11-themes/clean-theme-gtk/pkg-plist
index d5089175bd84..0c5c1dd67fb7 100644
--- a/x11-themes/clean-theme-gtk/pkg-plist
+++ b/x11-themes/clean-theme-gtk/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libclean.a
+lib/gtk/themes/engines/libclean.la
 lib/gtk/themes/engines/libclean.so
 share/themes/Clean/ICON.png
 share/themes/Clean/README.html
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 0f13c51f5f9a..b2173882f2bd 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	clearlooks
 PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clearlooks
@@ -18,7 +18,7 @@ MAINTAINER=	ahze@FreeBSD.org
 COMMENT?=	GTK+ 2.x engine based on Bluecurve
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist
index c4cc9520fde9..7fec8db68699 100644
--- a/x11-themes/clearlooks/pkg-plist
+++ b/x11-themes/clearlooks/pkg-plist
@@ -1,3 +1,4 @@
+%%ENGINE%%lib/gtk-2.0/2.4.0/engines/libclearlooks.la
 %%ENGINE%%lib/gtk-2.0/2.4.0/engines/libclearlooks.so
 share/icons/Clearlooks/16x16/gtk/gtk-apply.png
 share/icons/Clearlooks/16x16/gtk/gtk-cancel.png
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 2a9d22d35748..eadf7d12222f 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	colorstep
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	colorstep
diff --git a/x11-themes/colorstep/pkg-plist b/x11-themes/colorstep/pkg-plist
index a78c2a9387df..bd3cac29ba80 100644
--- a/x11-themes/colorstep/pkg-plist
+++ b/x11-themes/colorstep/pkg-plist
@@ -1,4 +1,5 @@
 lib/gtk/themes/engines/libcolorstep.a
+lib/gtk/themes/engines/libcolorstep.la
 lib/gtk/themes/engines/libcolorstep.so
 share/themes/ColorStep/ICON.png
 share/themes/ColorStep/README.html
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 181537cf6e28..0255200705be 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	engradient
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	engradient
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-themes/engradient/pkg-plist b/x11-themes/engradient/pkg-plist
index 95de8e6071e7..356782894251 100644
--- a/x11-themes/engradient/pkg-plist
+++ b/x11-themes/engradient/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libengradient.a
+lib/gtk/themes/engines/libengradient.la
 lib/gtk/themes/engines/libengradient.so
 share/themes/EnGradient-Blue/gtk/gtkrc
 share/themes/EnGradient-Brushed/gtk/brushed-dark.xpm
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index e1dec6101280..bb261b937561 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${X11BASE}/lib/gtk/themes/engines/libqtpixmap.so:${PORTSDIR}/x11-to
 
 WRKSRC=		${WRKDIR}/Geramik-${PORTVERSION}
 
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 1cc9c8777cb5..9f6b7da4fcef 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-look
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-themes/gnome-look/pkg-plist b/x11-themes/gnome-look/pkg-plist
index 6fe539038bd4..bac4f68b32e1 100644
--- a/x11-themes/gnome-look/pkg-plist
+++ b/x11-themes/gnome-look/pkg-plist
@@ -1,4 +1,5 @@
 lib/gtk/themes/engines/libgnomelook.a
+lib/gtk/themes/engines/libgnomelook.la
 lib/gtk/themes/engines/libgnomelook.so
 share/themes/Gnome-Look-Grey/gtk/gtkrc
 share/themes/Gnome-Look-Icy/gtk/gtkrc
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 46c4b34e4aea..2cbe1390a0f7 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-theme
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui intlhack
 INSTALLS_ICONS=	yes
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 148bf8eaecf7..959d74b75253 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -24,7 +24,7 @@ CONFLICTS=	clearlooks-metacity-0.*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack metacity libgnomeui
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index cd456035fd26..841389bd2d59 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-Mac2-theme
 PORTVERSION=	200003050858
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	mac2
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-themes/gtk-Mac2-theme/pkg-plist b/x11-themes/gtk-Mac2-theme/pkg-plist
index 5f6dfc39db4d..53bfe687137b 100644
--- a/x11-themes/gtk-Mac2-theme/pkg-plist
+++ b/x11-themes/gtk-Mac2-theme/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libmac2.a
+lib/gtk/themes/engines/libmac2.la
 lib/gtk/themes/engines/libmac2.so
 share/themes/Mac2/ICON.png
 share/themes/Mac2/README.html
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 22b8437d3a49..6d0330f16d2d 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-cleanice-engine
 PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	elysium-project
@@ -19,7 +19,7 @@ MAINTAINER=	philip@FreeBSD.org
 COMMENT=	A simplistic GTK+ 2.x theme engine
 
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20
 
 THEME=		cleanice-theme-1.2.7
diff --git a/x11-themes/gtk-cleanice-engine/pkg-plist b/x11-themes/gtk-cleanice-engine/pkg-plist
index 4765d0a3bb0b..42146a3b9a66 100644
--- a/x11-themes/gtk-cleanice-engine/pkg-plist
+++ b/x11-themes/gtk-cleanice-engine/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk-2.0/2.4.0/engines/libcleanice.la
 lib/gtk-2.0/2.4.0/engines/libcleanice.so
 share/themes/CleanIce/index.theme
 share/themes/CleanIce/gtk-2.0/gtkrc
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index faeaa17a4c04..f3ef04c56bab 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-engines
 PORTVERSION=	0.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
@@ -17,7 +17,7 @@ COMMENT=	Theme engine for gtk+ toolkits
 
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 
 THEMES=		metal notif pixmap raleigh redmond95
 
diff --git a/x11-themes/gtk-engines/pkg-plist b/x11-themes/gtk-engines/pkg-plist
index 3fd71824f815..b0baeb8f8c91 100644
--- a/x11-themes/gtk-engines/pkg-plist
+++ b/x11-themes/gtk-engines/pkg-plist
@@ -1,7 +1,12 @@
+lib/gtk/themes/engines/libmetal.la
 lib/gtk/themes/engines/libmetal.so
+lib/gtk/themes/engines/libnotif.la
 lib/gtk/themes/engines/libnotif.so
+lib/gtk/themes/engines/libpixmap.la
 lib/gtk/themes/engines/libpixmap.so
+lib/gtk/themes/engines/libraleigh.la
 lib/gtk/themes/engines/libraleigh.so
+lib/gtk/themes/engines/libredmond95.la
 lib/gtk/themes/engines/libredmond95.so
 share/themes/Metal/ICON.png
 share/themes/Metal/README.html
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index d95d85894557..b98e9fc7172b 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtk-engines2
 PORTVERSION=	2.6.7
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
@@ -22,7 +23,7 @@ CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20
 PLIST_SUB=	GTK_VERSION="2.4.0"
 
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index ace2f721a50a..e474e545f2b5 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -1,12 +1,22 @@
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libclearlooks.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libclearlooks.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
 libdata/pkgconfig/gtk-engines-2.pc
 share/themes/Clearlooks/gtk-2.0/gtkrc
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index 2e4b85f48647..9692c1848656 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-flat-theme
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	flat
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-themes/gtk-flat-theme/pkg-plist b/x11-themes/gtk-flat-theme/pkg-plist
index 81f35028998e..7ce2bd9bad09 100644
--- a/x11-themes/gtk-flat-theme/pkg-plist
+++ b/x11-themes/gtk-flat-theme/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libflat.la
 lib/gtk/themes/engines/libflat.so
 share/themes/Flat/ICON.png
 share/themes/Flat/README.html
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 1992867bd377..7966f44c2fc1 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-flat-theme2
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtk2flat
@@ -19,7 +19,7 @@ COMMENT=	A port of the Flat GTK+ engine to GTK+ 2.0
 WRKSRC=		${WRKDIR}/gtk-flat-theme-2.0
 
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
 
diff --git a/x11-themes/gtk-flat-theme2/pkg-plist b/x11-themes/gtk-flat-theme2/pkg-plist
index eb3360e18d07..087d9693362e 100644
--- a/x11-themes/gtk-flat-theme2/pkg-plist
+++ b/x11-themes/gtk-flat-theme2/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk-2.0/2.4.0/engines/libflat.la
 lib/gtk-2.0/2.4.0/engines/libflat.so
 share/themes/Flat/ICON.png
 share/themes/Flat/README.html
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 63e20e69a2a6..8637d729fc40 100644
--- a/x11-themes/gtk-industrial-theme/Makefile
+++ b/x11-themes/gtk-industrial-theme/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gdkpixbuf
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:13
+USE_AUTOTOOLS=	libtool:15
 
 XIMIAN_SUBVERSION=	0
 XIMIAN_DISTVERSION=	6.3
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index bac040451962..b4632dee27ad 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qn-x11-theme
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	qnx11__
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-qn-x11-theme/pkg-plist b/x11-themes/gtk-qn-x11-theme/pkg-plist
index d49ef279805c..76469915b012 100644
--- a/x11-themes/gtk-qn-x11-theme/pkg-plist
+++ b/x11-themes/gtk-qn-x11-theme/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libqnx.la
 lib/gtk/themes/engines/libqnx.so
 share/themes/QN-X11/ICON.png
 share/themes/QN-X11/README.html
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 6f944508b12a..c105c919c437 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.freedesktop.org/~davidsansome/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11-themes/gtk-qt-engine/pkg-plist b/x11-themes/gtk-qt-engine/pkg-plist
index 2b7c5269b2a6..e29df42b7af7 100644
--- a/x11-themes/gtk-qt-engine/pkg-plist
+++ b/x11-themes/gtk-qt-engine/pkg-plist
@@ -1,8 +1,10 @@
 lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
+lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la
 lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
 share/gtk-qt-engine/kde-index.theme
 share/themes/Qt/gtk-2.0/gtkrc
 @cwd %%LOCALBASE%%
+lib/kde3/kcm_kcmgtk.a
 lib/kde3/kcm_kcmgtk.la
 lib/kde3/kcm_kcmgtk.so
 share/applnk/Settings/LookNFeel/kcmgtk.desktop
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 6f944508b12a..c105c919c437 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.freedesktop.org/~davidsansome/ \
 		http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index 2b7c5269b2a6..e29df42b7af7 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -1,8 +1,10 @@
 lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
+lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la
 lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
 share/gtk-qt-engine/kde-index.theme
 share/themes/Qt/gtk-2.0/gtkrc
 @cwd %%LOCALBASE%%
+lib/kde3/kcm_kcmgtk.a
 lib/kde3/kcm_kcmgtk.la
 lib/kde3/kcm_kcmgtk.so
 share/applnk/Settings/LookNFeel/kcmgtk.desktop
diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index 24a47b0854cd..c2641e16eb25 100644
--- a/x11-themes/gtk-smooth-engine/Makefile
+++ b/x11-themes/gtk-smooth-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-smooth-engine
 PORTVERSION=	0.5.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	smooth-engine
@@ -16,7 +16,7 @@ MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Flexible GTK Theme Engine
 
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 CONFIGURE_ENV=	X11BASE="${X11BASE}"
diff --git a/x11-themes/gtk-smooth-engine/pkg-plist b/x11-themes/gtk-smooth-engine/pkg-plist
index 06ef9f3d867b..5fb08c757f4c 100644
--- a/x11-themes/gtk-smooth-engine/pkg-plist
+++ b/x11-themes/gtk-smooth-engine/pkg-plist
@@ -1,2 +1,4 @@
+%%GTK1:%%lib/gtk/themes/engines/libsmooth.la
 %%GTK1:%%lib/gtk/themes/engines/libsmooth.so
+%%GTK2:%%lib/gtk-2.0/2.4.0/engines/libsmooth.la
 %%GTK2:%%lib/gtk-2.0/2.4.0/engines/libsmooth.so
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index ad8bb4224201..e2ef0af87879 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-xfce-engine
 PORTVERSION=	2.2.8
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-themes xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-4.2.3.1/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-4.2.3.1/src/ \
@@ -17,7 +17,7 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	An XFCE engine for GTK 2.0
 
 USE_GNOME=	gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index 2153e8bd0f6b..427748f13088 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk-2.0/2.4.0/engines/libxfce.la
 lib/gtk-2.0/2.4.0/engines/libxfce.so
 share/themes/Xfce-4.0/gtk-2.0/gtkrc
 share/themes/Xfce-4.0/ICON.png
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index 2b4519a03720..b200b42f4ccd 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-zenith-theme
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	zenith
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/zenith-1.0
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-zenith-theme/pkg-plist b/x11-themes/gtk-zenith-theme/pkg-plist
index 6145f0ee7f59..dd22b989f8f3 100644
--- a/x11-themes/gtk-zenith-theme/pkg-plist
+++ b/x11-themes/gtk-zenith-theme/pkg-plist
@@ -1,3 +1,4 @@
+lib/gtk/themes/engines/libzenith.la
 lib/gtk/themes/engines/libzenith.so
 share/themes/Zenith/ICON.png
 share/themes/Zenith/README.html
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 9ca1bf41299f..5a971879c52e 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkbe
 PORTVERSION=	200007091019
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtkbe
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-themes/gtkbe/pkg-plist b/x11-themes/gtkbe/pkg-plist
index c7af8e4e88fc..c10f6cd16fb3 100644
--- a/x11-themes/gtkbe/pkg-plist
+++ b/x11-themes/gtkbe/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libgtkbe.a
+lib/gtk/themes/engines/libgtkbe.la
 lib/gtk/themes/engines/libgtkbe.so
 share/themes/GTKBe/ICON.png
 share/themes/GTKBe/README.html
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 1e29f9c61b39..e829b746f22b 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkstep-pastel
 PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	gtksteppastel
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/x11-themes/gtkstep-pastel/pkg-plist b/x11-themes/gtkstep-pastel/pkg-plist
index 820064059797..1453a1d175ec 100644
--- a/x11-themes/gtkstep-pastel/pkg-plist
+++ b/x11-themes/gtkstep-pastel/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libsteppastel.a
+lib/gtk/themes/engines/libsteppastel.la
 lib/gtk/themes/engines/libsteppastel.so
 share/themes/StepPastel/ICON.png
 share/themes/StepPastel/README.html
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 967d32db092e..6852344be6ca 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkstep
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/gtk-engines-gtkstep
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/x11-themes/gtkstep/pkg-plist b/x11-themes/gtkstep/pkg-plist
index 4af1afff0a51..1f500e021e02 100644
--- a/x11-themes/gtkstep/pkg-plist
+++ b/x11-themes/gtkstep/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libstep.a
+lib/gtk/themes/engines/libstep.la
 lib/gtk/themes/engines/libstep.so
 share/themes/Step/ICON.png
 share/themes/Step/README.html
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index 45276fff3505..362055013ffd 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icegradient
 PORTVERSION=	200012290259
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.themes.org/pub/themes/gtk/ \
 		${MASTER_SITE_LOCAL}
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.5
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-themes/icegradient/pkg-plist b/x11-themes/icegradient/pkg-plist
index a1c614f88a98..f75be263be7b 100644
--- a/x11-themes/icegradient/pkg-plist
+++ b/x11-themes/icegradient/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libicegradient.a
+lib/gtk/themes/engines/libicegradient.la
 lib/gtk/themes/engines/libicegradient.so
 share/themes/IceGradient/ICON.png
 share/themes/IceGradient/README.html
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 982dfd04cbd4..9341cac34b65 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -26,7 +27,7 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist
index 2fef7fca7d9f..57908f7dd087 100644
--- a/x11-themes/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork3/pkg-plist
@@ -19,36 +19,52 @@ bin/kspace.kss
 bin/kswarm.kss
 bin/kvm.kss
 bin/kwave.kss
+lib/kde3/kstyle_phase_config.a
 lib/kde3/kstyle_phase_config.la
 lib/kde3/kstyle_phase_config.so
+lib/kde3/kwin3_cde.a
 lib/kde3/kwin3_cde.la
 lib/kde3/kwin3_cde.so
+lib/kde3/kwin3_glow.a
 lib/kde3/kwin3_glow.la
 lib/kde3/kwin3_glow.so
+lib/kde3/kwin3_icewm.a
 lib/kde3/kwin3_icewm.la
 lib/kde3/kwin3_icewm.so
+lib/kde3/kwin3_kde1.a
 lib/kde3/kwin3_kde1.la
 lib/kde3/kwin3_kde1.so
+lib/kde3/kwin3_kstep.a
 lib/kde3/kwin3_kstep.la
 lib/kde3/kwin3_kstep.so
+lib/kde3/kwin3_openlook.a
 lib/kde3/kwin3_openlook.la
 lib/kde3/kwin3_openlook.so
+lib/kde3/kwin3_riscos.a
 lib/kde3/kwin3_riscos.la
 lib/kde3/kwin3_riscos.so
+lib/kde3/kwin3_smoothblend.a
 lib/kde3/kwin3_smoothblend.la
 lib/kde3/kwin3_smoothblend.so
+lib/kde3/kwin3_system.a
 lib/kde3/kwin3_system.la
 lib/kde3/kwin3_system.so
+lib/kde3/kwin_cde_config.a
 lib/kde3/kwin_cde_config.la
 lib/kde3/kwin_cde_config.so
+lib/kde3/kwin_glow_config.a
 lib/kde3/kwin_glow_config.la
 lib/kde3/kwin_glow_config.so
+lib/kde3/kwin_icewm_config.a
 lib/kde3/kwin_icewm_config.la
 lib/kde3/kwin_icewm_config.so
+lib/kde3/kwin_smoothblend_config.a
 lib/kde3/kwin_smoothblend_config.la
 lib/kde3/kwin_smoothblend_config.so
+lib/kde3/plugins/styles/dotnet.a
 lib/kde3/plugins/styles/dotnet.la
 lib/kde3/plugins/styles/dotnet.so
+lib/kde3/plugins/styles/phasestyle.a
 lib/kde3/plugins/styles/phasestyle.la
 lib/kde3/plugins/styles/phasestyle.so
 share/applnk/System/ScreenSavers/KBanner.desktop
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 982dfd04cbd4..9341cac34b65 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdeartwork
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -26,7 +27,7 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist
index 2fef7fca7d9f..57908f7dd087 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-themes/kdeartwork4/pkg-plist
@@ -19,36 +19,52 @@ bin/kspace.kss
 bin/kswarm.kss
 bin/kvm.kss
 bin/kwave.kss
+lib/kde3/kstyle_phase_config.a
 lib/kde3/kstyle_phase_config.la
 lib/kde3/kstyle_phase_config.so
+lib/kde3/kwin3_cde.a
 lib/kde3/kwin3_cde.la
 lib/kde3/kwin3_cde.so
+lib/kde3/kwin3_glow.a
 lib/kde3/kwin3_glow.la
 lib/kde3/kwin3_glow.so
+lib/kde3/kwin3_icewm.a
 lib/kde3/kwin3_icewm.la
 lib/kde3/kwin3_icewm.so
+lib/kde3/kwin3_kde1.a
 lib/kde3/kwin3_kde1.la
 lib/kde3/kwin3_kde1.so
+lib/kde3/kwin3_kstep.a
 lib/kde3/kwin3_kstep.la
 lib/kde3/kwin3_kstep.so
+lib/kde3/kwin3_openlook.a
 lib/kde3/kwin3_openlook.la
 lib/kde3/kwin3_openlook.so
+lib/kde3/kwin3_riscos.a
 lib/kde3/kwin3_riscos.la
 lib/kde3/kwin3_riscos.so
+lib/kde3/kwin3_smoothblend.a
 lib/kde3/kwin3_smoothblend.la
 lib/kde3/kwin3_smoothblend.so
+lib/kde3/kwin3_system.a
 lib/kde3/kwin3_system.la
 lib/kde3/kwin3_system.so
+lib/kde3/kwin_cde_config.a
 lib/kde3/kwin_cde_config.la
 lib/kde3/kwin_cde_config.so
+lib/kde3/kwin_glow_config.a
 lib/kde3/kwin_glow_config.la
 lib/kde3/kwin_glow_config.so
+lib/kde3/kwin_icewm_config.a
 lib/kde3/kwin_icewm_config.la
 lib/kde3/kwin_icewm_config.so
+lib/kde3/kwin_smoothblend_config.a
 lib/kde3/kwin_smoothblend_config.la
 lib/kde3/kwin_smoothblend_config.so
+lib/kde3/plugins/styles/dotnet.a
 lib/kde3/plugins/styles/dotnet.la
 lib/kde3/plugins/styles/dotnet.so
+lib/kde3/plugins/styles/phasestyle.a
 lib/kde3/plugins/styles/phasestyle.la
 lib/kde3/plugins/styles/phasestyle.so
 share/applnk/System/ScreenSavers/KBanner.desktop
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index ce74ea0b2f19..38d41e6a0296 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	notif2
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	notif210
diff --git a/x11-themes/notif2/pkg-plist b/x11-themes/notif2/pkg-plist
index 860e2a2771cb..6b18bce34a37 100644
--- a/x11-themes/notif2/pkg-plist
+++ b/x11-themes/notif2/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 lib/gtk/themes/engines/libnotif2.a
+lib/gtk/themes/engines/libnotif2.la
 lib/gtk/themes/engines/libnotif2.so
 lib/gtk/themes/engines/libnotif2.so.0
 share/themes/Notif2/ICON.png
diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile
index 8ff1a44e75b9..856a557675df 100644
--- a/x11-themes/qnxstyle/Makefile
+++ b/x11-themes/qnxstyle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qnxstyle
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes kde
 MASTER_SITES=	http://www.kde-look.org/content/files/
 DISTNAME=	${KDELOOKITEM}-${PORTNAME}-${PORTVERSION}
@@ -19,14 +19,15 @@ KDELOOKITEM=	1444
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_KDELIBS_VER=	3
+USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
-PLIST_FILES=	lib/kde3/plugins/styles/qnx.so \
+PLIST_FILES=	lib/kde3/plugins/styles/qnx.a \
 		lib/kde3/plugins/styles/qnx.la \
+		lib/kde3/plugins/styles/qnx.so \
 		share/apps/kstyle/themes/qnx.themerc
 
 post-patch:
diff --git a/x11-themes/qnxstyle/files/patch-configure b/x11-themes/qnxstyle/files/patch-configure
new file mode 100644
index 000000000000..ba6772d3b7f7
--- /dev/null
+++ b/x11-themes/qnxstyle/files/patch-configure
@@ -0,0 +1,37 @@
+--- configure.orig	Thu Oct 10 00:14:15 2002
++++ configure	Sat Feb 18 22:58:07 2006
+@@ -5490,15 +5490,2 @@
+ 
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+-|| { { echo "$as_me:5500: error: libtool configure failed" >&5
+-echo "$as_me: error: libtool configure failed" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+ # Reload cache, that may have been modified by ltconfig
+@@ -5532,18 +5519,2 @@
+ LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
+-lt_save_CC="$CC"
+-lt_save_CFLAGS="$CFLAGS"
+-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" \
+-file_magic_cmd="$file_magic_cmd" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
+-|| { { echo "$as_me:5544: error: libtool tag configuration failed" >&5
+-echo "$as_me: error: libtool tag configuration failed" >&2;}
+-   { (exit 1); exit 1; }; }
+-CC="$lt_save_CC"
+-CFLAGS="$lt_save_CFLAGS"
+ 
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index c6244211ef8d..2569e3be17d3 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thinice
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	thinice
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/x11-themes/thinice/pkg-plist b/x11-themes/thinice/pkg-plist
index fc97d9a9d417..e93ae3565adb 100644
--- a/x11-themes/thinice/pkg-plist
+++ b/x11-themes/thinice/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libthinice.a
+lib/gtk/themes/engines/libthinice.la
 lib/gtk/themes/engines/libthinice.so
 share/themes/ThinIce/ICON.png
 share/themes/ThinIce/README.html
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 1f3fd9334ba4..475c963245dc 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WhistlerK
 PORTVERSION=	200010142358
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_THEMES}
 MASTER_SITE_SUBDIR=	whistlerk
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/gtk-theme-WhistlerK
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-themes/whistlerk/pkg-plist b/x11-themes/whistlerk/pkg-plist
index c318bccda61e..8c2068d1d5da 100644
--- a/x11-themes/whistlerk/pkg-plist
+++ b/x11-themes/whistlerk/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk/themes/engines/libwhistler.a
+lib/gtk/themes/engines/libwhistler.la
 lib/gtk/themes/engines/libwhistler.so
 share/themes/WhistlerK/ICON.png
 share/themes/WhistlerK/README.html