Update "pkglibtool" package to 1.2 patchlevel 1:

- Add "-cplusplus" option to link C++ shared libraries with "c++rt0.0"
  on "a.out" systems. This is required to get static constructors working.
  Fixes PR pkg/6935 by Jaromir Dolecek.
- The binary is now called "pkglibtool-<VERSION>" so that "bsd.pkg.mk"
  can depend on a certain version.

4 files changed, 45 insertions, 19 deletions

diff --git a/pkgtools/pkglibtool/Makefile b/pkgtools/pkglibtool/Makefile
index 54242a1bb98..981c4cc6bcc 100644
--- a/pkgtools/pkglibtool/Makefile
+++ b/pkgtools/pkglibtool/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 1998/10/04 19:04:06 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/14 21:14:04 tron Exp $
 #
 
 DISTNAME=	libtool-1.2
-PKGNAME=	pkglibtool-1.2
+PKGNAME=	pkglibtool-1.2p1
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.profitpress.com/libtool/
 
-CONFLICTS=	libtool-1.2
+CONFLICTS=	libtool-1.2 pkglibtool-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -18,7 +18,10 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 CONFIGURE_ARGS=	--disable-shared
 .endif
 
+PLIST_SRC=	${WRKDIR}/PLIST
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/libtool ${PREFIX}/bin/pkglibtool
+	${INSTALL_SCRIPT} ${WRKSRC}/libtool ${PREFIX}/bin/${PKGNAME}
+	@${ECHO} >${PLIST_SRC} bin/${PKGNAME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkglibtool/patches/patch-aa b/pkgtools/pkglibtool/patches/patch-aa
index 51039094c21..90d128f703a 100644
--- a/pkgtools/pkglibtool/patches/patch-aa
+++ b/pkgtools/pkglibtool/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1998/11/12 23:44:05 frueauf Exp $
+$NetBSD: patch-aa,v 1.3 1999/02/14 21:14:04 tron Exp $
 
---- ltconfig.orig	Fri Mar 20 03:00:29 1998
-+++ ltconfig	Sun Sep 27 11:47:30 1998
-@@ -808,7 +808,11 @@
+--- ltconfig.orig	Fri Mar 20 09:00:29 1998
++++ ltconfig	Sun Feb 14 17:49:16 1999
+@@ -808,7 +808,12 @@
  
    netbsd*)
      # Tested with NetBSD 1.2 ld
@@ -11,11 +11,12 @@ $NetBSD: patch-aa,v 1.2 1998/11/12 23:44:05 frueauf Exp $
 +      archive_cmds='$LD -shared -o $lib$libobjs'	# ELF
 +    else
 +      archive_cmds='$LD -Bshareable -o $lib$libobjs'	# a.out
++      cpprt0=/usr/lib/c++rt0.o
 +    fi
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      hardcode_shlibpath_var=no
-@@ -1181,8 +1185,15 @@
+@@ -1181,8 +1186,15 @@
  
  netbsd* | openbsd*)
    version_type=sunos
@@ -33,3 +34,13 @@ $NetBSD: patch-aa,v 1.2 1998/11/12 23:44:05 frueauf Exp $
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
+@@ -1482,6 +1494,9 @@
+ # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+ # the resulting binary.
+ hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# C++ startup code
++cpprt0="$cpprt0"
+ 
+ EOF
+ 
diff --git a/pkgtools/pkglibtool/patches/patch-ab b/pkgtools/pkglibtool/patches/patch-ab
index b553d0ece26..2e924ced168 100644
--- a/pkgtools/pkglibtool/patches/patch-ab
+++ b/pkgtools/pkglibtool/patches/patch-ab
@@ -1,17 +1,31 @@
-$NetBSD: patch-ab,v 1.3 1998/11/12 23:44:05 frueauf Exp $
+$NetBSD: patch-ab,v 1.4 1999/02/14 21:14:04 tron Exp $
 
---- ltmain.sh.orig	Sun Oct 18 11:59:06 1998
-+++ ltmain.sh	Sun Oct 18 11:58:57 1998
-@@ -144,6 +144,8 @@
+--- ltmain.sh.orig	Fri Mar 20 09:00:29 1998
++++ ltmain.sh	Sun Feb 14 21:19:14 1999
+@@ -144,6 +144,10 @@
      prev=execute_dlfiles
      ;;
  
 +  --install-la) install_la="yes" ;;
 +
++  --cplusplus) cplusplus="yes" ;;
++
    -*)
      $echo "$modename: unrecognized option \`$arg'" 1>&2
      $echo "$help" 1>&2
-@@ -1655,6 +1657,10 @@
+@@ -216,6 +233,11 @@
+   generic_help="$help"
+   help="Try \`$modename --help --mode=$mode' for more information."
+ 
++  # Are we linking a C++ library?
++  if test -n "$cplusplus" && test -n "$cpprt0"; then
++    archive_cmds="$archive_cmds $cpprt0"
++  fi
++
+   # These modes are in order of execution frequency so that they run quickly.
+   case "$mode" in
+   # libtool compile mode
+@@ -1655,6 +1677,10 @@
        -g) prev="-g" ;;
        -m) prev="-m" ;;
        -o) prev="-o" ;;
@@ -22,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 1998/11/12 23:44:05 frueauf Exp $
        -s)
          stripme=" -s"
          continue
-@@ -1841,10 +1847,12 @@
+@@ -1841,10 +1867,12 @@
            IFS="$save_ifs"
          fi
  
@@ -35,7 +49,7 @@ $NetBSD: patch-ab,v 1.3 1998/11/12 23:44:05 frueauf Exp $
  
          # Maybe install the static library, too.
          test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -1912,6 +1920,7 @@
+@@ -1912,6 +1940,7 @@
              exit 1
            fi
  
@@ -43,7 +57,7 @@ $NetBSD: patch-ab,v 1.3 1998/11/12 23:44:05 frueauf Exp $
            finalize=yes
            for lib in $link_against_libtool_libs; do
              # Check to see that each library is installed.
-@@ -1932,6 +1941,7 @@
+@@ -1932,6 +1961,7 @@
                finalize=no
              fi
            done
diff --git a/pkgtools/pkglibtool/pkg/PLIST b/pkgtools/pkglibtool/pkg/PLIST
deleted file mode 100644
index b5dd05ffbaa..00000000000
--- a/pkgtools/pkglibtool/pkg/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 1998/10/02 14:46:10 tv Exp $
-bin/pkglibtool