Restore old numbering scheme for libraries on Solaris as discussed on

tech-pkg.

4 files changed, 15 insertions, 44 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 277409a2b88..b77ac7580fa 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/28 15:19:52 tron Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/28 21:20:31 skrll Exp $
 #
 
 .include "../libtool/Makefile.common"
@@ -27,10 +27,6 @@ CONFIGURE_ARGS=	--disable-shared
 CONFIGURE_ARGS=	--enable-ltdl-install
 .endif
 
-.if (${OPSYS} == SunOS)
-PLIST_SRC=	${PKGDIR}/PLIST.SunOS
-.endif
-
 .include "../../mk/bsd.pkg.mk"
 
 LDFLAGS=	# Blank
diff --git a/devel/libtool-base/pkg/PLIST.SunOS b/devel/libtool-base/pkg/PLIST.SunOS
deleted file mode 100644
index be030b901d4..00000000000
--- a/devel/libtool-base/pkg/PLIST.SunOS
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2001/02/28 15:18:43 tron Exp $
-bin/libtool
-bin/libtoolize
-include/ltdl.h
-lib/libltdl.a
-lib/libltdl.la
-lib/libltdl.so
-lib/libltdl.so.3
-lib/libltdl.so.3.0.0
-share/aclocal/libtool.m4
-share/aclocal/ltdl.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltcf-c.sh
-share/libtool/ltcf-cxx.sh
-share/libtool/ltcf-gcj.sh
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index c2e02aa977e..494f028f526 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.28 2001/02/28 18:18:22 skrll Exp $
+$NetBSD: patch-sum,v 1.29 2001/02/28 21:20:30 skrll Exp $
 
-MD5 (patch-aa) = fb45156202da4751206e36dd0be5dabc
+MD5 (patch-aa) = 91db5755b0d22449a3e93c075f702d50
 MD5 (patch-ab) = 8bc16291ef6407e694ecdccb103bae5d
 MD5 (patch-ac) = a5da475693a57e16bd8462793f87639e
 MD5 (patch-ad) = 15958457a2ed12613b9ad901677772d3
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 533ec946638..9d79c832a5f 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.22 2001/02/27 08:20:25 skrll Exp $
+$NetBSD: patch-aa,v 1.23 2001/02/28 21:20:31 skrll Exp $
 
---- ltconfig.in.orig	Sat Feb  3 05:05:03 2001
+--- ltconfig.in.orig	Fri Feb 16 05:05:03 2001
 +++ ltconfig.in
-@@ -1120,6 +1120,8 @@
+@@ -1142,6 +1142,8 @@
  
  netbsd*)
    version_type=sunos
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.22 2001/02/27 08:20:25 skrll Exp $
    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
      library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+@@ -1200,7 +1202,7 @@
+   ;;
+ 
+ solaris*)
+-  version_type=linux
++  version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'