Update to 1.5.18

More robust -pthread hack obtained from dfports.

Tested with:	full build of x11/gnome2 and x11/kde3

5 files changed, 46 insertions, 85 deletions

diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index 6f8a39d2e363..4ecfb28e71af 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	1.5.10
-PORTREVISION?=	1
+PORTVERSION=	1.5.18
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
@@ -47,8 +47,6 @@ post-install:
 .for i in libtool libtoolize
 	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} ${PREFIX}/libexec/libtool${BUILD_VERSION}/${i}
 .endfor
-	@install-info ${PREFIX}/info/libtool${BUILD_VERSION}.info \
-		${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo
index c6034865779d..76245d271bd3 100644
--- a/devel/libtool15/distinfo
+++ b/devel/libtool15/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtool-1.5.10.tar.gz) = e2093a85f6d48f1562c36920087502d6
-SIZE (libtool-1.5.10.tar.gz) = 2699923
+MD5 (libtool-1.5.18.tar.gz) = 3c6630a02bf0858c365ee32e0599255e
+SIZE (libtool-1.5.18.tar.gz) = 2780846
diff --git a/devel/libtool15/files/patch-af b/devel/libtool15/files/patch-af
index c1caa93c1e1f..3c38adffe411 100644
--- a/devel/libtool15/files/patch-af
+++ b/devel/libtool15/files/patch-af
@@ -1,6 +1,11 @@
---- libltdl/Makefile.in.orig	Mon Apr 14 17:29:35 2003
-+++ libltdl/Makefile.in	Fri Apr 18 20:27:46 2003
-@@ -404,9 +404,7 @@
+--- libltdl/Makefile.in.orig	Mon May 16 02:34:13 2005
++++ libltdl/Makefile.in	Thu Jun 16 19:29:09 2005
+@@ -224,3 +224,3 @@
+ libltdlc_la_LIBADD = $(LIBADD_DL)
+-ltdldatadir = $(datadir)/libtool/libltdl
++ltdldatadir = $(datadir)/libtool15/libltdl
+ ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
+@@ -437,9 +437,7 @@
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 -	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 +	      echo no cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -13,20 +18,3 @@
 -	    || exit 1; \
 +	    install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \
  	  fi; \
-@@ -586,4 +584,4 @@
- local-install-files: $(DISTFILES)
--	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
--	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
-+	-rm -rf $(DESTDIR)$(datadir)/libtool15/libltdl
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool15/libltdl
- 	@for file in $(DISTFILES); do \
-@@ -591,6 +589,6 @@
- 	  if test -d $$d/$$file; then \
--	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
-+	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file; \
- 	  else \
--	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
--	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
-+	    test -f $(DESTDIR)$(datadir)/libtool15/libltdl/$$file \
-+	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file || :; \
- 	  fi; \
diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool15/files/patch-ltmain.sh
index 7610f5e6d154..0f2c20b63d7f 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool15/files/patch-ltmain.sh
@@ -1,17 +1,10 @@
---- ltmain.sh.orig	Sun Sep 19 08:34:44 2004
-+++ ltmain.sh	Mon Mar  7 12:53:53 2005
-@@ -1477,7 +1477,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1494,6 +1494,12 @@
- 
-       -module)
+--- ltmain.sh.orig	Mon May 16 02:39:29 2005
++++ ltmain.sh	Thu Jun 16 19:42:32 2005
+@@ -1525,2 +1525,3 @@
+ 	finalize_command="$finalize_command $arg"
++	deplibs="$deplibs $arg"
+ 	continue
+@@ -1530,2 +1531,8 @@
  	module=yes
 +	case $host in
 +	*-*-freebsd*)
@@ -20,56 +13,39 @@
 +	  ;;
 +	esac
  	continue
- 	;;
- 
-@@ -1977,6 +1983,7 @@
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
- 	    deplibs="$deplib $deplibs"
-+	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+@@ -2015,2 +2022,25 @@
  	  fi
++
++	  case $linkmode in
++	  lib)
++	    deplibs="$deplib $deplibs"
++	    test "$pass" = conv && continue
++	    newdependency_libs="$deplib $newdependency_libs"
++	    ;;
++	  prog)
++	    if test "$pass" = conv; then
++	      deplibs="$deplib $deplibs"
++	      continue
++	    fi
++	    if test "$pass" = scan; then
++	      deplibs="$deplib $deplibs"
++	    else
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    fi
++	    ;;
++	  *)
++	    ;;
++	  esac # linkmode
++
  	  continue
- 	  ;;
-@@ -3084,7 +3091,7 @@
- 
- 	# Check that each of the things are valid numbers.
- 	case $current in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;	
- 	*)
- 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -3093,7 +3100,7 @@
- 	esac
- 
- 	case $revision in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -3102,7 +3109,7 @@
- 	esac
- 
- 	case $age in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -4442,6 +4449,9 @@
- 	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- 	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+@@ -4498,2 +4528,5 @@
  	  ;;
 +	*-*-freebsd*)
 +	  # FreeBSD doesn't need this...
 +	  ;;
  	*)
- 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
- 	  exit $EXIT_FAILURE
-@@ -5527,10 +5537,17 @@
- 	fi
- 
+@@ -5627,6 +5660,13 @@
  	# Install the pseudo-library for information purposes.
 -	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 -	instname="$dir/$name"i
@@ -87,5 +63,3 @@
 +	  ;;
 +	esac
  
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist
index 1c04c4a6fff6..486a7113986e 100644
--- a/devel/libtool15/pkg-plist
+++ b/devel/libtool15/pkg-plist
@@ -7,6 +7,7 @@ share/aclocal/libtool%%BUILD_VERSION%%.m4
 share/aclocal/ltdl%%BUILD_VERSION%%.m4
 share/libtool%%BUILD_VERSION%%/config.guess
 share/libtool%%BUILD_VERSION%%/config.sub
+share/libtool%%BUILD_VERSION%%/install-sh
 share/libtool%%BUILD_VERSION%%/libltdl/COPYING.LIB
 share/libtool%%BUILD_VERSION%%/libltdl/Makefile.am
 share/libtool%%BUILD_VERSION%%/libltdl/Makefile.in