Fix the installation of libltdl on non-NetBSD platforms and correct a

typo in version_type for BSD/OS.

PKGREVISION++

4 files changed, 96 insertions, 6 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 0e856990b9b..b98a8736ed3 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.43 2004/02/07 09:25:39 seb Exp $
+# $NetBSD: Makefile.common,v 1.44 2004/02/08 11:21:58 skrll Exp $
 #
 
 DISTNAME=	libtool-1.5.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 9f35bba89ae..2e16cc13bbe 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.34 2004/02/07 09:25:39 seb Exp $
+$NetBSD: distinfo,v 1.35 2004/02/08 11:21:58 skrll Exp $
 
 SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
 Size (libtool-1.5.2.tar.gz) = 2653072 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = b59ac36c8d84a919193f454d670c61688bb91fe6
+SHA1 (patch-ab) = 89875726d4952299cb7dda046697ba5393546f5e
 SHA1 (patch-ac) = 089536834faa3011bf2086b0ef15245b01a88eb9
+SHA1 (patch-ad) = e2d7a160b2b673346309996b99c423f6b927d1df
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 52ac757e561..0bc967c6a82 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.30 2004/02/05 20:14:06 skrll Exp $
+$NetBSD: patch-ab,v 1.31 2004/02/08 11:21:58 skrll Exp $
 
 --- configure.orig	2004-01-25 12:36:38.000000000 +0000
 +++ configure
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.30 2004/02/05 20:14:06 skrll Exp $
 -bsdi4*)
 -  version_type=linux
 +bsdi*)
-+  version_type=sunox
++  version_type=sunos
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
new file mode 100644
index 00000000000..887a2dc0770
--- /dev/null
+++ b/devel/libtool/patches/patch-ad
@@ -0,0 +1,89 @@
+$NetBSD: patch-ad,v 1.7 2004/02/08 11:21:58 skrll Exp $
+
+--- libltdl/configure.orig	2004-01-25 12:36:58.000000000 +0000
++++ libltdl/configure
+@@ -3642,10 +3642,13 @@ beos*)
+   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)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
++# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++  dynamic_linker=no
++  ;;
++
++bsdi*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ cygwin*)
+@@ -8040,9 +8043,10 @@ beos*)
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
+-  version_type=linux
++bsdi*)
++  version_type=sunos
+   need_version=no
++  need_lib_prefix=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -8158,15 +8162,15 @@ kfreebsd*-gnu)
+ 
+ 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}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  case $objformat in
++    elf*)
++      soname_spec='${libname}${release}${shared_ext}$major'
+       need_version=no
+       need_lib_prefix=no
+       ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++    *)
+       need_version=yes
+       ;;
+   esac
+@@ -8245,12 +8249,7 @@ hpux9* | hpux10* | hpux11*)
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
++    *) version_type=sunos ;;
+   esac
+   need_lib_prefix=no
+   need_version=no
+@@ -8286,7 +8285,7 @@ linux*oldld* | linux*aout* | linux*coff*
+ 
+ # This must be Linux ELF.
+ linux*)
+-  version_type=linux
++  version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -8410,7 +8409,7 @@ sco3.2v5*)
+   ;;
+ 
+ solaris*)
+-  version_type=linux
++  version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'