Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

7 files changed, 25 insertions, 6 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index c4c814d5d5b..8b610db2bba 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/05/23 20:07:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.37 2002/08/25 18:38:33 jlam Exp $
 #
 
 DISTFILES=	# empty
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 364b0a5a992..267868daff2 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2002/05/21 14:03:36 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.23 2002/08/25 18:38:34 jlam Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
diff --git a/devel/libtool/buildlink2.mk b/devel/libtool/buildlink2.mk
new file mode 100644
index 00000000000..a516bb0ab23
--- /dev/null
+++ b/devel/libtool/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:34 jlam Exp $
+
+.if !defined(LTDL_BUILDLINK2_MK)
+LTDL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		ltdl
+BUILDLINK_DEPENDS.ltdl?=	libtool-base>=${LIBTOOL_REQD}
+BUILDLINK_PKGSRCDIR.ltdl?=	../../devel/libtool-base
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.ltdl=libtool-base
+BUILDLINK_PREFIX.ltdl_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ltdl=	include/ltdl.h
+BUILDLINK_FILES.ltdl+=	lib/libltdl.*
+
+BUILDLINK_TARGETS+=	ltdl-buildlink
+
+ltdl-buildlink: _BUILDLINK_USE
+
+.endif	# LTDL_BUILDLINK2_MK
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index d82739cd2ca..d0541ed33ea 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2002/05/21 14:03:37 schmonz Exp $
+$NetBSD: distinfo,v 1.18 2002/08/25 18:38:35 jlam Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 5eb7a9232c9..cf1aa987289 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.27 2002/05/21 14:03:37 schmonz Exp $
+$NetBSD: patch-aa,v 1.28 2002/08/25 18:38:35 jlam Exp $
 
 --- ltconfig.in.orig	Mon May 21 05:05:06 2001
 +++ ltconfig.in
diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag
index 3dee189d0a4..c18d9213da0 100644
--- a/devel/libtool/patches/patch-ag
+++ b/devel/libtool/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.6 2002/05/21 14:03:37 schmonz Exp $
+$NetBSD: patch-ag,v 1.7 2002/08/25 18:38:35 jlam Exp $
 
 --- ltcf-cxx.sh.orig	Wed May 23 05:05:06 2001
 +++ ltcf-cxx.sh
diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am
index 68c23fc8422..30f2f5c49b5 100644
--- a/devel/libtool/patches/patch-am
+++ b/devel/libtool/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2002/05/21 14:03:37 schmonz Exp $
+$NetBSD: patch-am,v 1.4 2002/08/25 18:38:36 jlam Exp $
 
 --- ltcf-c.sh.orig	Wed Apr 25 00:05:02 2001
 +++ ltcf-c.sh