update for libtool-1.3.3

5 files changed, 46 insertions, 41 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index c650eb00ca9..1b72999d151 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:50 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/09/02 21:35:50 christos Exp $
 #
 
-DISTNAME=	libtool-1.2
+DISTNAME=	libtool-1.3.3
 # XXX should change back to libtool with next release; this differentiates
 # libtool from pkg-customized libtool, the latter under the "libtool-1.2" name
-PKGNAME=	glibtool-1.2
+PKGNAME=	glibtool-1.3.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
@@ -12,8 +12,14 @@ MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.profitpress.com/libtool/
 
 GNU_CONFIGURE=	yes
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
 .if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
 CONFIGURE_ARGS=	--disable-shared
 .endif
+.else
+CONFIGURE_ARGS=	--enable-ltdl-install
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool/files/md5 b/devel/libtool/files/md5
index 4129858e994..384c5ab5ea5 100644
--- a/devel/libtool/files/md5
+++ b/devel/libtool/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:25 agc Exp $
+$NetBSD: md5,v 1.3 1999/09/02 21:35:50 christos Exp $
 
-MD5 (libtool-1.2.tar.gz) = 66b016fdf220682affbfdcaa2225a9bd
+MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index 8c7acef1052..8cde1cc7ec7 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:38 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/02 21:35:51 christos Exp $
 
-MD5 (patch-aa) = 26d235a9883ea5cdf542754ccfc3c914
+MD5 (patch-aa) = f47278bd27bfc99145be98ea23da3329
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 1bbe548cb80..65dd08326fc 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,35 +1,20 @@
-$NetBSD: patch-aa,v 1.6 1998/11/12 16:27:31 agc Exp $
+$NetBSD: patch-aa,v 1.7 1999/09/02 21:35:51 christos Exp $
 
---- ltconfig.orig	Fri Mar 20 03:00:29 1998
-+++ ltconfig	Sun Sep 27 11:47:30 1998
-@@ -808,7 +808,11 @@
- 
-   netbsd*)
-     # Tested with NetBSD 1.2 ld
--    archive_cmds='$LD -Bshareable -o $lib$libobjs'
-+    if $CC -E - -dM </dev/null | grep -q __ELF__; then
-+      archive_cmds='$LD -shared -o $lib$libobjs'	# ELF
-+    else
-+      archive_cmds='$LD -Bshareable -o $lib$libobjs'	# a.out
-+    fi
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-@@ -1181,8 +1185,15 @@
- 
- netbsd* | openbsd*)
-   version_type=sunos
--  library_names_spec='${libname}${release}.so.$versuffix'
--  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  if $CC -E - -dM </dev/null | grep -q __ELF__; then
-+    library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so'
-+    soname_spec='${libname}${release}.so.$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  else
-+    library_names_spec='${libname}${release}.so.$versuffix'
-+    finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD/OpenBSD (a.out) ld.so'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
+--- configure.orig	Fri Jul  2 12:01:56 1999
++++ configure	Fri Aug 20 18:22:00 1999
+@@ -1853,10 +1853,13 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
++      if [ -z "$ac_given_INSTALL" ]; then
++	ac_given_INSTALL="$INSTALL"
++      fi
++      case "$ac_given_INSTALL" in
+         [/$]*) INSTALL="$ac_given_INSTALL" ;;
+         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
++      esac
  
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/devel/libtool/pkg/PLIST b/devel/libtool/pkg/PLIST
index 670dcaf8bcc..9a54a319726 100644
--- a/devel/libtool/pkg/PLIST
+++ b/devel/libtool/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/02/11 19:17:30 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/09/02 21:35:51 christos Exp $
 bin/libtool
 bin/libtoolize
 @unexec install-info --delete %D/info/libtool.info %D/info/dir
@@ -12,5 +12,19 @@ share/libtool/config.guess
 share/libtool/config.sub
 share/libtool/ltconfig
 share/libtool/ltmain.sh
+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 
+@dirrm share/libtool/libltdl
 @dirrm share/libtool
 @unexec rmdir %D/share/aclocal 2>/dev/null || true