Added better support for BSD/OS for libtool. libtool has never

officially been ported to BSD/OS 5.  So this adds that support.
Added three more patches and changed two.  Based on some ideas from
Steven M. Schultz and discussed with skrll@NetBSD.
Bump PKGREVISION.

7 files changed, 98 insertions, 18 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index bf030aae4d6..f1b95a21b08 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.36 2003/12/03 21:18:19 reed Exp $
+# $NetBSD: Makefile.common,v 1.37 2003/12/11 22:15:30 reed Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREVISION=	17
+PKGREVISION=	18
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 62969ed0265..8270ea6d87d 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2003/12/03 21:18:19 reed Exp $
+$NetBSD: distinfo,v 1.30 2003/12/11 22:15:30 reed Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
-SHA1 (patch-aa) = 6f7676483937802526b2f6dc89ba08f0019ed374
+SHA1 (patch-aa) = 5224d88d08c6fdbbc820d269a5d46a1ca68b3591
 SHA1 (patch-ab) = 76d0762ff80ddeac72a740383797502ab2ee4921
 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
-SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea
+SHA1 (patch-ae) = 1b354c98637d4c6e3646056e022652d1dc264c94
 SHA1 (patch-af) = 2a0630e92b355ee86800c4f3a7993fbb126a0999
 SHA1 (patch-ag) = df18e0d735df9b102d70b054e0cbaa1fd209bfff
 SHA1 (patch-ah) = 7f0a0153f5e23aab4a3fcd6ae395b5b56d2b52a1
@@ -16,3 +16,6 @@ SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864
 SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0
 SHA1 (patch-am) = 2c99398e34686ea5bcecaae254b1b240b53e46df
 SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e
+SHA1 (patch-ap) = 70786d75bf884dec6f90291ac2cdc7e018c00ba7
+SHA1 (patch-aq) = 7555ca198cacec6029a95562984673ef562aade1
+SHA1 (patch-ar) = cdc708515905df88069d739c392de481ed3dc756
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index c43d581c1d0..d02e88f9a86 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,15 +1,21 @@
+$NetBSD: patch-aa,v 1.32 2003/12/11 22:15:30 reed Exp $
+
 --- ltconfig.in.orig	Mon May 21 00:05:06 2001
-+++ ltconfig.in	Sat Oct  4 14:32:02 2003
-@@ -1052,7 +1052,7 @@
++++ ltconfig.in	Mon Dec  8 21:47:31 2003
+@@ -1051,9 +1051,10 @@
+   lt_cv_dlopen_self=yes
    ;;
  
- bsdi4*)
+-bsdi4*)
 -  version_type=linux
++bsdi*)
 +  version_type=sunos
    need_version=no
++  need_lib_prefix=no
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
    soname_spec='${libname}${release}.so$major'
-@@ -1104,7 +1104,7 @@
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -1104,7 +1105,7 @@
    version_type=darwin
    need_lib_prefix=no
    need_version=no
@@ -18,7 +24,7 @@
    soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
-@@ -1116,16 +1116,17 @@
+@@ -1116,16 +1117,17 @@
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -42,7 +48,7 @@
        need_version=yes
        ;;
    esac
-@@ -1167,7 +1168,7 @@
+@@ -1167,7 +1169,7 @@
    ;;
  
  irix5* | irix6*)
@@ -51,7 +57,7 @@
    need_lib_prefix=no
    need_version=no
    soname_spec='${libname}${release}.so$major'
-@@ -1198,7 +1199,7 @@
+@@ -1198,7 +1200,7 @@
  
  # This must be Linux ELF.
  linux-gnu*)
@@ -60,7 +66,7 @@
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-@@ -1236,6 +1237,8 @@
+@@ -1236,6 +1238,8 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
@@ -69,7 +75,7 @@
    ;;
  
  newsos6)
-@@ -1282,7 +1285,7 @@
+@@ -1282,7 +1286,7 @@
    ;;
  
  solaris*)
diff --git a/devel/libtool/patches/patch-ae b/devel/libtool/patches/patch-ae
index 083cb01a27f..67a83623ddc 100644
--- a/devel/libtool/patches/patch-ae
+++ b/devel/libtool/patches/patch-ae
@@ -1,8 +1,24 @@
-$NetBSD: patch-ae,v 1.5 2002/03/21 09:00:13 skrll Exp $
+$NetBSD: patch-ae,v 1.6 2003/12/11 22:15:30 reed Exp $
 
---- configure.orig	Thu Jun 14 05:06:29 2001
-+++ configure
-@@ -1533,9 +1533,9 @@
+--- configure.orig	Thu Jun 14 00:06:29 2001
++++ configure	Mon Dec  8 21:54:21 2003
+@@ -1448,8 +1448,13 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++# Versions of BSD/OS prior to 4.0 did not have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++  dynamic_linker=no
++  ;;
++
++bsdi*)
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+@@ -1533,9 +1538,9 @@
  
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
diff --git a/devel/libtool/patches/patch-ap b/devel/libtool/patches/patch-ap
new file mode 100644
index 00000000000..135429c5815
--- /dev/null
+++ b/devel/libtool/patches/patch-ap
@@ -0,0 +1,20 @@
+$NetBSD: patch-ap,v 1.3 2003/12/11 22:15:30 reed Exp $
+
+--- libtool.m4.orig	Mon Dec  8 21:43:57 2003
++++ libtool.m4	Mon Dec  8 21:45:24 2003
+@@ -523,8 +523,13 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
++# Versions of BSD/OS prior to 4.0 did not have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++  dynamic_linker=no
++  ;;
++
++bsdi*)
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
diff --git a/devel/libtool/patches/patch-aq b/devel/libtool/patches/patch-aq
new file mode 100644
index 00000000000..c4e6fd39ae9
--- /dev/null
+++ b/devel/libtool/patches/patch-aq
@@ -0,0 +1,20 @@
+$NetBSD: patch-aq,v 1.1 2003/12/11 22:15:30 reed Exp $
+
+--- libltdl/configure.orig	Mon Dec  8 21:48:50 2003
++++ libltdl/configure	Mon Dec  8 21:50:33 2003
+@@ -1561,8 +1561,13 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++# Versions of BSD/OS prior to 4.0 did not have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++  dynamic_linker=no
++  ;;
++
++bsdi*)
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
diff --git a/devel/libtool/patches/patch-ar b/devel/libtool/patches/patch-ar
new file mode 100644
index 00000000000..170dbf7e86f
--- /dev/null
+++ b/devel/libtool/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1 2003/12/11 22:15:30 reed Exp $
+
+--- libltdl/aclocal.m4.orig	Mon Dec  8 22:09:34 2003
++++ libltdl/aclocal.m4	Mon Dec  8 22:10:03 2003
+@@ -512,8 +512,8 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
++bsdi*)
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;