Conversion to a single libtool environment.

Approved by:	portmgr (kris)

30 files changed, 158 insertions, 35 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index ada5dd21bff6..ab46c80bf15f 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	1.6.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.6
@@ -22,7 +22,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo \
 		intlhack
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 611fcc0364f1..f87187c9c458 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -30,16 +30,25 @@ include/at-spi-1.0/libspi/value.h
 include/at-spi-1.0/login-helper/Accessibility_LoginHelper.h
 include/at-spi-1.0/login-helper/login-helper.h
 lib/libcspi.a
+lib/libcspi.la
 lib/libcspi.so
 lib/libcspi.so.10
 lib/libloginhelper.a
+lib/libloginhelper.la
 lib/libloginhelper.so
 lib/libloginhelper.so.0
 lib/libspi.a
+lib/libspi.la
 lib/libspi.so
 lib/libspi.so.10
+lib/gtk-2.0/modules/libatk-bridge.a
+lib/gtk-2.0/modules/libatk-bridge.la
 lib/gtk-2.0/modules/libatk-bridge.so
+lib/orbit-2.0/Accessibility_LoginHelper_module.a
+lib/orbit-2.0/Accessibility_LoginHelper_module.la
 lib/orbit-2.0/Accessibility_LoginHelper_module.so
+lib/orbit-2.0/Accessibility_module.a
+lib/orbit-2.0/Accessibility_module.la
 lib/orbit-2.0/Accessibility_module.so
 libdata/bonobo/servers/Accessibility_Registry.server
 libdata/pkgconfig/cspi-1.0.pc
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index add39ca63b46..c99b643dc6b7 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.10.3
+PORTREVISION=	1
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.6/
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 9664e6c246c1..4458fa2e1320 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -25,6 +25,7 @@ include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk-1.0.a
+lib/libatk-1.0.la
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
 libdata/pkgconfig/atk.pc
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index bc05491c3ab8..445df1ae2890 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
 		libwnck
 WANT_GNOME=	yes
-USE_AUTOTOOLS=	libtool:15:inc
+GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_GCC=	3.4+
@@ -50,13 +50,4 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-O2||g'
 
-patch-autotools::
-	@(cd ${PATCH_WRKSRC}; \
-	for file in ${LIBTOOLFILES}; do \
-		${CP} $$file $$file.tmp; \
-		${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
-			$$file.tmp > $$file; \
-		${RM} $$file.tmp; \
-	done);
-
 .include <bsd.port.post.mk>
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index a6e969b05169..a6d7c917e3a6 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gail
 PORTVERSION=	1.8.10
+PORTREVISION=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
@@ -19,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack libgnomecanvas lthack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 6d9ab38d6a4e..532efc0325cc 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -1,8 +1,9 @@
 include/gail-1.0/libgail-util/gail-util.h
 include/gail-1.0/libgail-util/gailmisc.h
 include/gail-1.0/libgail-util/gailtextutil.h
+lib/gtk-2.0/modules/libgail.la
 lib/gtk-2.0/modules/libgail.so
-lib/libgailutil.a
+lib/libgailutil.la
 lib/libgailutil.so
 lib/libgailutil.so.17
 libdata/pkgconfig/gail.pc
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index ea98367c34f3..198755c9ac4b 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemag
 PORTVERSION=	0.12.3
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-mag/0.12
@@ -20,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index f72b72378100..6a4faa567729 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -1,6 +1,6 @@
 bin/magnifier
 include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
-lib/libgnome-mag.a
+lib/libgnome-mag.la
 lib/libgnome-mag.so
 lib/libgnome-mag.so.2
 libdata/bonobo/servers/GNOME_Magnifier.server
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index e2e343d16fb1..1a18a35a0afa 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomespeech
 PORTVERSION=	0.3.9
+PORTREVISION=	1
 CATEGORIES=	accessibility audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-speech/0.3
@@ -19,7 +20,7 @@ COMMENT=	GNOME text-to-speech API
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libbonobo
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/accessibility/gnome-speech/pkg-plist b/accessibility/gnome-speech/pkg-plist
index 1c66148480e8..dc90aef8937f 100644
--- a/accessibility/gnome-speech/pkg-plist
+++ b/accessibility/gnome-speech/pkg-plist
@@ -4,8 +4,11 @@ include/gnome-speech-1.0/gnome-speech/GNOME_Speech.h
 include/gnome-speech-1.0/gnome-speech/gnome-speech.h
 include/gnome-speech-1.0/gnome-speech/speaker.h
 lib/libgnomespeech.a
+lib/libgnomespeech.la
 lib/libgnomespeech.so
 lib/libgnomespeech.so.7
+lib/orbit-2.0/GNOME_Speech_module.a
+lib/orbit-2.0/GNOME_Speech_module.la
 lib/orbit-2.0/GNOME_Speech_module.so
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
 libdata/pkgconfig/gnome-speech-1.0.pc
diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile
index ea98367c34f3..198755c9ac4b 100644
--- a/accessibility/gnomemag/Makefile
+++ b/accessibility/gnomemag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemag
 PORTVERSION=	0.12.3
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-mag/0.12
@@ -20,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnomemag/pkg-plist b/accessibility/gnomemag/pkg-plist
index f72b72378100..6a4faa567729 100644
--- a/accessibility/gnomemag/pkg-plist
+++ b/accessibility/gnomemag/pkg-plist
@@ -1,6 +1,6 @@
 bin/magnifier
 include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
-lib/libgnome-mag.a
+lib/libgnome-mag.la
 lib/libgnome-mag.so
 lib/libgnome-mag.so.2
 libdata/bonobo/servers/GNOME_Magnifier.server
diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile
index e2e343d16fb1..1a18a35a0afa 100644
--- a/accessibility/gnomespeech/Makefile
+++ b/accessibility/gnomespeech/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomespeech
 PORTVERSION=	0.3.9
+PORTREVISION=	1
 CATEGORIES=	accessibility audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-speech/0.3
@@ -19,7 +20,7 @@ COMMENT=	GNOME text-to-speech API
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libbonobo
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/accessibility/gnomespeech/pkg-plist b/accessibility/gnomespeech/pkg-plist
index 1c66148480e8..dc90aef8937f 100644
--- a/accessibility/gnomespeech/pkg-plist
+++ b/accessibility/gnomespeech/pkg-plist
@@ -4,8 +4,11 @@ include/gnome-speech-1.0/gnome-speech/GNOME_Speech.h
 include/gnome-speech-1.0/gnome-speech/gnome-speech.h
 include/gnome-speech-1.0/gnome-speech/speaker.h
 lib/libgnomespeech.a
+lib/libgnomespeech.la
 lib/libgnomespeech.so
 lib/libgnomespeech.so.7
+lib/orbit-2.0/GNOME_Speech_module.a
+lib/orbit-2.0/GNOME_Speech_module.la
 lib/orbit-2.0/GNOME_Speech_module.so
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
 libdata/pkgconfig/gnome-speech-1.0.pc
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index e91aa26cdf10..0279ccad564e 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnopernicus
 PORTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.12
@@ -24,7 +25,7 @@ INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	SED="${SED}"
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index b43a4644b069..f991f6425962 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -18,25 +18,25 @@ include/gnopernicus-1.0/libsrutil/SRMessages.h
 include/gnopernicus-1.0/libsrutil/srintl.h
 include/gnopernicus-1.0/libsrutil/sru-debug.h
 include/gnopernicus-1.0/libsrutil/util.h
-lib/gnopernicus-1.0/libbrl.a
+lib/gnopernicus-1.0/libbrl.la
 lib/gnopernicus-1.0/libbrl.so
 lib/gnopernicus-1.0/libbrl.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libke.a
+lib/gnopernicus-1.0/libke.la
 lib/gnopernicus-1.0/libke.so
 lib/gnopernicus-1.0/libke.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libmag.a
+lib/gnopernicus-1.0/libmag.la
 lib/gnopernicus-1.0/libmag.so
 lib/gnopernicus-1.0/libmag.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrconf.a
+lib/gnopernicus-1.0/libsrconf.la
 lib/gnopernicus-1.0/libsrconf.so
 lib/gnopernicus-1.0/libsrconf.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrlow.a
+lib/gnopernicus-1.0/libsrlow.la
 lib/gnopernicus-1.0/libsrlow.so
 lib/gnopernicus-1.0/libsrlow.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrs.a
+lib/gnopernicus-1.0/libsrs.la
 lib/gnopernicus-1.0/libsrs.so
 lib/gnopernicus-1.0/libsrs.so.%%SHLIB_VERSION%%
-lib/gnopernicus-1.0/libsrutil.a
+lib/gnopernicus-1.0/libsrutil.la
 lib/gnopernicus-1.0/libsrutil.so
 lib/gnopernicus-1.0/libsrutil.so.%%SHLIB_VERSION%%
 libdata/pkgconfig/gnopernicus-1.0.pc
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index bf04490f3876..6c2a461c4cba 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index 2b32e04b256d..80bd148fdc02 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/accessibility/kaccessible/pkg-plist b/accessibility/kaccessible/pkg-plist
index d3c1107e0708..304090f1f797 100644
--- a/accessibility/kaccessible/pkg-plist
+++ b/accessibility/kaccessible/pkg-plist
@@ -5,39 +5,56 @@ bin/ksayit
 bin/kttsd
 bin/kttsmgr
 include/ksayit_fxplugin.h
+lib/kde3/kbstate_panelapplet.a
 lib/kde3/kbstate_panelapplet.la
 lib/kde3/kbstate_panelapplet.so
+lib/kde3/kcm_kttsd.a
 lib/kde3/kcm_kttsd.la
 lib/kde3/kcm_kttsd.so
+lib/kde3/ktexteditor_kttsd.a
 lib/kde3/ktexteditor_kttsd.la
 lib/kde3/ktexteditor_kttsd.so
+lib/kde3/libkttsd_artsplugin.a
 lib/kde3/libkttsd_artsplugin.la
 lib/kde3/libkttsd_artsplugin.so
+lib/kde3/libkttsd_commandplugin.a
 lib/kde3/libkttsd_commandplugin.la
 lib/kde3/libkttsd_commandplugin.so
+lib/kde3/libkttsd_eposplugin.a
 lib/kde3/libkttsd_eposplugin.la
 lib/kde3/libkttsd_eposplugin.so
+lib/kde3/libkttsd_festivalintplugin.a
 lib/kde3/libkttsd_festivalintplugin.la
 lib/kde3/libkttsd_festivalintplugin.so
+lib/kde3/libkttsd_fliteplugin.a
 lib/kde3/libkttsd_fliteplugin.la
 lib/kde3/libkttsd_fliteplugin.so
+lib/kde3/libkttsd_freettsplugin.a
 lib/kde3/libkttsd_freettsplugin.la
 lib/kde3/libkttsd_freettsplugin.so
+lib/kde3/libkttsd_hadifixplugin.a
 lib/kde3/libkttsd_hadifixplugin.la
 lib/kde3/libkttsd_hadifixplugin.so
+lib/kde3/libkttsd_sbdplugin.a
 lib/kde3/libkttsd_sbdplugin.la
 lib/kde3/libkttsd_sbdplugin.so
+lib/kde3/libkttsd_stringreplacerplugin.a
 lib/kde3/libkttsd_stringreplacerplugin.la
 lib/kde3/libkttsd_stringreplacerplugin.so
+lib/kde3/libkttsd_talkerchooserplugin.a
 lib/kde3/libkttsd_talkerchooserplugin.la
 lib/kde3/libkttsd_talkerchooserplugin.so
+lib/kde3/libkttsd_xmltransformerplugin.a
 lib/kde3/libkttsd_xmltransformerplugin.la
 lib/kde3/libkttsd_xmltransformerplugin.so
+lib/kde3/libkttsjobmgrpart.a
 lib/kde3/libkttsjobmgrpart.la
 lib/kde3/libkttsjobmgrpart.so
+lib/libKTTSD_Lib.a
 lib/libKTTSD_Lib.la
 lib/libKTTSD_Lib.so
 lib/libKTTSD_Lib.so.0
+lib/libkttsd.a
 lib/libkttsd.la
 lib/libkttsd.so
 lib/libkttsd.so.1
diff --git a/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile
index 2b32e04b256d..80bd148fdc02 100644
--- a/accessibility/kdeaccessibility/Makefile
+++ b/accessibility/kdeaccessibility/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/accessibility/kdeaccessibility/pkg-plist b/accessibility/kdeaccessibility/pkg-plist
index d3c1107e0708..304090f1f797 100644
--- a/accessibility/kdeaccessibility/pkg-plist
+++ b/accessibility/kdeaccessibility/pkg-plist
@@ -5,39 +5,56 @@ bin/ksayit
 bin/kttsd
 bin/kttsmgr
 include/ksayit_fxplugin.h
+lib/kde3/kbstate_panelapplet.a
 lib/kde3/kbstate_panelapplet.la
 lib/kde3/kbstate_panelapplet.so
+lib/kde3/kcm_kttsd.a
 lib/kde3/kcm_kttsd.la
 lib/kde3/kcm_kttsd.so
+lib/kde3/ktexteditor_kttsd.a
 lib/kde3/ktexteditor_kttsd.la
 lib/kde3/ktexteditor_kttsd.so
+lib/kde3/libkttsd_artsplugin.a
 lib/kde3/libkttsd_artsplugin.la
 lib/kde3/libkttsd_artsplugin.so
+lib/kde3/libkttsd_commandplugin.a
 lib/kde3/libkttsd_commandplugin.la
 lib/kde3/libkttsd_commandplugin.so
+lib/kde3/libkttsd_eposplugin.a
 lib/kde3/libkttsd_eposplugin.la
 lib/kde3/libkttsd_eposplugin.so
+lib/kde3/libkttsd_festivalintplugin.a
 lib/kde3/libkttsd_festivalintplugin.la
 lib/kde3/libkttsd_festivalintplugin.so
+lib/kde3/libkttsd_fliteplugin.a
 lib/kde3/libkttsd_fliteplugin.la
 lib/kde3/libkttsd_fliteplugin.so
+lib/kde3/libkttsd_freettsplugin.a
 lib/kde3/libkttsd_freettsplugin.la
 lib/kde3/libkttsd_freettsplugin.so
+lib/kde3/libkttsd_hadifixplugin.a
 lib/kde3/libkttsd_hadifixplugin.la
 lib/kde3/libkttsd_hadifixplugin.so
+lib/kde3/libkttsd_sbdplugin.a
 lib/kde3/libkttsd_sbdplugin.la
 lib/kde3/libkttsd_sbdplugin.so
+lib/kde3/libkttsd_stringreplacerplugin.a
 lib/kde3/libkttsd_stringreplacerplugin.la
 lib/kde3/libkttsd_stringreplacerplugin.so
+lib/kde3/libkttsd_talkerchooserplugin.a
 lib/kde3/libkttsd_talkerchooserplugin.la
 lib/kde3/libkttsd_talkerchooserplugin.so
+lib/kde3/libkttsd_xmltransformerplugin.a
 lib/kde3/libkttsd_xmltransformerplugin.la
 lib/kde3/libkttsd_xmltransformerplugin.so
+lib/kde3/libkttsjobmgrpart.a
 lib/kde3/libkttsjobmgrpart.la
 lib/kde3/libkttsjobmgrpart.so
+lib/libKTTSD_Lib.a
 lib/libKTTSD_Lib.la
 lib/libKTTSD_Lib.so
 lib/libKTTSD_Lib.so.0
+lib/libkttsd.a
 lib/libkttsd.la
 lib/libkttsd.so
 lib/libkttsd.so.1
diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile
index 2b32e04b256d..80bd148fdc02 100644
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/accessibility/kdeaccessibility4/pkg-plist b/accessibility/kdeaccessibility4/pkg-plist
index d3c1107e0708..304090f1f797 100644
--- a/accessibility/kdeaccessibility4/pkg-plist
+++ b/accessibility/kdeaccessibility4/pkg-plist
@@ -5,39 +5,56 @@ bin/ksayit
 bin/kttsd
 bin/kttsmgr
 include/ksayit_fxplugin.h
+lib/kde3/kbstate_panelapplet.a
 lib/kde3/kbstate_panelapplet.la
 lib/kde3/kbstate_panelapplet.so
+lib/kde3/kcm_kttsd.a
 lib/kde3/kcm_kttsd.la
 lib/kde3/kcm_kttsd.so
+lib/kde3/ktexteditor_kttsd.a
 lib/kde3/ktexteditor_kttsd.la
 lib/kde3/ktexteditor_kttsd.so
+lib/kde3/libkttsd_artsplugin.a
 lib/kde3/libkttsd_artsplugin.la
 lib/kde3/libkttsd_artsplugin.so
+lib/kde3/libkttsd_commandplugin.a
 lib/kde3/libkttsd_commandplugin.la
 lib/kde3/libkttsd_commandplugin.so
+lib/kde3/libkttsd_eposplugin.a
 lib/kde3/libkttsd_eposplugin.la
 lib/kde3/libkttsd_eposplugin.so
+lib/kde3/libkttsd_festivalintplugin.a
 lib/kde3/libkttsd_festivalintplugin.la
 lib/kde3/libkttsd_festivalintplugin.so
+lib/kde3/libkttsd_fliteplugin.a
 lib/kde3/libkttsd_fliteplugin.la
 lib/kde3/libkttsd_fliteplugin.so
+lib/kde3/libkttsd_freettsplugin.a
 lib/kde3/libkttsd_freettsplugin.la
 lib/kde3/libkttsd_freettsplugin.so
+lib/kde3/libkttsd_hadifixplugin.a
 lib/kde3/libkttsd_hadifixplugin.la
 lib/kde3/libkttsd_hadifixplugin.so
+lib/kde3/libkttsd_sbdplugin.a
 lib/kde3/libkttsd_sbdplugin.la
 lib/kde3/libkttsd_sbdplugin.so
+lib/kde3/libkttsd_stringreplacerplugin.a
 lib/kde3/libkttsd_stringreplacerplugin.la
 lib/kde3/libkttsd_stringreplacerplugin.so
+lib/kde3/libkttsd_talkerchooserplugin.a
 lib/kde3/libkttsd_talkerchooserplugin.la
 lib/kde3/libkttsd_talkerchooserplugin.so
+lib/kde3/libkttsd_xmltransformerplugin.a
 lib/kde3/libkttsd_xmltransformerplugin.la
 lib/kde3/libkttsd_xmltransformerplugin.so
+lib/kde3/libkttsjobmgrpart.a
 lib/kde3/libkttsjobmgrpart.la
 lib/kde3/libkttsjobmgrpart.so
+lib/libKTTSD_Lib.a
 lib/libKTTSD_Lib.la
 lib/libKTTSD_Lib.so
 lib/libKTTSD_Lib.so.0
+lib/libkttsd.a
 lib/libkttsd.la
 lib/libkttsd.so
 lib/libkttsd.so.1
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index 2b32e04b256d..80bd148fdc02 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/accessibility/kmag/pkg-plist b/accessibility/kmag/pkg-plist
index d3c1107e0708..304090f1f797 100644
--- a/accessibility/kmag/pkg-plist
+++ b/accessibility/kmag/pkg-plist
@@ -5,39 +5,56 @@ bin/ksayit
 bin/kttsd
 bin/kttsmgr
 include/ksayit_fxplugin.h
+lib/kde3/kbstate_panelapplet.a
 lib/kde3/kbstate_panelapplet.la
 lib/kde3/kbstate_panelapplet.so
+lib/kde3/kcm_kttsd.a
 lib/kde3/kcm_kttsd.la
 lib/kde3/kcm_kttsd.so
+lib/kde3/ktexteditor_kttsd.a
 lib/kde3/ktexteditor_kttsd.la
 lib/kde3/ktexteditor_kttsd.so
+lib/kde3/libkttsd_artsplugin.a
 lib/kde3/libkttsd_artsplugin.la
 lib/kde3/libkttsd_artsplugin.so
+lib/kde3/libkttsd_commandplugin.a
 lib/kde3/libkttsd_commandplugin.la
 lib/kde3/libkttsd_commandplugin.so
+lib/kde3/libkttsd_eposplugin.a
 lib/kde3/libkttsd_eposplugin.la
 lib/kde3/libkttsd_eposplugin.so
+lib/kde3/libkttsd_festivalintplugin.a
 lib/kde3/libkttsd_festivalintplugin.la
 lib/kde3/libkttsd_festivalintplugin.so
+lib/kde3/libkttsd_fliteplugin.a
 lib/kde3/libkttsd_fliteplugin.la
 lib/kde3/libkttsd_fliteplugin.so
+lib/kde3/libkttsd_freettsplugin.a
 lib/kde3/libkttsd_freettsplugin.la
 lib/kde3/libkttsd_freettsplugin.so
+lib/kde3/libkttsd_hadifixplugin.a
 lib/kde3/libkttsd_hadifixplugin.la
 lib/kde3/libkttsd_hadifixplugin.so
+lib/kde3/libkttsd_sbdplugin.a
 lib/kde3/libkttsd_sbdplugin.la
 lib/kde3/libkttsd_sbdplugin.so
+lib/kde3/libkttsd_stringreplacerplugin.a
 lib/kde3/libkttsd_stringreplacerplugin.la
 lib/kde3/libkttsd_stringreplacerplugin.so
+lib/kde3/libkttsd_talkerchooserplugin.a
 lib/kde3/libkttsd_talkerchooserplugin.la
 lib/kde3/libkttsd_talkerchooserplugin.so
+lib/kde3/libkttsd_xmltransformerplugin.a
 lib/kde3/libkttsd_xmltransformerplugin.la
 lib/kde3/libkttsd_xmltransformerplugin.so
+lib/kde3/libkttsjobmgrpart.a
 lib/kde3/libkttsjobmgrpart.la
 lib/kde3/libkttsjobmgrpart.so
+lib/libKTTSD_Lib.a
 lib/libKTTSD_Lib.la
 lib/libKTTSD_Lib.so
 lib/libKTTSD_Lib.so.0
+lib/libkttsd.a
 lib/libkttsd.la
 lib/libkttsd.so
 lib/libkttsd.so.1
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index 2b32e04b256d..80bd148fdc02 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/accessibility/kmousetool/pkg-plist b/accessibility/kmousetool/pkg-plist
index d3c1107e0708..304090f1f797 100644
--- a/accessibility/kmousetool/pkg-plist
+++ b/accessibility/kmousetool/pkg-plist
@@ -5,39 +5,56 @@ bin/ksayit
 bin/kttsd
 bin/kttsmgr
 include/ksayit_fxplugin.h
+lib/kde3/kbstate_panelapplet.a
 lib/kde3/kbstate_panelapplet.la
 lib/kde3/kbstate_panelapplet.so
+lib/kde3/kcm_kttsd.a
 lib/kde3/kcm_kttsd.la
 lib/kde3/kcm_kttsd.so
+lib/kde3/ktexteditor_kttsd.a
 lib/kde3/ktexteditor_kttsd.la
 lib/kde3/ktexteditor_kttsd.so
+lib/kde3/libkttsd_artsplugin.a
 lib/kde3/libkttsd_artsplugin.la
 lib/kde3/libkttsd_artsplugin.so
+lib/kde3/libkttsd_commandplugin.a
 lib/kde3/libkttsd_commandplugin.la
 lib/kde3/libkttsd_commandplugin.so
+lib/kde3/libkttsd_eposplugin.a
 lib/kde3/libkttsd_eposplugin.la
 lib/kde3/libkttsd_eposplugin.so
+lib/kde3/libkttsd_festivalintplugin.a
 lib/kde3/libkttsd_festivalintplugin.la
 lib/kde3/libkttsd_festivalintplugin.so
+lib/kde3/libkttsd_fliteplugin.a
 lib/kde3/libkttsd_fliteplugin.la
 lib/kde3/libkttsd_fliteplugin.so
+lib/kde3/libkttsd_freettsplugin.a
 lib/kde3/libkttsd_freettsplugin.la
 lib/kde3/libkttsd_freettsplugin.so
+lib/kde3/libkttsd_hadifixplugin.a
 lib/kde3/libkttsd_hadifixplugin.la
 lib/kde3/libkttsd_hadifixplugin.so
+lib/kde3/libkttsd_sbdplugin.a
 lib/kde3/libkttsd_sbdplugin.la
 lib/kde3/libkttsd_sbdplugin.so
+lib/kde3/libkttsd_stringreplacerplugin.a
 lib/kde3/libkttsd_stringreplacerplugin.la
 lib/kde3/libkttsd_stringreplacerplugin.so
+lib/kde3/libkttsd_talkerchooserplugin.a
 lib/kde3/libkttsd_talkerchooserplugin.la
 lib/kde3/libkttsd_talkerchooserplugin.so
+lib/kde3/libkttsd_xmltransformerplugin.a
 lib/kde3/libkttsd_xmltransformerplugin.la
 lib/kde3/libkttsd_xmltransformerplugin.so
+lib/kde3/libkttsjobmgrpart.a
 lib/kde3/libkttsjobmgrpart.la
 lib/kde3/libkttsjobmgrpart.so
+lib/libKTTSD_Lib.a
 lib/libKTTSD_Lib.la
 lib/libKTTSD_Lib.so
 lib/libKTTSD_Lib.so.0
+lib/libkttsd.a
 lib/libkttsd.la
 lib/libkttsd.so
 lib/libkttsd.so.1
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index 2b32e04b256d..80bd148fdc02 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,7 +21,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/accessibility/kmouth/pkg-plist b/accessibility/kmouth/pkg-plist
index d3c1107e0708..304090f1f797 100644
--- a/accessibility/kmouth/pkg-plist
+++ b/accessibility/kmouth/pkg-plist
@@ -5,39 +5,56 @@ bin/ksayit
 bin/kttsd
 bin/kttsmgr
 include/ksayit_fxplugin.h
+lib/kde3/kbstate_panelapplet.a
 lib/kde3/kbstate_panelapplet.la
 lib/kde3/kbstate_panelapplet.so
+lib/kde3/kcm_kttsd.a
 lib/kde3/kcm_kttsd.la
 lib/kde3/kcm_kttsd.so
+lib/kde3/ktexteditor_kttsd.a
 lib/kde3/ktexteditor_kttsd.la
 lib/kde3/ktexteditor_kttsd.so
+lib/kde3/libkttsd_artsplugin.a
 lib/kde3/libkttsd_artsplugin.la
 lib/kde3/libkttsd_artsplugin.so
+lib/kde3/libkttsd_commandplugin.a
 lib/kde3/libkttsd_commandplugin.la
 lib/kde3/libkttsd_commandplugin.so
+lib/kde3/libkttsd_eposplugin.a
 lib/kde3/libkttsd_eposplugin.la
 lib/kde3/libkttsd_eposplugin.so
+lib/kde3/libkttsd_festivalintplugin.a
 lib/kde3/libkttsd_festivalintplugin.la
 lib/kde3/libkttsd_festivalintplugin.so
+lib/kde3/libkttsd_fliteplugin.a
 lib/kde3/libkttsd_fliteplugin.la
 lib/kde3/libkttsd_fliteplugin.so
+lib/kde3/libkttsd_freettsplugin.a
 lib/kde3/libkttsd_freettsplugin.la
 lib/kde3/libkttsd_freettsplugin.so
+lib/kde3/libkttsd_hadifixplugin.a
 lib/kde3/libkttsd_hadifixplugin.la
 lib/kde3/libkttsd_hadifixplugin.so
+lib/kde3/libkttsd_sbdplugin.a
 lib/kde3/libkttsd_sbdplugin.la
 lib/kde3/libkttsd_sbdplugin.so
+lib/kde3/libkttsd_stringreplacerplugin.a
 lib/kde3/libkttsd_stringreplacerplugin.la
 lib/kde3/libkttsd_stringreplacerplugin.so
+lib/kde3/libkttsd_talkerchooserplugin.a
 lib/kde3/libkttsd_talkerchooserplugin.la
 lib/kde3/libkttsd_talkerchooserplugin.so
+lib/kde3/libkttsd_xmltransformerplugin.a
 lib/kde3/libkttsd_xmltransformerplugin.la
 lib/kde3/libkttsd_xmltransformerplugin.so
+lib/kde3/libkttsjobmgrpart.a
 lib/kde3/libkttsjobmgrpart.la
 lib/kde3/libkttsjobmgrpart.so
+lib/libKTTSD_Lib.a
 lib/libKTTSD_Lib.la
 lib/libKTTSD_Lib.so
 lib/libKTTSD_Lib.so.0
+lib/libkttsd.a
 lib/libkttsd.la
 lib/libkttsd.so
 lib/libkttsd.so.1