set need_version=no on Darwin, from libtool 1.4.3.

This should fix PR 19271 from Jason Thorpe.

ok'd by nick.

3 files changed, 38 insertions, 20 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 4514658dfde..961ad5f4d20 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.26 2003/01/10 08:44:18 jlam Exp $
+# $NetBSD: Makefile.common,v 1.27 2003/01/21 22:43:42 grant Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREVISION=	11
+PKGREVISION=	12
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 3bc8001d053..fb9097a2b23 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2002/12/25 19:35:21 jschauma Exp $
+$NetBSD: distinfo,v 1.23 2003/01/21 22:43:42 grant Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
 SHA1 (patch-aa) = 6efa2e2aba991cd3d40b41cecb58a3ccc8980c1c
-SHA1 (patch-ab) = f4243afa1a18711abd54c0e1ca18c6ac1f886b29
+SHA1 (patch-ab) = 82350e1a9b03ecb8a26ebd02692f5cb3bb289fae
 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
 SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 4078ae4b522..6a7bf6d6ee7 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
+$NetBSD: patch-ab,v 1.28 2003/01/21 22:43:42 grant Exp $
 
---- ltmain.sh.orig	Thu Jun 14 00:06:50 2001
-+++ ltmain.sh	Wed Dec 25 14:29:20 2002
-@@ -211,6 +211,8 @@
+--- ltmain.sh.orig	Thu Jun 14 14:06:50 2001
++++ ltmain.sh
+@@ -211,6 +211,8 @@ do
    --mode) prevopt="--mode" prev=mode ;;
    --mode=*) mode="$optarg" ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
    --quiet | --silent)
      show=:
      ;;
-@@ -256,7 +258,7 @@
+@@ -256,7 +258,7 @@ if test -z "$show_help"; then
    # Infer the operation mode.
    if test -z "$mode"; then
      case $nonopt in
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
        mode=link
        for arg
        do
-@@ -494,11 +496,21 @@
+@@ -494,11 +496,21 @@ if test -z "$show_help"; then
      # command doesn't match the default compiler.
      if test -n "$available_tags" && test -z "$tagname"; then
        case $base_compile in
@@ -45,7 +45,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
          for z in $available_tags; do
            if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
  	    # Evaluate the configuration.
-@@ -528,8 +540,6 @@
+@@ -528,8 +540,6 @@ if test -z "$show_help"; then
  #        else
  #          echo "$modename: using $tagname tagged configuration"
          fi
@@ -54,7 +54,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
      fi
  
      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-@@ -1528,11 +1538,21 @@
+@@ -1528,11 +1538,21 @@ EOF
      # command doesn't match the default compiler.
      if test -n "$available_tags" && test -z "$tagname"; then
        case $base_compile in
@@ -79,7 +79,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
          for z in $available_tags; do
            if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
  	    # Evaluate the configuration.
-@@ -1562,8 +1582,6 @@
+@@ -1562,8 +1582,6 @@ EOF
  #       else
  #         echo "$modename: using $tagname tagged configuration"
          fi
@@ -88,7 +88,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1619,9 +1637,11 @@
+@@ -1619,9 +1637,11 @@ EOF
      # Find all interdependent deplibs by searching for libraries
      # that are linked more than once (e.g. -la -lb -la)
      for deplib in $deplibs; do
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
        libs="$libs $deplib"
      done
  
-@@ -1632,12 +1652,14 @@
+@@ -1632,12 +1652,14 @@ EOF
        # $postdeps and mark them as special (i.e., whose duplicates are
        # not to be eliminated).
        pre_post_deps=
@@ -115,7 +115,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
        pre_post_deps=
      fi
  
-@@ -1861,9 +1883,11 @@
+@@ -1861,9 +1883,11 @@ EOF
  	    tmp_libs=
  	    for deplib in $dependency_libs; do
  	      deplibs="$deplib $deplibs"
@@ -127,7 +127,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
  	      tmp_libs="$tmp_libs $deplib"
  	    done
  	  elif test $linkmode != prog && test $linkmode != lib; then
-@@ -1986,9 +2010,11 @@
+@@ -1986,9 +2010,11 @@ EOF
  	      # or/and link against static libraries
  	      newdependency_libs="$deplib $newdependency_libs"
  	    fi
@@ -139,7 +139,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
  	    tmp_libs="$tmp_libs $deplib"
  	  done # for deplib
  	  continue
-@@ -2287,9 +2313,11 @@
+@@ -2287,9 +2313,11 @@ EOF
  	  tmp_libs=
  	  for deplib in $dependency_libs; do
  	    newdependency_libs="$deplib $newdependency_libs"
@@ -151,7 +151,7 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
  	    tmp_libs="$tmp_libs $deplib"
  	  done
  
-@@ -2582,7 +2610,7 @@
+@@ -2582,7 +2610,7 @@ EOF
  	  ;;
  
  	irix)
@@ -160,7 +160,25 @@ $NetBSD: patch-ab,v 1.27 2002/12/25 19:35:22 jschauma Exp $
  	  verstring="sgi$major.$revision"
  
  	  # Add in all the interfaces that we are compatible with.
-@@ -5053,7 +5081,7 @@
+@@ -2642,7 +2670,16 @@ EOF
+ 	# Clear the version info if we defaulted, and they specified a release.
+ 	if test -z "$vinfo" && test -n "$release"; then
+ 	  major=
+-	  verstring="0.0"
++	  case $version_type in
++	  darwin)
++	    # we can't check for "0.0" in archive_cmds due to quoting
++	    # problems, so we reset it completely
++	    verstring=
++	    ;;
++	  *)
++	    verstring="0.0"
++	    ;;
++	  esac
+ 	  if test "$need_version" = no; then
+ 	    versuffix=
+ 	  else
+@@ -5053,7 +5090,7 @@ relink_command=\"$relink_command\""
        fi
  
        # Now prepare to actually exec the command.