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.

5 files changed, 25 insertions, 6 deletions

diff --git a/devel/libmm/Makefile b/devel/libmm/Makefile
index aed5963e96a..0147468e598 100644
--- a/devel/libmm/Makefile
+++ b/devel/libmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/01 00:28:16 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 18:38:30 jlam Exp $
 #
 
 DISTNAME=	mm-1.2.1
@@ -10,10 +10,10 @@ MAINTAINER=	cjones@netbsd.org
 HOMEPAGE=	http://www.ossp.org/pkg/lib/mm/
 COMMENT=	Portable abstraction layer for shared memory
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmm/PLIST b/devel/libmm/PLIST
index b39a837ea3a..58e1f088a13 100644
--- a/devel/libmm/PLIST
+++ b/devel/libmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/01 00:28:16 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:30 jlam Exp $
 bin/mm-config
 include/mm.h
 lib/libmm.a
diff --git a/devel/libmm/buildlink.mk b/devel/libmm/buildlink.mk
index bc6b366e487..b610ebfcf2f 100644
--- a/devel/libmm/buildlink.mk
+++ b/devel/libmm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/08/01 00:53:20 mycroft Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 18:38:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmm.
 #
diff --git a/devel/libmm/buildlink2.mk b/devel/libmm/buildlink2.mk
new file mode 100644
index 00000000000..e21f6587085
--- /dev/null
+++ b/devel/libmm/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:31 jlam Exp $
+
+.if !defined(LIBMM_BUILDLINK2_MK)
+LIBMM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libmm
+BUILDLINK_DEPENDS.libmm?=	libmm>=1.2.1
+BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libmm=libmm
+BUILDLINK_PREFIX.libmm_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libmm=		include/mm.h
+BUILDLINK_FILES.libmm+=		lib/libmm.*
+
+BUILDLINK_TARGETS+=	libmm-buildlink
+
+libmm-buildlink: _BUILDLINK_USE
+
+.endif	# LIBMM_BUILDLINK2_MK
diff --git a/devel/libmm/distinfo b/devel/libmm/distinfo
index 16ff54d7ac6..1bb8e9c5907 100644
--- a/devel/libmm/distinfo
+++ b/devel/libmm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/08/01 00:28:16 mycroft Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 18:38:31 jlam Exp $
 
 SHA1 (mm-1.2.1.tar.gz) = c2915c82adbf9be7b43375a5ced3dc08700b1810
 Size (mm-1.2.1.tar.gz) = 217078 bytes