Conversion to a single libtool environment.

Approved by:	portmgr (kris)

35 files changed, 163 insertions, 143 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 7acd17c54199..e2e833f5a58e 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/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/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
index dd5e3c34fcee..e7f5117ec760 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/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/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 39ba1e9cd35f..85a84fcd2705 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	fileroller
 PORTVERSION=	2.12.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -29,7 +30,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
 		gnomedocutils
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 0d3069fc7350..99f309c21ccc 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,5 +1,9 @@
 bin/file-roller
+lib/bonobo/libfile-roller-component.a
+lib/bonobo/libfile-roller-component.la
 lib/bonobo/libfile-roller-component.so
+lib/nautilus/extensions-1.0/libnautilus-fileroller.a
+lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
 libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 39ba1e9cd35f..85a84fcd2705 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	fileroller
 PORTVERSION=	2.12.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -29,7 +30,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
 		gnomedocutils
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 0d3069fc7350..99f309c21ccc 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,5 +1,9 @@
 bin/file-roller
+lib/bonobo/libfile-roller-component.a
+lib/bonobo/libfile-roller-component.la
 lib/bonobo/libfile-roller-component.so
+lib/nautilus/extensions-1.0/libnautilus-fileroller.a
+lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
 libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 59446491d63d..a6cc8208558c 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libcomprex
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,9 +19,9 @@ COMMENT=	Transparently handles automatic compression and decompression of files
 
 #LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
-USE_AUTOTOOLS=	libltdl:15 libtool:15
+GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libltdl:15
 USE_GNOME=	gnomehack gnometarget pkgconfig
-LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 INSTALLS_SHLIB=	yes
diff --git a/archivers/libcomprex/pkg-plist b/archivers/libcomprex/pkg-plist
index 5dac0a3ff6fd..15cc572b5377 100644
--- a/archivers/libcomprex/pkg-plist
+++ b/archivers/libcomprex/pkg-plist
@@ -11,16 +11,32 @@ include/libcomprex/io.h
 include/libcomprex/module.h
 include/libcomprex/types.h
 include/libcomprex/utils.h
+lib/comprex/archive/libar.a
+lib/comprex/archive/libar.la
 lib/comprex/archive/libar.so
+lib/comprex/archive/libbzip2.a
+lib/comprex/archive/libbzip2.la
 lib/comprex/archive/libbzip2.so
+lib/comprex/archive/libcab.a
+lib/comprex/archive/libcab.la
 lib/comprex/archive/libcab.so
+lib/comprex/archive/libcpio.a
+lib/comprex/archive/libcpio.la
 lib/comprex/archive/libcpio.so
+lib/comprex/archive/libtar.a
+lib/comprex/archive/libtar.la
 lib/comprex/archive/libtar.so
+lib/comprex/archive/libzip.a
+lib/comprex/archive/libzip.la
 lib/comprex/archive/libzip.so
+lib/comprex/archive/libzlib.a
+lib/comprex/archive/libzlib.la
 lib/comprex/archive/libzlib.so
+@comment lib/comprex/scheme/libcurlscm.a
 @comment lib/comprex/scheme/libcurlscm.la
 @comment lib/comprex/scheme/libcurlscm.so
 lib/libcomprex.a
+lib/libcomprex.la
 lib/libcomprex.so
 lib/libcomprex.so.3
 libdata/pkgconfig/libcomprex.pc
diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile
index f40289b1cef8..b53c2d32ee7f 100644
--- a/archivers/libmspack/Makefile
+++ b/archivers/libmspack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmspack
 PORTVERSION=	0.0.20040308
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.kyz.uklinux.net/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}alpha
@@ -17,7 +17,7 @@ COMMENT=	A library for Microsoft compression formats
 
 USE_REINPLACE=		yes
 USE_GETOPT_LONG=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/archivers/libmspack/pkg-plist b/archivers/libmspack/pkg-plist
index 143687a0f11e..2e3b831175df 100644
--- a/archivers/libmspack/pkg-plist
+++ b/archivers/libmspack/pkg-plist
@@ -1,4 +1,5 @@
 include/mspack.h
 lib/libmspack.a
+lib/libmspack.la
 lib/libmspack.so
 lib/libmspack.so.1
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index 37075dc64aab..9c8fe7c337f0 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orange
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
@@ -23,7 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/archivers/liborange/pkg-plist b/archivers/liborange/pkg-plist
index a67185754d6a..6bd214029cb4 100644
--- a/archivers/liborange/pkg-plist
+++ b/archivers/liborange/pkg-plist
@@ -1,5 +1,6 @@
 bin/orange
 include/liborange.h
-lib/liborange.so.0
-lib/liborange.so
 lib/liborange.a
+lib/liborange.la
+lib/liborange.so
+lib/liborange.so.0
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 42e40ebad857..eb2bf0c0ba71 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lzo
 PORTVERSION=	1.08
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/LZO-v1/
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/archivers/lzo/pkg-plist b/archivers/lzo/pkg-plist
index 9951bb36e9a9..88c2fcc7401f 100644
--- a/archivers/lzo/pkg-plist
+++ b/archivers/lzo/pkg-plist
@@ -11,6 +11,7 @@ include/lzo2a.h
 include/lzoconf.h
 include/lzoutil.h
 lib/liblzo.a
+lib/liblzo.la
 lib/liblzo.so
 lib/liblzo.so.1
 %%PORTDOCS%%%%DOCSDIR%%/LTEST.TXT
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 7d7e579f68ef..b953f16868e1 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lzo2
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/ \
 		http://fresh.t-systems-sfr.com/unix/src/misc/ \
@@ -17,7 +18,7 @@ DISTNAME=	lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Portable speedy, lossless data compression library
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/archivers/lzo2/pkg-plist b/archivers/lzo2/pkg-plist
index 7133b1fcb30d..665b68d190d2 100644
--- a/archivers/lzo2/pkg-plist
+++ b/archivers/lzo2/pkg-plist
@@ -12,6 +12,7 @@ include/lzo/lzoconf.h
 include/lzo/lzodefs.h
 include/lzo/lzoutil.h
 lib/liblzo2.a
+lib/liblzo2.la
 lib/liblzo2.so
 lib/liblzo2.so.2
 %%PORTDOCS%%%%DOCSDIR%%/LZO.FAQ
diff --git a/archivers/orange/Makefile b/archivers/orange/Makefile
index 37075dc64aab..9c8fe7c337f0 100644
--- a/archivers/orange/Makefile
+++ b/archivers/orange/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orange
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
@@ -23,7 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/archivers/orange/pkg-plist b/archivers/orange/pkg-plist
index a67185754d6a..6bd214029cb4 100644
--- a/archivers/orange/pkg-plist
+++ b/archivers/orange/pkg-plist
@@ -1,5 +1,6 @@
 bin/orange
 include/liborange.h
-lib/liborange.so.0
-lib/liborange.so
 lib/liborange.a
+lib/liborange.la
+lib/liborange.so
+lib/liborange.so.0
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index c89ad51473dc..292f66b0d78a 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	3.0.6
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
 
@@ -20,7 +20,7 @@ CONFLICTS=	rpm-4.*
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:13:inc
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-glob
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/archivers/rpm/pkg-plist b/archivers/rpm/pkg-plist
index 96685ddbb22f..fbaedefa706b 100644
--- a/archivers/rpm/pkg-plist
+++ b/archivers/rpm/pkg-plist
@@ -12,9 +12,11 @@ include/rpm/rpmspec.h
 include/rpm/rpmurl.h
 include/rpm/stringbuf.h
 lib/librpm.a
+lib/librpm.la
 lib/librpm.so
 lib/librpm.so.0
 lib/librpmbuild.a
+lib/librpmbuild.la
 lib/librpmbuild.so
 lib/librpmbuild.so.0
 lib/rpm/brp-compress
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 89bf9a688ba0..f49f8ffb6c7a 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
@@ -21,7 +21,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=  yes
+LIBTOOLFILES=	configure db3/configure db/dist/configure popt/configure \
+		beecrypt/configure
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
@@ -56,6 +58,12 @@ MAN8=	rpm.8 rpm2cpio.8 rpmbuild.8
 PORTDOCS=	*
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' \
 		${WRKSRC}/configure ${WRKSRC}/beecrypt/configure
@@ -71,4 +79,4 @@ post-install:
 	# Run package installation script
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/rpm4/files/patch-beecrypt::configure b/archivers/rpm4/files/patch-beecrypt::configure
index 70c915421668..acc7080ab270 100644
--- a/archivers/rpm4/files/patch-beecrypt::configure
+++ b/archivers/rpm4/files/patch-beecrypt::configure
@@ -1,14 +1,5 @@
 --- beecrypt/configure.orig	Wed Feb 13 16:03:22 2002
 +++ beecrypt/configure	Thu Mar  4 14:49:35 2004
-@@ -5473,7 +5473,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='%%LOCALBASE%%/bin/libtool13'
- 
- # Prevent multiple expansion
- 
 @@ -6914,7 +6914,7 @@
    fi
  else
diff --git a/archivers/rpm4/files/patch-configure b/archivers/rpm4/files/patch-configure
index 71cbc7092215..17275f7357dd 100644
--- a/archivers/rpm4/files/patch-configure
+++ b/archivers/rpm4/files/patch-configure
@@ -9,15 +9,6 @@
    --disable-nls           do not use Native Language Support"
  ac_help="$ac_help
    --with-included-gettext use the GNU gettext library included here"
-@@ -6138,7 +6140,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='%%LOCALBASE%%/bin/libtool13'
- 
- # Prevent multiple expansion
- 
 @@ -7381,6 +7383,8 @@
  #  AC_DEFINE(HAVE_GZSEEK)
  #fi
diff --git a/archivers/rpm4/files/patch-rpmio::Makefile.in b/archivers/rpm4/files/patch-rpmio::Makefile.in
index 87671759506e..54ce4ee11346 100644
--- a/archivers/rpm4/files/patch-rpmio::Makefile.in
+++ b/archivers/rpm4/files/patch-rpmio::Makefile.in
@@ -1,26 +1,19 @@
---- rpmio/Makefile.in.orig	Thu Feb 14 16:58:37 2002
-+++ rpmio/Makefile.in	Thu Mar  4 00:55:37 2004
-@@ -197,7 +197,7 @@
- 	-I$(top_srcdir)/build \
- 	-I$(top_srcdir)/lib \
+--- rpmio/Makefile.in.orig	Thu Feb 14 23:58:37 2002
++++ rpmio/Makefile.in	Wed Jan 25 01:44:09 2006
+@@ -199,3 +199,3 @@
  	-I$(top_srcdir)/beecrypt \
 -	-I$(top_srcdir)/popt \
 +	@WITH_POPT_INCLUDE@ \
  	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@
- 
-@@ -209,7 +209,7 @@
- 
- noinst_HEADERS = rpmio_internal.h rpmpgp.h
+@@ -211,5 +211,6 @@
  
 -LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread
 +LIBS = @LIBS@ @WITH_ZLIB_LIB@
  
  BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
++BEECRYPTOBJS = $(BEECRYPTLOBJS:.lo=.o)
  
-@@ -222,18 +222,18 @@
- librpmio_la_DEPENDENCIES = .created
- 
+@@ -224,6 +225,6 @@
  tdigest_SOURCES = tdigest.c
 -tdigest_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +tdigest_LDADD =  librpmio.la @WITH_POPT_LIB@
@@ -29,21 +22,17 @@
 -trpmio_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +trpmio_LDADD =  librpmio.la @WITH_POPT_LIB@
  
- tkey_SOURCES = tkey.c
+@@ -231,3 +232,3 @@
  tkey_LDFLAGS = -all-static
 -tkey_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +tkey_LDADD =  librpmio.la @WITH_POPT_LIB@
  
- tring_SOURCES = tring.c
+@@ -235,3 +236,3 @@
  tring_LDFLAGS = -all-static
 -tring_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +tring_LDADD =  librpmio.la @WITH_POPT_LIB@
  
- dumpasn1_SOURCES = dumpasn1.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -248,15 +248,17 @@
- librpmio_la_OBJECTS =  digest.lo macro.lo rpmio.lo rpmlog.lo \
- rpmmalloc.lo rpmpgp.lo rpmrpc.lo strcasecmp.lo stubs.lo url.lo ugid.lo
+@@ -250,11 +251,13 @@
  tdigest_OBJECTS =  tdigest.$(OBJEXT)
 -tdigest_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
 -tdigest_LDFLAGS = 
@@ -63,23 +52,20 @@
 +trpmio_DEPENDENCIES =  librpmio.la
 +trpmio_LDFLAGS = @WITH_POPT_LIB@
  dumpasn1_OBJECTS =  dumpasn1.$(OBJEXT)
- dumpasn1_LDADD = $(LDADD)
- dumpasn1_DEPENDENCIES = 
-@@ -461,7 +463,7 @@
- install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
+@@ -463,3 +466,3 @@
  
 -install-data-am: install-pkgincHEADERS install-data-local
 +install-data-am: install-pkgincHEADERS
  install-data: install-data-am
- 
- install-am: all-am
-@@ -535,7 +537,7 @@
- 	mv .librpmio.la librpmio.la
- 
+@@ -537,3 +540,3 @@
  $(top_builddir)/beecrypt/listobjs:
 -	make -C $(top_builddir)/beecrypt listobjs
 +	$(MAKE) -C $(top_builddir)/beecrypt listobjs
  
- .created: $(top_builddir)/beecrypt/listobjs
- 	for lo in $(BEECRYPTLOBJS); do \
+@@ -542,2 +545,6 @@
+ 	  [ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \
++	done
++	for o in $(BEECRYPTOBJS); do \
++	  $(LN_S) ../../beecrypt/.libs/$$o .libs/$$o ; \
++	  $(LN_S) ../beecrypt/$$o $$o ; \
+ 	done
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 04dbc75f46eb..3eda18f8814b 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -25,7 +25,6 @@ include/rpm/rpmspec.h
 include/rpm/rpmurl.h
 include/rpm/stringbuf.h
 include/rpm/ugid.h
-lib/libbeecrypt.a
 lib/libbeecrypt.la
 lib/libbeecrypt.so
 lib/libbeecrypt.so.4
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 89bf9a688ba0..f49f8ffb6c7a 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
@@ -21,7 +21,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-USE_AUTOTOOLS=	libtool:13
+GNU_CONFIGURE=  yes
+LIBTOOLFILES=	configure db3/configure db/dist/configure popt/configure \
+		beecrypt/configure
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
@@ -56,6 +58,12 @@ MAN8=	rpm.8 rpm2cpio.8 rpmbuild.8
 PORTDOCS=	*
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' \
 		${WRKSRC}/configure ${WRKSRC}/beecrypt/configure
@@ -71,4 +79,4 @@ post-install:
 	# Run package installation script
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/rpm5/files/patch-beecrypt::configure b/archivers/rpm5/files/patch-beecrypt::configure
index 70c915421668..acc7080ab270 100644
--- a/archivers/rpm5/files/patch-beecrypt::configure
+++ b/archivers/rpm5/files/patch-beecrypt::configure
@@ -1,14 +1,5 @@
 --- beecrypt/configure.orig	Wed Feb 13 16:03:22 2002
 +++ beecrypt/configure	Thu Mar  4 14:49:35 2004
-@@ -5473,7 +5473,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='%%LOCALBASE%%/bin/libtool13'
- 
- # Prevent multiple expansion
- 
 @@ -6914,7 +6914,7 @@
    fi
  else
diff --git a/archivers/rpm5/files/patch-configure b/archivers/rpm5/files/patch-configure
index 71cbc7092215..17275f7357dd 100644
--- a/archivers/rpm5/files/patch-configure
+++ b/archivers/rpm5/files/patch-configure
@@ -9,15 +9,6 @@
    --disable-nls           do not use Native Language Support"
  ac_help="$ac_help
    --with-included-gettext use the GNU gettext library included here"
-@@ -6138,7 +6140,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='%%LOCALBASE%%/bin/libtool13'
- 
- # Prevent multiple expansion
- 
 @@ -7381,6 +7383,8 @@
  #  AC_DEFINE(HAVE_GZSEEK)
  #fi
diff --git a/archivers/rpm5/files/patch-rpmio::Makefile.in b/archivers/rpm5/files/patch-rpmio::Makefile.in
index 87671759506e..54ce4ee11346 100644
--- a/archivers/rpm5/files/patch-rpmio::Makefile.in
+++ b/archivers/rpm5/files/patch-rpmio::Makefile.in
@@ -1,26 +1,19 @@
---- rpmio/Makefile.in.orig	Thu Feb 14 16:58:37 2002
-+++ rpmio/Makefile.in	Thu Mar  4 00:55:37 2004
-@@ -197,7 +197,7 @@
- 	-I$(top_srcdir)/build \
- 	-I$(top_srcdir)/lib \
+--- rpmio/Makefile.in.orig	Thu Feb 14 23:58:37 2002
++++ rpmio/Makefile.in	Wed Jan 25 01:44:09 2006
+@@ -199,3 +199,3 @@
  	-I$(top_srcdir)/beecrypt \
 -	-I$(top_srcdir)/popt \
 +	@WITH_POPT_INCLUDE@ \
  	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@
- 
-@@ -209,7 +209,7 @@
- 
- noinst_HEADERS = rpmio_internal.h rpmpgp.h
+@@ -211,5 +211,6 @@
  
 -LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread
 +LIBS = @LIBS@ @WITH_ZLIB_LIB@
  
  BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
++BEECRYPTOBJS = $(BEECRYPTLOBJS:.lo=.o)
  
-@@ -222,18 +222,18 @@
- librpmio_la_DEPENDENCIES = .created
- 
+@@ -224,6 +225,6 @@
  tdigest_SOURCES = tdigest.c
 -tdigest_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +tdigest_LDADD =  librpmio.la @WITH_POPT_LIB@
@@ -29,21 +22,17 @@
 -trpmio_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +trpmio_LDADD =  librpmio.la @WITH_POPT_LIB@
  
- tkey_SOURCES = tkey.c
+@@ -231,3 +232,3 @@
  tkey_LDFLAGS = -all-static
 -tkey_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +tkey_LDADD =  librpmio.la @WITH_POPT_LIB@
  
- tring_SOURCES = tring.c
+@@ -235,3 +236,3 @@
  tring_LDFLAGS = -all-static
 -tring_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
 +tring_LDADD =  librpmio.la @WITH_POPT_LIB@
  
- dumpasn1_SOURCES = dumpasn1.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -248,15 +248,17 @@
- librpmio_la_OBJECTS =  digest.lo macro.lo rpmio.lo rpmlog.lo \
- rpmmalloc.lo rpmpgp.lo rpmrpc.lo strcasecmp.lo stubs.lo url.lo ugid.lo
+@@ -250,11 +251,13 @@
  tdigest_OBJECTS =  tdigest.$(OBJEXT)
 -tdigest_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
 -tdigest_LDFLAGS = 
@@ -63,23 +52,20 @@
 +trpmio_DEPENDENCIES =  librpmio.la
 +trpmio_LDFLAGS = @WITH_POPT_LIB@
  dumpasn1_OBJECTS =  dumpasn1.$(OBJEXT)
- dumpasn1_LDADD = $(LDADD)
- dumpasn1_DEPENDENCIES = 
-@@ -461,7 +463,7 @@
- install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
+@@ -463,3 +466,3 @@
  
 -install-data-am: install-pkgincHEADERS install-data-local
 +install-data-am: install-pkgincHEADERS
  install-data: install-data-am
- 
- install-am: all-am
-@@ -535,7 +537,7 @@
- 	mv .librpmio.la librpmio.la
- 
+@@ -537,3 +540,3 @@
  $(top_builddir)/beecrypt/listobjs:
 -	make -C $(top_builddir)/beecrypt listobjs
 +	$(MAKE) -C $(top_builddir)/beecrypt listobjs
  
- .created: $(top_builddir)/beecrypt/listobjs
- 	for lo in $(BEECRYPTLOBJS); do \
+@@ -542,2 +545,6 @@
+ 	  [ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \
++	done
++	for o in $(BEECRYPTOBJS); do \
++	  $(LN_S) ../../beecrypt/.libs/$$o .libs/$$o ; \
++	  $(LN_S) ../beecrypt/$$o $$o ; \
+ 	done
diff --git a/archivers/rpm5/pkg-plist b/archivers/rpm5/pkg-plist
index 04dbc75f46eb..3eda18f8814b 100644
--- a/archivers/rpm5/pkg-plist
+++ b/archivers/rpm5/pkg-plist
@@ -25,7 +25,6 @@ include/rpm/rpmspec.h
 include/rpm/rpmurl.h
 include/rpm/stringbuf.h
 include/rpm/ugid.h
-lib/libbeecrypt.a
 lib/libbeecrypt.la
 lib/libbeecrypt.so
 lib/libbeecrypt.so.4
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 86d87ec48e5e..9b615580ca5a 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ucl
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/
 
@@ -14,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A data compression library with low memory usage
 
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/archivers/ucl/pkg-plist b/archivers/ucl/pkg-plist
index 47aaf53ed07f..4376a7b358fe 100644
--- a/archivers/ucl/pkg-plist
+++ b/archivers/ucl/pkg-plist
@@ -3,6 +3,7 @@ include/ucl/ucl.h
 include/ucl/ucl_asm.h
 include/ucl/uclconf.h
 lib/libucl.a
+lib/libucl.la
 lib/libucl.so
 lib/libucl.so.1
 @dirrm include/ucl
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 5cb48fe9e392..fc6cef4345ee 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpk
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.jormas.com/~vesuri/xpk/ \
 		http://www.energyhq.es.eu.org/files/
@@ -14,7 +15,7 @@ MASTER_SITES=	http://www.jormas.com/~vesuri/xpk/ \
 MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	The eXternal PacKer (XPK) library system
 
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/archivers/xpk/pkg-plist b/archivers/xpk/pkg-plist
index 3f01d7e579bb..1528e164f2b6 100644
--- a/archivers/xpk/pkg-plist
+++ b/archivers/xpk/pkg-plist
@@ -1,28 +1,33 @@
-bin/xType
+bin/xDir
 bin/xPK
 bin/xQuery
+bin/xType
 bin/xUp
-bin/xDir
 bin/xpk-config
 include/xpk/amigalibs.h
 include/xpk/xpk.h
 include/xpk/xpkLib.h
 include/xpk/xpkprefs.h
 include/xpk/xpksub.h
-lib/libxpkmaster.so.5
-lib/libxpkmaster.so
-lib/libxpkmaster.a
-lib/libxpkNONE.so.1
-lib/libxpkNONE.so
+lib/libxpkGZIP.a
+lib/libxpkGZIP.la
+lib/libxpkGZIP.so
+lib/libxpkGZIP.so.1
 lib/libxpkNONE.a
-lib/libxpkRLEN.so.1
-lib/libxpkRLEN.so
+lib/libxpkNONE.la
+lib/libxpkNONE.so
+lib/libxpkNONE.so.1
 lib/libxpkRLEN.a
-lib/libxpkSQSH.so.1
-lib/libxpkSQSH.so
+lib/libxpkRLEN.la
+lib/libxpkRLEN.so
+lib/libxpkRLEN.so.1
 lib/libxpkSQSH.a
-lib/libxpkGZIP.so.1
-lib/libxpkGZIP.so
-lib/libxpkGZIP.a
+lib/libxpkSQSH.la
+lib/libxpkSQSH.so
+lib/libxpkSQSH.so.1
+lib/libxpkmaster.a
+lib/libxpkmaster.la
+lib/libxpkmaster.so
+lib/libxpkmaster.so.5
 share/aclocal/xpk.m4
 @dirrm include/xpk
diff --git a/archivers/zipios++/Makefile b/archivers/zipios++/Makefile
index 0480cb631ade..5e178f7e9ce2 100644
--- a/archivers/zipios++/Makefile
+++ b/archivers/zipios++/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 # port don't strictly need it, but Wesnoth use it so must we
 USE_GCC=	3.4
-USE_AUTOTOOLS=	automake:19:env libtool:15:inc
+USE_AUTOTOOLS=	automake:19:env
 CONFIGURE_ARGS+=--disable-static
 USE_REINPLACE=	yes