Add and activate libtool (with a.out and ELF support), a GNU utility for

making static and shared libraries in a machine-independent fashion.

4 files changed, 43 insertions, 37 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 707b7465b67..7d81fb8ab3b 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,24 +1,15 @@
-# New ports collection makefile for:	libtool
-# Version required:	1.2
-# Date created:		6 May 1998
-# Whom:			Motoyuki Kasahara <m-kasahr@sra.co.jp>
-#
-# $Id: Makefile,v 1.1.1.1 1998/07/13 01:50:08 tv Exp $
+# $NetBSD: Makefile,v 1.2 1998/07/13 01:53:49 tv Exp $
+# FreeBSD Id: Makefile,v 1.1.1.1 1998/05/07 15:58:20 vanilla Exp
 #
 
 DISTNAME=	libtool-1.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-MAINTAINER=	m-kasahr@sra.co.jp
+MAINTAINER=	tv@netbsd.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
-
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 8a3acab1cee..4ead1c8ff74 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,11 +1,34 @@
---- doc/libtool.texi.orig	Wed Mar 11 02:04:36 1998
-+++ doc/libtool.texi	Mon Apr 27 16:57:24 1998
-@@ -10,7 +10,7 @@
- @set BUGADDR the libtool mailing list @email{<bug-libtool@@gnu.org>}
- @set objdir .libs
+--- ltconfig.orig	Sun Jul 12 17:50:17 1998
++++ ltconfig	Sun Jul 12 18:23:58 1998
+@@ -808,7 +808,11 @@
+ 
+   netbsd*)
+     # Tested with NetBSD 1.2 ld
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
++    if [ -f /usr/lib/libc.so ]; 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
+@@ -1180,9 +1184,15 @@
+   ;;
+ 
+ netbsd* | openbsd*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}.so.$versuffix'
+-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++  if [ -f /usr/lib/libc.so ]; then
++    version_type=linux		# ELF libraries (SVR4 style)
++    library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so'
++    soname_spec='${libname}${release}.so.$major'
++  else
++    version_type=sunos		# a.out libraries
++    library_names_spec='${libname}${release}.so.$versuffix'
++    finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
  
--@dircategory GNU programming tools
-+@dircategory Programming & development tools
- @direntry
- * Libtool: (libtool).           Generic shared library support script.
- @end direntry
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
deleted file mode 100644
index ef0aedff5c3..00000000000
--- a/devel/libtool/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Fri Mar 20 17:01:52 1998
-+++ doc/Makefile.in	Mon Apr 27 17:22:55 1998
-@@ -56,7 +56,7 @@
- LD = @LD@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
diff --git a/devel/libtool/pkg/PLIST b/devel/libtool/pkg/PLIST
index 647349a4280..ee920585d82 100644
--- a/devel/libtool/pkg/PLIST
+++ b/devel/libtool/pkg/PLIST
@@ -1,9 +1,12 @@
+@comment $NetBSD: PLIST,v 1.2 1998/07/13 01:53:50 tv Exp $
 bin/libtool
 bin/libtoolize
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
+@unexec %D/bin/install-info --delete %D/info/libtool.info %D/info/dir
 info/libtool.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/libtool.info %D/info/dir
+info/libtool.info-1
+info/libtool.info-2
+info/libtool.info-3
+@exec %D/bin/install-info %D/info/libtool.info %D/info/dir
 share/aclocal/libtool.m4
 share/libtool/config.guess
 share/libtool/config.sub