14 files changed, 55 insertions, 12 deletions

diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index e2b462f56029..fc39b16eea22 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enca
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	converters textproc russian ukrainian
 MASTER_SITES=	http://kf.fyz.fce.vutbr.cz/~yeti/Ftp/enca/
 
@@ -17,7 +18,7 @@ USE_GNOME=	pkgconfig
 USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
diff --git a/converters/enca/pkg-plist b/converters/enca/pkg-plist
index 56aaa72770a5..88e090684882 100644
--- a/converters/enca/pkg-plist
+++ b/converters/enca/pkg-plist
@@ -2,6 +2,7 @@ bin/enca
 bin/enconv
 include/enca.h
 lib/libenca.a
+lib/libenca.la
 lib/libenca.so
 lib/libenca.so.4
 libdata/pkgconfig/enca.pc
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index 8983a147c452..fa43fcd21699 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	fribidi
 PORTVERSION=	0.10.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~fribidi/download/
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Free Implementation of the Unicode Bidirectional Algorithm
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
 INSTALLS_SHLIB=	yes
 
diff --git a/converters/fribidi/pkg-plist b/converters/fribidi/pkg-plist
index f16cc5561ebe..c45ace31099a 100644
--- a/converters/fribidi/pkg-plist
+++ b/converters/fribidi/pkg-plist
@@ -14,6 +14,7 @@ include/fribidi/fribidi_mem.h
 include/fribidi/fribidi_types.h
 include/fribidi/fribidi_unicode.h
 lib/libfribidi.a
+lib/libfribidi.la
 lib/libfribidi.so
 lib/libfribidi.so.0
 libdata/pkgconfig/fribidi.pc
diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile
index abcbd1b980b9..276cef05db31 100644
--- a/converters/ktextdecode/Makefile
+++ b/converters/ktextdecode/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The simple text conversion utility for KDE 3
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/converters/ktextdecode/files/patch-configure b/converters/ktextdecode/files/patch-configure
new file mode 100644
index 000000000000..587f8315cb92
--- /dev/null
+++ b/converters/ktextdecode/files/patch-configure
@@ -0,0 +1,33 @@
+--- configure.orig	Thu Nov 21 16:13:19 2002
++++ configure	Sat Feb 18 22:39:12 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"
+ 
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 272d33ae6bbb..e6b8acca9f69 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
 
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 LIBTOOLFILES=	configure libcharset/configure
 CONFIGURE_ARGS=	--enable-static \
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index b2d589c71c79..adcc3248beec 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -3,9 +3,11 @@ include/iconv.h
 include/libcharset.h
 include/localcharset.h
 lib/libcharset.a
+lib/libcharset.la
 lib/libcharset.so
 lib/libcharset.so.1
 lib/libiconv.a
+lib/libiconv.la
 lib/libiconv.so
 lib/libiconv.so.3
 libdata/charset.alias
diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile
index b600cdc0d640..8bf9ca265ce8 100644
--- a/converters/mimelib/Makefile
+++ b/converters/mimelib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mimelib
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	icqmail
@@ -16,7 +17,7 @@ COMMENT=	C++ class library for manipulating messages in MIME format
 
 CONFLICTS=	kdenetwork-3.1.*
 
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/converters/mimelib/pkg-plist b/converters/mimelib/pkg-plist
index e8480d872826..65eac98dbc06 100644
--- a/converters/mimelib/pkg-plist
+++ b/converters/mimelib/pkg-plist
@@ -32,7 +32,8 @@ include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
 include/mimelib/binhex.h
-lib/libmimelib.so.1
-lib/libmimelib.so
 lib/libmimelib.a
+lib/libmimelib.la
+lib/libmimelib.so
+lib/libmimelib.so.1
 @dirrm include/mimelib
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index f8a7201da9f5..3deb7130dd5c 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	psiconv
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	converters devel
 MASTER_SITES=	http://software.frodo.looijaard.name/psiconv/files/
 
@@ -16,7 +17,7 @@ COMMENT=	A conversion utility to convert Psion 5(MX) files into other formats
 USE_GETOPT_LONG=yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-imagemagick=no
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/converters/psiconv/pkg-plist b/converters/psiconv/pkg-plist
index d25bcd580fb8..053abb6d301b 100644
--- a/converters/psiconv/pkg-plist
+++ b/converters/psiconv/pkg-plist
@@ -15,6 +15,7 @@ include/psiconv/parse.h
 include/psiconv/parse_routines.h
 include/psiconv/unicode.h
 lib/libpsiconv.a
+lib/libpsiconv.la
 lib/libpsiconv.so
 lib/libpsiconv.so.10
 %%DATADIR%%/psion/ASCII_Codes.psi
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 69149089c59c..bcb366c2c8fa 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	recode
 PORTVERSION=	3.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	recode
@@ -16,7 +16,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages
 
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+USE_AUTOTOOLS=	libtool:15
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--without-included-gettext
diff --git a/converters/recode/pkg-plist b/converters/recode/pkg-plist
index 88b2fc39ba1c..b1677fe73be1 100644
--- a/converters/recode/pkg-plist
+++ b/converters/recode/pkg-plist
@@ -3,6 +3,7 @@ bin/recode
 include/recode.h
 include/recodext.h
 lib/librecode.a
+lib/librecode.la
 lib/librecode.so
 lib/librecode.so.3
 share/locale/da/LC_MESSAGES/recode.mo