Update to libtool 2.4

Tested by:	pav (multiple -exp runs)

9 files changed, 39 insertions, 44 deletions

diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index dbbeb5c798e0..70064b1850b3 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -265,7 +265,7 @@ LIB_DEPENDS+=		ltdl.7:${PORTSDIR}/devel/libltdl
 #---------------------------------------------------------------------------
 
 .if defined(_AUTOTOOL_libtool) || defined(_AUTOTOOL_libtoolize)
-LIBTOOL_VERSION=	2.2.10
+LIBTOOL_VERSION=	2.4
 LIBTOOL_PORT=		devel/libtool
 
 . if defined(_AUTOTOOL_libtool) && ${_AUTOTOOL_libtool} == "yes"
@@ -302,7 +302,7 @@ LIBTOOLFILES?=		aclocal.m4
 LIBTOOLFILES?=		${CONFIGURE_SCRIPT}
 . endif
 
-LIBTOOL_DEPENDS=	libtool>=2.2:${PORTSDIR}/${LIBTOOL_PORT}
+LIBTOOL_DEPENDS=	libtool>=2.4:${PORTSDIR}/${LIBTOOL_PORT}
 BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
 .endif
 
diff --git a/devel/apr1/files/patch-apr_buildconf b/devel/apr1/files/patch-apr_buildconf
index f34ebe102a4a..780101677758 100644
--- a/devel/apr1/files/patch-apr_buildconf
+++ b/devel/apr1/files/patch-apr_buildconf
@@ -1,10 +1,13 @@
---- apr-1.4.2/buildconf.orig	2009-02-24 06:37:18.000000000 +0300
-+++ apr-1.4.2/buildconf	2009-09-27 14:25:11.000000000 +0400
-@@ -71,6 +71,7 @@
- 
- echo "buildconf: Using libtool.m4 at ${ltfile}."
+--- apr-1.4.2/buildconf.orig	2009-11-12 16:19:49.000000000 -0600
++++ apr-1.4.2/buildconf	2011-02-15 16:07:59.000000000 -0600
+@@ -54,4 +54,4 @@
+     # libtool 2.x
+-   aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
+-   ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
++   aclocal_dir=`sed -n '/^ *aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
++   ltfiles=`sed -n '/^ *all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
+    for f in $ltfiles; do
+@@ -78,2 +78,3 @@
  
 +chmod 664 build/libtool.m4
  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- 
- # libtool.m4 from 1.6 requires ltsugar.m4
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 949e0de17534..720bb7ce6f93 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	2.2.10
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index ee1757dd9c29..187e5840b97a 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,3 +1,2 @@
-MD5 (libtool-2.2.10.tar.gz) = b745d220e88163fcd9eea0a90ccf21b0
-SHA256 (libtool-2.2.10.tar.gz) = de7d1d028fa3be15a05b3e00fe64f80ece62636923cc9ef82dc8b9a2f3c5d77d
-SIZE (libtool-2.2.10.tar.gz) = 2439628
+SHA256 (libtool-2.4.tar.gz) = 13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e
+SIZE (libtool-2.4.tar.gz) = 2580417
diff --git a/devel/libtool/files/patch-libltdl_config_ltmain.sh b/devel/libtool/files/patch-libltdl_config_ltmain.sh
index ad0599710598..4bc3bf1c120a 100644
--- a/devel/libtool/files/patch-libltdl_config_ltmain.sh
+++ b/devel/libtool/files/patch-libltdl_config_ltmain.sh
@@ -1,8 +1,6 @@
---- libltdl/config/ltmain.sh.orig	2009-06-29 12:36:19.000000000 -0500
-+++ libltdl/config/ltmain.sh	2009-06-29 12:57:44.000000000 -0500
-@@ -1010,6 +1010,21 @@
- func_infer_tag ()
- {
+--- libltdl/config/ltmain.sh.orig	2010-09-22 09:45:43.000000000 -0500
++++ libltdl/config/ltmain.sh	2011-01-18 12:59:46.000000000 -0600
+@@ -1376,2 +1376,17 @@
      $opt_debug
 +
 +    # FreeBSD-specific: where we install compilers with non-standard names
@@ -20,11 +18,7 @@
 +    fi
 +
      if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
-@@ -1042,7 +1057,22 @@
- 	      break
- 	      ;;
+@@ -1412,3 +1427,18 @@
  	    esac
 -	  fi
 +
@@ -44,34 +38,22 @@
 +            fi
 +          fi
  	done
- 	# If $tagname still isn't set, then no tagged configuration
- 	# was found and let the user know that the "--tag" command
-@@ -2528,6 +2558,9 @@
- 	  ;;
- 	esac
+@@ -3516,2 +3546,5 @@
  	;;
 +      *-*-freebsd*)
 +	# FreeBSD doesn't need this...
 +	;;
        *)
- 	func_fatal_error "unknown suffix for \`$my_dlsyms'"
- 	;;
-@@ -4584,6 +4617,7 @@
- 	    *" $arg "*) ;;
- 	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+@@ -5585,2 +5618,3 @@
  	esac
 +	deplibs="$deplibs $arg"
  	continue
- 	;;
- 
-@@ -5073,13 +5107,30 @@
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
- 	    compiler_flags="$compiler_flags $deplib"
+@@ -6155,9 +6189,26 @@
+ 	    func_append compiler_flags " $deplib"
 -	    if test "$linkmode" = lib ; then
 -		case "$new_inherited_linker_flags " in
 -		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 -		esac
 -	    fi
  	  fi
@@ -99,5 +81,3 @@
 +	  esac # linkmode
 +
  	  continue
- 	  ;;
- 	-l*)
diff --git a/graphics/libpano12/files/patch-bootstrap b/graphics/libpano12/files/patch-bootstrap
index 81b9fc2a5d26..cfe1fb317d39 100644
--- a/graphics/libpano12/files/patch-bootstrap
+++ b/graphics/libpano12/files/patch-bootstrap
@@ -5,7 +5,7 @@
  #	echo libtool version: $libtool_version
  	case $libtool_version in
 -	    1.4*|1.5*)
-+	    1.4*|1.5*|2.2*)
++	    1.4*|1.5*|2.4*)
  		have_libtool=true
  		;;
  	esac
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 9f76c882cd13..9a5072ff20f8 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -206,7 +206,7 @@ post-install:
 	@${MKDIR} ${LOCALBASE}/libdata/pkgconfig/ && ${MV} ${LOCALBASE}/lib/pkgconfig/snort.pc ${LOCALBASE}/libdata/pkgconfig/snort.pc
 	@${RMDIR} ${LOCALBASE}/lib/pkgconfig
 .endif
-	@${LIBTOOL} --finish ${LOCALBASE}/snort/dynamicpreprocessor
+	@${LIBTOOL} --finish ${LOCALBASE}/lib/snort/dynamicpreprocessor
 	[ -d ${CONFIG_DIR} ] || ${MKDIR} ${CONFIG_DIR}
 	[ -d ${EXAMPLESDIR} ] || ${MKDIR} ${EXAMPLESDIR}
 	[ -d ${RULES_DIR} ] || ${MKDIR} ${RULES_DIR}
diff --git a/textproc/jade/files/patch-Makefile.in b/textproc/jade/files/patch-Makefile.in
new file mode 100644
index 000000000000..3b8231ddb4db
--- /dev/null
+++ b/textproc/jade/files/patch-Makefile.in
@@ -0,0 +1,6 @@
+--- Makefile.in.orig	1998-10-12 21:11:06.000000000 -0500
++++ Makefile.in	2011-02-15 16:18:41.000000000 -0600
+@@ -16,2 +16,3 @@
+ bindir=@bindir@
++libdir=@libdir@
+ 
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 15485003724a..5f1f5c5637ff 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -42,4 +42,11 @@ BROKEN=		does not compile on 7.X
 pre-configure:
 	@cd ${WRKSRC} && ${AUTORECONF} -i
 
+# XXX: no, I don't know why this is needed for libtool > 2.2.10 but it's
+#      the only one, and a dirty hack will suffice.  Of course, using both
+#      autoreconf and the bsd.autotools.mk targets is bad too.
+#
+post-configure:
+	@${CP} ${LIBTOOL} ${WRKSRC}/libtool
+
 .include <bsd.port.post.mk>