Conversion to a single libtool environment.

Approved by:	portmgr (kris)

12 files changed, 62 insertions, 20 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 7de403a0f189..5d20cb94fb33 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -50,7 +50,7 @@ USE_GNOME+=	gtk20
 CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-2.0"
 .else
 USE_GNOME+=	gtk12
-CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread12"
+CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-12"
 CONFIGURE_ARGS+=--disable-gtk20
 .endif
 .endif
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 310e7cdb1001..f04855eb2b31 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile
index 2f4704b17d8a..5a6e702b2eae 100644
--- a/ftp/kasablanca/Makefile
+++ b/ftp/kasablanca/Makefile
@@ -19,7 +19,7 @@ EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 5bfe52437ba9..acee7938a174 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kbear
 PORTVERSION=		3.0.a.1
-PORTREVISION=	5
+PORTREVISION=		6
 CATEGORIES=		ftp kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,14 +18,15 @@ PATCHFILES=		${DISTNAME:S/.src/-patch/}.gz
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		A graphical FTP client for KDE
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}
-INSTALLS_SHLIB=		yes
-USE_KDELIBS_VER=	3
-USE_REINPLACE=		yes
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		XML2POT=${TRUE} PO2XML=${TRUE} LDFLAGS="${PTHREAD_LIBS}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}
+
+INSTALLS_SHLIB=	yes
+USE_KDELIBS_VER=3
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	XML2POT=${TRUE} PO2XML=${TRUE} LDFLAGS="${PTHREAD_LIBS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|-fPIC|g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/ftp/kbear/pkg-plist b/ftp/kbear/pkg-plist
index 9500dd5b2704..44d8a58e6f08 100644
--- a/ftp/kbear/pkg-plist
+++ b/ftp/kbear/pkg-plist
@@ -42,53 +42,77 @@ include/kbear/siteinfo.h
 include/kbear/transfer.h
 include/kbear/transfergroup.h
 include/kbear/transfermanager.h
+lib/kde3/kbearconsole.a
 lib/kde3/kbearconsole.la
 lib/kde3/kbearconsole.so
+lib/kde3/kbearfilediff.a
 lib/kde3/kbearfilediff.la
 lib/kde3/kbearfilediff.so
+lib/kde3/kbearfirewall.a
 lib/kde3/kbearfirewall.la
 lib/kde3/kbearfirewall.so
+lib/kde3/kbeargftpimportfilter.a
 lib/kde3/kbeargftpimportfilter.la
 lib/kde3/kbeargftpimportfilter.so
+lib/kde3/kbearimportfilter.a
 lib/kde3/kbearimportfilter.la
 lib/kde3/kbearimportfilter.so
+lib/kde3/kbearkrusaderimportfilter.a
 lib/kde3/kbearkrusaderimportfilter.la
 lib/kde3/kbearkrusaderimportfilter.so
+lib/kde3/kbearlogoutput.a
 lib/kde3/kbearlogoutput.la
 lib/kde3/kbearlogoutput.so
+lib/kde3/kbearncftpimportfilter.a
 lib/kde3/kbearncftpimportfilter.la
 lib/kde3/kbearncftpimportfilter.so
+lib/kde3/kbearrecentconnections.a
 lib/kde3/kbearrecentconnections.la
 lib/kde3/kbearrecentconnections.so
+lib/kde3/kbearsitemanager.a
 lib/kde3/kbearsitemanager.la
 lib/kde3/kbearsitemanager.so
+lib/kde3/kbearsystemtraydock.a
 lib/kde3/kbearsystemtraydock.la
 lib/kde3/kbearsystemtraydock.so
+lib/kde3/kbeartipofday.a
 lib/kde3/kbeartipofday.la
 lib/kde3/kbeartipofday.so
+lib/kde3/kbeartools.a
 lib/kde3/kbeartools.la
 lib/kde3/kbeartools.so
+lib/kde3/kbeartransferoutput.a
 lib/kde3/kbeartransferoutput.la
 lib/kde3/kbeartransferoutput.so
+lib/kde3/kbeartransferqueue.a
 lib/kde3/kbeartransferqueue.la
 lib/kde3/kbeartransferqueue.so
+lib/kde3/kbearurllistimportfilter.a
 lib/kde3/kbearurllistimportfilter.la
 lib/kde3/kbearurllistimportfilter.so
+lib/kde3/kbearwincommanderimportfilter.a
 lib/kde3/kbearwincommanderimportfilter.la
 lib/kde3/kbearwincommanderimportfilter.so
+lib/kde3/kbearwizard.a
 lib/kde3/kbearwizard.la
 lib/kde3/kbearwizard.so
+lib/kde3/kbearwsftpimportfilter.a
 lib/kde3/kbearwsftpimportfilter.la
 lib/kde3/kbearwsftpimportfilter.so
+lib/kde3/kio_kbearftp.a
 lib/kde3/kio_kbearftp.la
 lib/kde3/kio_kbearftp.so
+lib/kde3/libkbearlocalfilesyspart.a
 lib/kde3/libkbearlocalfilesyspart.la
 lib/kde3/libkbearlocalfilesyspart.so
+lib/kde3/libkbearremotefilesyspart.a
 lib/kde3/libkbearremotefilesyspart.la
 lib/kde3/libkbearremotefilesyspart.so
+lib/libkbearcore.a
 lib/libkbearcore.la
 lib/libkbearcore.so
 lib/libkbearcore.so.3
+lib/libkbearqextmdi.a
 lib/libkbearqextmdi.la
 lib/libkbearqextmdi.so
 lib/libkbearqextmdi.so.3
diff --git a/ftp/kftpgrabber/Makefile b/ftp/kftpgrabber/Makefile
index 24c6bca30500..bec2f10d4640 100644
--- a/ftp/kftpgrabber/Makefile
+++ b/ftp/kftpgrabber/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kftpgrabber
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
 OPTIONS=	QSA  "QSA scripting support" on
diff --git a/ftp/kftpgrabber/pkg-plist b/ftp/kftpgrabber/pkg-plist
index 4a8166f0f9be..150f4f3f8c8c 100644
--- a/ftp/kftpgrabber/pkg-plist
+++ b/ftp/kftpgrabber/pkg-plist
@@ -1,9 +1,12 @@
 bin/kftpgrabber
 include/kftpgrabber/kftpbookmarkimportplugin.h
+lib/kde3/kftpimportplugin_gftp.a
 lib/kde3/kftpimportplugin_gftp.la
 lib/kde3/kftpimportplugin_gftp.so
+lib/kde3/kftpimportplugin_ncftp.a
 lib/kde3/kftpimportplugin_ncftp.la
 lib/kde3/kftpimportplugin_ncftp.so
+lib/libkftpinterfaces.a
 lib/libkftpinterfaces.la
 lib/libkftpinterfaces.so
 lib/libkftpinterfaces.so.0
diff --git a/ftp/kpum/Makefile b/ftp/kpum/Makefile
index 41e65d363456..b357335829a2 100644
--- a/ftp/kpum/Makefile
+++ b/ftp/kpum/Makefile
@@ -18,8 +18,8 @@ COMMENT=	KDE pureftpd user manager
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_BZIP2=	yes
-USE_KDELIBS_VER=	3
+USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 
 .include <bsd.port.mk>
diff --git a/ftp/kwebget/Makefile b/ftp/kwebget/Makefile
index 3b435958551e..cebaaf71a7cc 100644
--- a/ftp/kwebget/Makefile
+++ b/ftp/kwebget/Makefile
@@ -20,10 +20,10 @@ RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
-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/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index ee89adb69402..73faa84f746a 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -22,7 +22,7 @@ WANT_GNOME=	yes
 USE_OPENSSL=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index b55bf77b289f..f5a24b42023b 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +20,6 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	pkgconfig
 CONFIGURE_ARGS+=	--without-pam --without-pgsql --disable-bonjour
 CONFIGURE_ENV=	CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 3605a72ffaf7..facf65cd11fe 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -77,16 +77,30 @@ include/wzdftpd/libwzd.h
 include/wzdftpd/libwzd_pv.h
 include/wzdftpd/libwzd_socket.h
 include/wzdftpd/libwzd_tls.h
+lib/libwzd_core.la
+lib/libwzd_core.a
 lib/libwzd_core.so
 lib/libwzd_core.so.1
+lib/libwzd.a
+lib/libwzd.la
 lib/libwzd.so
 lib/libwzd.so.1
 share/aclocal/wzd.m4
 sbin/wzdftpd
+%%DATADIR%%/backends/libwzdplaintext.a
+%%DATADIR%%/backends/libwzdplaintext.la
 %%DATADIR%%/backends/libwzdplaintext.so
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.a
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.la
 %%MYSQL%%%%DATADIR%%/backends/libwzdmysql.so
+%%DATADIR%%/modules/libwzd_sfv.a
+%%DATADIR%%/modules/libwzd_sfv.la
 %%DATADIR%%/modules/libwzd_sfv.so
+%%PERL%%%%DATADIR%%/modules/libwzd_perl.a
+%%PERL%%%%DATADIR%%/modules/libwzd_perl.la
 %%PERL%%%%DATADIR%%/modules/libwzd_perl.so
+%%TCL%%%%DATADIR%%/modules/libwzd_tcl.a
+%%TCL%%%%DATADIR%%/modules/libwzd_tcl.la
 %%TCL%%%%DATADIR%%/modules/libwzd_tcl.so
 %%ZEROCONF%%%%DATADIR%%/modules/libwzd_zeroconf.so
 @dirrm %%DATADIR%%/modules/