Use USE_LIBTOOL.

5 files changed, 28 insertions, 57 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 6e0b785bd822..24764c8bb3f6 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libcharset/configure
 CONFIGURE_ARGS=	--enable-static
 INSTALLS_SHLIB=	yes
 
diff --git a/converters/libiconv/files/patch-autoconf::ltmain.sh b/converters/libiconv/files/patch-autoconf::ltmain.sh
deleted file mode 100644
index 830fb75e866b..000000000000
--- a/converters/libiconv/files/patch-autoconf::ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- autoconf/ltmain.sh	2001/08/27 09:51:26	1.1
-+++ autoconf/ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/converters/libiconv/files/patch-configure b/converters/libiconv/files/patch-configure
new file mode 100644
index 000000000000..64d0b10e1d51
--- /dev/null
+++ b/converters/libiconv/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/30 07:59:47	1.1
++++ configure	2002/04/30 08:00:22
+@@ -5256,6 +5256,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh b/converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh
deleted file mode 100644
index 8f7d71fd6780..000000000000
--- a/converters/libiconv/files/patch-libcharset::autoconf::ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- libcharset/autoconf/ltmain.sh	2001/08/27 09:51:26	1.1
-+++ libcharset/autoconf/ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/converters/libiconv/files/patch-libcharset::configure b/converters/libiconv/files/patch-libcharset::configure
new file mode 100644
index 000000000000..2ea39a6eb1db
--- /dev/null
+++ b/converters/libiconv/files/patch-libcharset::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libcharset/configure	2002/04/30 07:59:47	1.1
++++ libcharset/configure	2002/04/30 08:00:27
+@@ -5067,6 +5067,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'