Split into libtool-base and libtool-info, for easier system bootstrap.

This meta-package pulls in the other two parts.

XXX any modifications should be made to this pkg's Makefile.common, patches,
XXX files dir etc. *only* !

5 files changed, 45 insertions, 71 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 0b413e56ad6..29b880b5023 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,41 +1,19 @@
-# $NetBSD: Makefile,v 1.30 2001/01/26 16:42:44 skrll Exp $
+# $NetBSD: Makefile,v 1.31 2001/02/03 05:34:57 hubertf Exp $
 #
 
-DISTNAME=	libtool-1.3.5
-PKGNAME=	libtool-1.3.5nb11
-CATEGORIES=	devel pkgtools
-MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
+DISTFILES=	# empty
+.include "Makefile.common"
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.gnu.org/software/libtool/libtool.html
+PKGNAME=	${DISTNAME}${PKGREV}
 
-CONFLICTS=	glibtool-*
-GNU_CONFIGURE=	yes
-USE_GTEXINFO=	yes
+DEPENDS+=	${DISTNAME:C/-/-base-/}${PKGREV}:../libtool-base
+DEPENDS+=	${DISTNAME:C/-/-info-/}${PKGREV}:../libtool-info
 
-# It seems the info-files distributed with libtool 1.3.5 are broken.
-# To test, type "info libtool|" and hold down space. See it stop with a
-# ``Cannot find the node "(/usr/pkg/info/libtool.info)Linking executables"''
-# error. Simply making sure the info-files get re-done works here.
-post-extract:
-	${RM} -f ${WRKSRC}/doc/libtool.info*
+NO_CONFIGURE=	yes
+NO_PATCH=	yes
+NO_BUILD=	yes
 
-test: build
-	cd ${WRKSRC} && ${MAKE} check
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_PLATFORM:MNetBSD-1.4-sparc} != "" || \
-	${MACHINE_PLATFORM:MNetBSD-1.4.[12]-sparc} != ""
-DEPENDS+=	c++rt0>=1.0:../../sysutils/c++rt0
-.endif
-
-.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
+do-install:
+	@${ECHO_MSG} this is only a meta package.
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
new file mode 100644
index 00000000000..f1a3d79d50b
--- /dev/null
+++ b/devel/libtool/Makefile.common
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.common,v 1.1 2001/02/03 05:34:58 hubertf Exp $
+#
+
+DISTNAME=	libtool-1.3.5
+PKGREV=		nb11
+CATEGORIES=	devel pkgtools
+MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
+
+MAINTAINER=	tv@netbsd.org
+HOMEPAGE=	http://www.gnu.org/software/libtool/libtool.html
+
+CONFLICTS=	glibtool-*
+GNU_CONFIGURE=	yes
+
+FILESDIR=	${.CURDIR}/../libtool/files
+PATCHDIR=	${.CURDIR}/../libtool/patches
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index 804b4e54a0e..e0baa86426a 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.23 2001/01/26 17:33:26 tsutsui Exp $
+$NetBSD: patch-sum,v 1.24 2001/02/03 05:34:58 hubertf Exp $
 
 MD5 (patch-aa) = 9d0fe34136ac2f00b71e535049e7ef17
 MD5 (patch-ab) = a20254fd1309b8a4ba0efd4c4ec2221a
 MD5 (patch-ac) = 5703d81b131aa7d9523ee3830a98780a
+MD5 (patch-ad) = 2ecdc83071188547039793cf7d84cca6
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
new file mode 100644
index 00000000000..29affae5ab4
--- /dev/null
+++ b/devel/libtool/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2001/02/03 05:34:58 hubertf Exp $
+
+--- Makefile.in.orig	Sat May 27 13:23:32 2000
++++ Makefile.in
+@@ -82,7 +82,8 @@
+ 
+ AUTOMAKE_OPTIONS = 1.3e gnu
+ 
+-BUILD_SUBDIRS = . libltdl doc tests
++# We build the docs in a seperate pkg in NetBSD (etc.):
++BUILD_SUBDIRS = . libltdl tests
+ SUBDIRS = $(BUILD_SUBDIRS)
+ DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
+ 
diff --git a/devel/libtool/pkg/PLIST b/devel/libtool/pkg/PLIST
index d9a0bfb1683..0310d7a0883 100644
--- a/devel/libtool/pkg/PLIST
+++ b/devel/libtool/pkg/PLIST
@@ -1,37 +1,2 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:31 agc Exp $
-bin/libtool
-bin/libtoolize
-lib/libltdl.la
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-lib/libltdl.so.1.2
-include/ltdl.h
-@unexec install-info --delete %D/info/libtool.info %D/info/dir
-info/libtool.info
-info/libtool.info-1
-info/libtool.info-2
-info/libtool.info-3
-info/libtool.info-4
-@exec install-info %D/info/libtool.info %D/info/dir
-share/aclocal/libtool.m4
-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
+@comment $NetBSD: PLIST,v 1.8 2001/02/03 05:34:58 hubertf Exp $
+@comment empty