3 files changed, 13 insertions, 50 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 793352db569c..288ad57f543f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 NO_LATEST_LINK=	"Unstable, development version."
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index e9e7eacafee5..fc794d3256de 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Mar  8 17:54:21 2002
-+++ configure	Mon Mar 11 10:21:32 2002
-@@ -16768,8 +16768,8 @@
+--- configure.orig	Fri Mar 29 01:26:14 2002
++++ configure	Fri Apr 26 09:01:50 2002
+@@ -10597,6 +10597,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'
+@@ -17619,8 +17620,8 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  		fi
  		;;
@@ -14,7 +22,7 @@ $FreeBSD$
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -16849,7 +16849,7 @@
+@@ -17702,7 +17703,7 @@
  	     *-*-openbsd* | *-*-freebsd*)
  	        # FreeBSD and OpenBSD want us to use the -pthread flag
                  # instead of linking to -lc_r and libtool enforces that.
diff --git a/devel/glib20/files/patch-ltmain.sh b/devel/glib20/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/devel/glib20/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"