USE_LIBTOOL strikes back: use the new and improved way for dealing with

configure scripts created using autoconf 2.13 or later, which allows
to replace many patch-ltmain.sh out there with USE_LIBTOOL and one
additional line in configure script.

6 files changed, 32 insertions, 172 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 8002977b3370..9be1bb8bd71a 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -31,7 +31,7 @@ MOZILLA=	mozilla
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
 		--enable-nautilus-view
diff --git a/www/galeon/files/patch-configure b/www/galeon/files/patch-configure
index af5c091a45f4..d601b1d5061a 100644
--- a/www/galeon/files/patch-configure
+++ b/www/galeon/files/patch-configure
@@ -1,47 +1,22 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Mar 13 10:57:19 2002
-+++ configure	Wed Mar 13 10:58:12 2002
-@@ -9966,7 +9966,7 @@
- fi
+--- configure.orig	Thu Apr 25 21:02:26 2002
++++ configure	Thu Apr 25 21:03:14 2002
+@@ -5434,6 +5434,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
--	     CATOBJEXT=.gmo
-+	     CATOBJEXT=.mo
- 	   fi
- 	
- else
-@@ -10088,7 +10088,7 @@
-         
- 	BUILD_INCLUDED_LIBINTL=yes
- 	USE_INCLUDED_LIBINTL=yes
--        CATOBJEXT=.gmo
-+        CATOBJEXT=.mo
- 	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
- 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-       fi
-@@ -10173,7 +10173,7 @@
-     fi
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7078,7 +7079,7 @@
+ #define ENABLE_NAUTILUS_VIEW 1
+ EOF
  
-                 for lang in $ALL_LINGUAS; do
--      GMOFILES="$GMOFILES $lang.gmo"
-+      GMOFILES="$GMOFILES $lang.mo"
-       POFILES="$POFILES $lang.po"
-     done
+-  _gnome_modules="$_gnome_modules bonobox nautilus"
++  _gnome_modules="$_gnome_modules bonobox"
+ fi
+ echo "$ac_t""$enable_nautilus_view" 1>&6
  
-@@ -10502,10 +10502,10 @@
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@ACLOCAL@%/usr/bin/true%g
-+s%@AUTOCONF@%/usr/bin/true%g
-+s%@AUTOMAKE@%/usr/bin/true%g
-+s%@AUTOHEADER@%/usr/bin/true%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@host@%$host%g
diff --git a/www/galeon/files/patch-ltmain.sh b/www/galeon/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/www/galeon/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,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
-@@ -4179,10 +4190,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/www/galeon2/Makefile b/www/galeon2/Makefile
index 8002977b3370..9be1bb8bd71a 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -31,7 +31,7 @@ MOZILLA=	mozilla
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
 		--enable-nautilus-view
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
index af5c091a45f4..d601b1d5061a 100644
--- a/www/galeon2/files/patch-configure
+++ b/www/galeon2/files/patch-configure
@@ -1,47 +1,22 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Mar 13 10:57:19 2002
-+++ configure	Wed Mar 13 10:58:12 2002
-@@ -9966,7 +9966,7 @@
- fi
+--- configure.orig	Thu Apr 25 21:02:26 2002
++++ configure	Thu Apr 25 21:03:14 2002
+@@ -5434,6 +5434,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
--	     CATOBJEXT=.gmo
-+	     CATOBJEXT=.mo
- 	   fi
- 	
- else
-@@ -10088,7 +10088,7 @@
-         
- 	BUILD_INCLUDED_LIBINTL=yes
- 	USE_INCLUDED_LIBINTL=yes
--        CATOBJEXT=.gmo
-+        CATOBJEXT=.mo
- 	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
- 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-       fi
-@@ -10173,7 +10173,7 @@
-     fi
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7078,7 +7079,7 @@
+ #define ENABLE_NAUTILUS_VIEW 1
+ EOF
  
-                 for lang in $ALL_LINGUAS; do
--      GMOFILES="$GMOFILES $lang.gmo"
-+      GMOFILES="$GMOFILES $lang.mo"
-       POFILES="$POFILES $lang.po"
-     done
+-  _gnome_modules="$_gnome_modules bonobox nautilus"
++  _gnome_modules="$_gnome_modules bonobox"
+ fi
+ echo "$ac_t""$enable_nautilus_view" 1>&6
  
-@@ -10502,10 +10502,10 @@
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@ACLOCAL@%/usr/bin/true%g
-+s%@AUTOCONF@%/usr/bin/true%g
-+s%@AUTOMAKE@%/usr/bin/true%g
-+s%@AUTOHEADER@%/usr/bin/true%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@host@%$host%g
diff --git a/www/galeon2/files/patch-ltmain.sh b/www/galeon2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/www/galeon2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,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
-@@ -4179,10 +4190,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"