Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

10 files changed, 66 insertions, 7 deletions

diff --git a/mail/drac/buildlink.mk b/mail/drac/buildlink.mk
index 3f57b9ef336..e454b3ff3bb 100644
--- a/mail/drac/buildlink.mk
+++ b/mail/drac/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/20 12:49:32 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:04 jlam Exp $
 #
 # This Makefile fragment is included by packages that use drac.
 #
diff --git a/mail/drac/buildlink2.mk b/mail/drac/buildlink2.mk
new file mode 100644
index 00000000000..a5611659aea
--- /dev/null
+++ b/mail/drac/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:04 jlam Exp $
+
+.if !defined(DRAC_BUILDLINK2_MK)
+DRAC_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		drac
+BUILDLINK_DEPENDS.drac?=	drac>=1.10
+BUILDLINK_PKGSRCDIR.drac?=	../../mail/drac
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.drac=drac
+BUILDLINK_PREFIX.drac_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.drac+=	include/drac.h
+BUILDLINK_FILES.drac+=	lib/libdrac.*
+
+BUILDLINK_TARGETS+=	drac-buildlink
+
+drac-buildlink: _BUILDLINK_USE
+
+.endif	# DRAC_BUILDLINK2_MK
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index c8f7c185934..aa4d9f544fe 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/07/07 14:39:16 tron Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/25 19:23:05 jlam Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	2
diff --git a/mail/faces/buildlink2.mk b/mail/faces/buildlink2.mk
new file mode 100644
index 00000000000..28e1ce6449e
--- /dev/null
+++ b/mail/faces/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:05 jlam Exp $
+
+.if !defined(FACES_BUILDLINK2_MK)
+FACES_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		faces
+BUILDLINK_DEPENDS.faces?=	faces>=1.6.1nb1
+BUILDLINK_PKGSRCDIR.faces?=	../../mail/faces
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.faces=faces
+BUILDLINK_PREFIX.faces_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.faces=		include/compface.h
+BUILDLINK_FILES.faces+=		lib/libcompface.*
+
+BUILDLINK_TARGETS+=	faces-buildlink
+
+faces-buildlink: _BUILDLINK_USE
+
+.endif	# FACES_BUILDLINK2_MK
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 7a21f5c9102..2cf62ea21eb 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/07/07 14:25:52 tron Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 19:23:05 jlam Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 Size (faces-1.6.1.tar.Z) = 249469 bytes
diff --git a/mail/faces/patches/patch-ax b/mail/faces/patches/patch-ax
index 8108a858db8..c7018de8c71 100644
--- a/mail/faces/patches/patch-ax
+++ b/mail/faces/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.1 2002/07/07 14:25:53 tron Exp $
+$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:05 jlam Exp $
 
 --- filters/fs2ikon.orig	Thu Oct 24 03:26:14 1991
 +++ filters/fs2ikon	Sun Jul  7 16:18:17 2002
diff --git a/mail/faces/patches/patch-ay b/mail/faces/patches/patch-ay
index d46d955b459..d232ac59057 100644
--- a/mail/faces/patches/patch-ay
+++ b/mail/faces/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1 2002/07/07 14:25:53 tron Exp $
+$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:05 jlam Exp $
 
 --- filters/fs2xbm.orig	Tue Nov 19 05:02:32 1991
 +++ filters/fs2xbm	Sun Jul  7 16:19:16 2002
diff --git a/mail/faces/patches/patch-az b/mail/faces/patches/patch-az
index 4cd065b27b1..5480f3cc13e 100644
--- a/mail/faces/patches/patch-az
+++ b/mail/faces/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1 2002/07/07 14:25:53 tron Exp $
+$NetBSD: patch-az,v 1.2 2002/08/25 19:23:05 jlam Exp $
 
 --- filters/xbmsize48.orig	Tue Nov 19 05:02:32 1991
 +++ filters/xbmsize48	Sun Jul  7 16:19:23 2002
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 9aa03e1805e..b7e57af9d60 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/08/15 00:32:58 fredb Exp $
+# $NetBSD: Makefile,v 1.44 2002/08/25 19:23:06 jlam Exp $
 
 DISTNAME=       imap-2001a
 PKGNAME=        imap-uw-2001.1
diff --git a/mail/imap-uw/buildlink2.mk b/mail/imap-uw/buildlink2.mk
new file mode 100644
index 00000000000..5874c33f8af
--- /dev/null
+++ b/mail/imap-uw/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:06 jlam Exp $
+
+.if !defined(IMAP_UW_BUILDLINK2_MK)
+IMAP_UW_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		imap-uw
+BUILDLINK_DEPENDS.imap-uw?=	imap-uw>=2001.1
+BUILDLINK_PKGSRCDIR.imap-uw?=	../../mail/imap-uw
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.imap-uw=imap-uw
+BUILDLINK_PREFIX.imap-uw_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.imap-uw=	include/c-client/*
+BUILDLINK_FILES.imap-uw+=	lib/libc-client.*
+BUILDLINK_FILES.imap-uw+=	lib/libc-client_pic.*
+BUILDLINK_FILES.imap-uw+=	lib/libimapuw.*
+
+BUILDLINK_TARGETS+=	imap-uw-buildlink
+
+imap-uw-buildlink: _BUILDLINK_USE
+
+.endif	# IMAP_UW_BUILDLINK2_MK