Conversion to a single libtool environment.

Approved by:	portmgr (kris)

25 files changed, 88 insertions, 23 deletions

diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index c492811ee35..326ceae0656 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehier libgnomeprint
 STRIP=
 
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index afd21bc21d7..b1f777263b7 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	yes
-USE_AUTOTOOLS=	libtool:13
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index d5b44d1b318..63c823033bb 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gsmlib
 PORTVERSION=	1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	http://www.pxh.de/fs/gsmlib/download/
 
diff --git a/comms/gsmlib/pkg-plist b/comms/gsmlib/pkg-plist
index ad2871c1c42..164a58a6b8f 100644
--- a/comms/gsmlib/pkg-plist
+++ b/comms/gsmlib/pkg-plist
@@ -24,9 +24,11 @@ include/gsmlib/gsm_sorted_sms_store.h
 include/gsmlib/gsm_unix_serial.h
 include/gsmlib/gsm_util.h
 lib/libgsmext.a
+lib/libgsmext.la
 lib/libgsmext.so
 lib/libgsmext.so.1
 lib/libgsmme.a
+lib/libgsmme.la
 lib/libgsmme.so
 lib/libgsmme.so.1
 %%NLS%%share/locale/de/LC_MESSAGES/gsmlib.mo
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 62d91093d43..4bd43f9560e 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 
 USE_PERL5=	yes
-USE_AUTOTOOLS=	libtool:15:inc
+GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig gnomehack
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile
index 023685dcf7b..531d95b594e 100644
--- a/comms/kallers/Makefile
+++ b/comms/kallers/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kallers
 PORTVERSION=	0.3.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms kde
 MASTER_SITES=	http://www.nadmm.com/kallers/src/
 
@@ -17,7 +17,7 @@ USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
 USE_REINPLACE=		yes
-GNU_CONFIGURE=		yes
+USE_AUTOTOOLS=		libtool:15
 CONFIGURE_TARGET=
 
 post-patch:
diff --git a/comms/kallers/pkg-plist b/comms/kallers/pkg-plist
index d94741570fe..6b731c6732d 100644
--- a/comms/kallers/pkg-plist
+++ b/comms/kallers/pkg-plist
@@ -1,4 +1,5 @@
 bin/kallers
+lib/kallers.a
 lib/kallers.la
 lib/kallers.so
 share/applnk/Toys/kallers.desktop
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 0b177d580cf..05b8f2324ce 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -15,7 +15,7 @@ COMMENT=	ADIF compatible logging application
 
 LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index fda737e1b6f..94afa9b0849 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \
 		USER_LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-debug=full
diff --git a/comms/kpsk/files/patch-aa b/comms/kpsk/files/patch-aa
index 0ea71b84fac..5834ce3ffda 100644
--- a/comms/kpsk/files/patch-aa
+++ b/comms/kpsk/files/patch-aa
@@ -1,11 +1,38 @@
---- configure.orig	Thu Oct 24 11:17:10 2002
-+++ configure	Thu Oct 24 11:17:32 2002
-@@ -8703,7 +8703,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
+--- configure.orig	Wed Oct  9 00:32:30 2002
++++ configure	Sat Feb 18 22:49:57 2006
+@@ -3830,13 +3830,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 "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
+ # Reload cache, that may have been modified by ltconfig
+@@ -3864,16 +3853,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 "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
+-CC="$lt_save_CC"
+-CFLAGS="$lt_save_CFLAGS"
+ 
+@@ -8705,3 +8680,3 @@
    ac_save_LIBS="$LIBS"
 -LIBS="-ldb-4.0  $LIBS"
 +LIBS="-ldb-4.0 $USER_LDFLAGS  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8709 "configure"
- #include "confdefs.h"
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 7acd17c5419..e2e833f5a58 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/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/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist
index dd5e3c34fce..e7f5117ec76 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/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/comms/libticables/Makefile b/comms/libticables/Makefile
index 5ae41bac7ee..f032c042e06 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libticables
 PORTVERSION=	3.9.7
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -16,7 +17,6 @@ COMMENT=	TI calculator link cables library
 
 LIB_DEPENDS=	usb-0.1.8:${PORTSDIR}/devel/libusb
 
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/comms/libticables/pkg-plist b/comms/libticables/pkg-plist
index 3e44992262a..43a8d8a6dcb 100644
--- a/comms/libticables/pkg-plist
+++ b/comms/libticables/pkg-plist
@@ -6,6 +6,7 @@ include/tilp/export.h
 include/tilp/ticables.h
 include/tilp/timeout.h
 lib/libticables.a
+lib/libticables.la
 lib/libticables.so
 lib/libticables.so.12
 libdata/pkgconfig/ticables.pc
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 44ebe152c45..f34ce0bf664 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Linux Infared Remote Control
 USE_XLIB=	yes
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 96ad8b5192b..7d7cf5d69a2 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openobex
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	comms net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/comms/openobex/pkg-plist b/comms/openobex/pkg-plist
index cc752871c2b..a9c8e83efcd 100644
--- a/comms/openobex/pkg-plist
+++ b/comms/openobex/pkg-plist
@@ -4,6 +4,7 @@ include/openobex/obex_const.h
 lib/libopenobex-1.0.so
 lib/libopenobex-1.0.so.1
 lib/libopenobex.a
+lib/libopenobex.la
 lib/libopenobex.so
 share/aclocal/openobex.m4
 @dirrm include/openobex
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index 3f6eba0942c..b0396136f85 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 JAVA_OS=	native
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=	yes
 
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile
index 8889b88845c..e71e33ed53a 100644
--- a/comms/spandsp-devel/Makefile
+++ b/comms/spandsp-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spandsp
 DISTVERSION=	0.0.2pre20
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/${PORTNAME}-${DISTVERSION}/ \
 		${MASTER_SITE_LOCAL}
@@ -22,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/comms/spandsp-devel/pkg-plist b/comms/spandsp-devel/pkg-plist
index 560c8b72e64..003fe92936d 100644
--- a/comms/spandsp-devel/pkg-plist
+++ b/comms/spandsp-devel/pkg-plist
@@ -51,6 +51,7 @@ include/spandsp/v42bis.h
 include/spandsp/v8.h
 include/spandsp/vector.h
 lib/libspandsp.a
+lib/libspandsp.la
 lib/libspandsp.so
 lib/libspandsp.so.0
 %%DATADIR%%/global-tones.xml
diff --git a/comms/spandsp-devel5/Makefile b/comms/spandsp-devel5/Makefile
index 8889b88845c..e71e33ed53a 100644
--- a/comms/spandsp-devel5/Makefile
+++ b/comms/spandsp-devel5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spandsp
 DISTVERSION=	0.0.2pre20
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/${PORTNAME}-${DISTVERSION}/ \
 		${MASTER_SITE_LOCAL}
@@ -22,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/comms/spandsp-devel5/pkg-plist b/comms/spandsp-devel5/pkg-plist
index 560c8b72e64..003fe92936d 100644
--- a/comms/spandsp-devel5/pkg-plist
+++ b/comms/spandsp-devel5/pkg-plist
@@ -51,6 +51,7 @@ include/spandsp/v42bis.h
 include/spandsp/v8.h
 include/spandsp/vector.h
 lib/libspandsp.a
+lib/libspandsp.la
 lib/libspandsp.so
 lib/libspandsp.so.0
 %%DATADIR%%/global-tones.xml
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index 8889b88845c..e71e33ed53a 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spandsp
 DISTVERSION=	0.0.2pre20
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/${PORTNAME}-${DISTVERSION}/ \
 		${MASTER_SITE_LOCAL}
@@ -22,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/comms/spandsp/pkg-plist b/comms/spandsp/pkg-plist
index 560c8b72e64..003fe92936d 100644
--- a/comms/spandsp/pkg-plist
+++ b/comms/spandsp/pkg-plist
@@ -51,6 +51,7 @@ include/spandsp/v42bis.h
 include/spandsp/v8.h
 include/spandsp/vector.h
 lib/libspandsp.a
+lib/libspandsp.la
 lib/libspandsp.so
 lib/libspandsp.so.0
 %%DATADIR%%/global-tones.xml
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index e00a5efbf6f..667e36cfd23 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -24,7 +24,6 @@ USE_GETTEXT=	yes
 USE_GNOME=	gtk20 libglade2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"\