fix shared library names on FreeBSD to be like NetBSD and Solaris in

preparation for FreeBSD pkgsrc support.

bump PKGREVISION.

ok'd by nick.

3 files changed, 34 insertions, 10 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 267868daff2..554033ee41c 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.23 2002/08/25 18:38:34 jlam Exp $
+# $NetBSD: Makefile.common,v 1.24 2002/11/17 11:55:01 grant Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREVISION=	9
+PKGREVISION=	10
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index d0541ed33ea..f1b39ceef5f 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2002/08/25 18:38:35 jlam Exp $
+$NetBSD: distinfo,v 1.19 2002/11/17 11:55:01 grant Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
-SHA1 (patch-aa) = 63005677ad929a7dc08fad93efe6b0905316411d
+SHA1 (patch-aa) = 6efa2e2aba991cd3d40b41cecb58a3ccc8980c1c
 SHA1 (patch-ab) = 1d23b17b2d1ce914e5665b3cbc0adc6590fca827
 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index cf1aa987289..a5a8352bd05 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.28 2002/08/25 18:38:35 jlam Exp $
+$NetBSD: patch-aa,v 1.29 2002/11/17 11:55:01 grant Exp $
 
---- ltconfig.in.orig	Mon May 21 05:05:06 2001
-+++ ltconfig.in
+--- ltconfig.in.orig	Mon May 21 04:05:06 2001
++++ ltconfig.in	Thu Nov 14 06:37:11 2002
 @@ -1104,7 +1104,7 @@
    version_type=darwin
    need_lib_prefix=no
@@ -11,7 +11,31 @@ $NetBSD: patch-aa,v 1.28 2002/08/25 18:38:35 jlam Exp $
    soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
-@@ -1198,7 +1198,7 @@
+@@ -1116,16 +1116,17 @@
+ 
+ freebsd*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  version_type=sunos
++  case $objformat in
++    elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++      soname_spec='${libname}${release}.so$major'
+       need_version=no
+       need_lc=no
+       need_lib_prefix=no
+       ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++    *)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+       need_version=yes
+       ;;
+   esac
+@@ -1198,7 +1199,7 @@
  
  # This must be Linux ELF.
  linux-gnu*)
@@ -20,7 +44,7 @@ $NetBSD: patch-aa,v 1.28 2002/08/25 18:38:35 jlam Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-@@ -1236,6 +1236,8 @@
+@@ -1236,6 +1237,8 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
@@ -29,7 +53,7 @@ $NetBSD: patch-aa,v 1.28 2002/08/25 18:38:35 jlam Exp $
    ;;
  
  newsos6)
-@@ -1282,7 +1284,7 @@
+@@ -1282,7 +1285,7 @@
    ;;
  
  solaris*)