[pkgsrc/trunk]: pkgsrc/devel Add change from MirOS that resets $versuffix2 to...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fba189f1a2d6
branches:  trunk
changeset: 499382:fba189f1a2d6
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Sep 21 20:31:21 2005 +0000

description:
Add change from MirOS that resets $versuffix2 to empty if -avoid-version is used;
makes -avoid-version work properly on platforms using $versuffix2 (e.g., OpenBSD,
FreeBSD, DragonFly).  Bump PKGREVISION (and will bump LIBTOOL_REQD shortly).

MirOS change by Benny Siegert <bsiegert%mirbsd.org@localhost>.
Noted in private mail by Thorsten Glaser <tg%66h.42h.de@localhost>.

diffstat:

 devel/libtool-base/Makefile    |   4 ++--
 devel/libtool/distinfo         |   4 ++--
 devel/libtool/patches/patch-ac |  22 +++++++++++++++++++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diffs (76 lines):

diff -r aae0980fb84c -r fba189f1a2d6 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Wed Sep 21 18:10:10 2005 +0000
+++ b/devel/libtool-base/Makefile       Wed Sep 21 20:31:21 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/07/13 15:58:44 tv Exp $
+# $NetBSD: Makefile,v 1.72 2005/09/21 20:31:21 tv Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   4
+PKGREVISION=   5
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r aae0980fb84c -r fba189f1a2d6 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Wed Sep 21 18:10:10 2005 +0000
+++ b/devel/libtool/distinfo    Wed Sep 21 20:31:21 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.62 2005/07/03 19:42:14 tv Exp $
+$NetBSD: distinfo,v 1.63 2005/09/21 20:31:21 tv Exp $
 
 SHA1 (libtool-1.5.18.tar.gz) = 9eae4a25cf386f2dd3937f215368c9cc090009df
 RMD160 (libtool-1.5.18.tar.gz) = facff15723bb89b0e260def31354fe437430bf3b
 Size (libtool-1.5.18.tar.gz) = 2780846 bytes
 SHA1 (patch-aa) = 36f589c09c492bc688bdfbb97f0d375cd04c008d
 SHA1 (patch-ab) = 60ab5ae3874fe13abfd089b0cf544f57517acc2b
-SHA1 (patch-ac) = e7a067d002f7948361e2e90862cb96c6bba1959d
+SHA1 (patch-ac) = 61a5c1ace76beeeb64388726e6a0772e8f1828e0
 SHA1 (patch-ad) = 5cb326bd404762d15b053a99ea8cf041b087dc94
diff -r aae0980fb84c -r fba189f1a2d6 devel/libtool/patches/patch-ac
--- a/devel/libtool/patches/patch-ac    Wed Sep 21 18:10:10 2005 +0000
+++ b/devel/libtool/patches/patch-ac    Wed Sep 21 20:31:21 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.19 2005/06/05 18:04:37 tv Exp $
+$NetBSD: patch-ac,v 1.20 2005/09/21 20:31:21 tv Exp $
 
 --- ltmain.sh.orig     2005-05-16 05:39:29.000000000 -0400
 +++ ltmain.sh
@@ -129,7 +129,15 @@
          continue
          ;;
        -l*)
-@@ -3202,6 +3285,7 @@ EOF
+@@ -3153,6 +3236,7 @@ EOF
+       # Calculate the version variables.
+       major=
+       versuffix=
++      versuffix2=
+       verstring=
+       case $version_type in
+       none) ;;
+@@ -3202,6 +3286,7 @@ EOF
        linux)
          major=.`expr $current - $age`
          versuffix="$major.$age.$revision"
@@ -137,7 +145,15 @@
          ;;
  
        osf)
-@@ -5462,8 +5546,16 @@ relink_command=\"$relink_command\""
+@@ -3264,6 +3349,7 @@ EOF
+       if test "$avoid_version" = yes && test "$need_version" = no; then
+         major=
+         versuffix=
++        versuffix2=
+         verstring=""
+       fi
+ 
+@@ -5462,8 +5548,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi