3 files changed, 41 insertions, 54 deletions

diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index b86ef97dde69..ebae39062f05 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	libtool
 PORTVERSION=	1.5.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool15/files/patch-ad b/devel/libtool15/files/patch-ad
index c04c4dd4a24c..e69de29bb2d1 100644
--- a/devel/libtool15/files/patch-ad
+++ b/devel/libtool15/files/patch-ad
@@ -1,50 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
-+++ ltmain.sh	Wed Jan 23 16:39:22 2002
-@@ -1062,6 +1062,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -2444,6 +2450,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4219,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	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 $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  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 $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool15/files/patch-ltmain.sh
index 2a30a0c9ef22..62eb47a4d9ca 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool15/files/patch-ltmain.sh
@@ -1,7 +1,44 @@
---- ltmain.sh.orig	Wed Jul  2 16:56:39 2003
-+++ ltmain.sh	Wed Jul  2 16:58:03 2003
-@@ -1279,3 +1279,3 @@
+--- ltmain.sh.orig	Sun Apr 11 05:44:45 2004
++++ ltmain.sh	Wed Jun  9 18:21:15 2004
+@@ -1358,3 +1358,3 @@
  	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
  	   # Do not include libc_r directly, use -pthread flag.
+@@ -1375,2 +1375,8 @@
+ 	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
+ 	continue
+@@ -1858,2 +1864,3 @@
+ 	    deplibs="$deplib $deplibs"
++	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	  fi
+@@ -4409,2 +4416,5 @@
+ 	  ;;
++	*-*-freebsd*)
++	  # FreeBSD doesn't need this...
++	  ;;
+ 	*)
+@@ -5549,6 +5559,13 @@
+ 	# Install the pseudo-library for information purposes.
+-	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 $?
++	case $host in
++	*-*-freebsd*)
++	  # Do not install the useless pseudo-library
++	  ;;
++	*)
++	  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 $?
++	  ;;
++	esac
+