Conform to template in revision 1.101 of bsd.buildlink3.mk.

7 files changed, 51 insertions, 68 deletions

diff --git a/devel/boost/buildlink3.mk b/devel/boost/buildlink3.mk
index 9e38035c2f2..fa0b12711e5 100644
--- a/devel/boost/buildlink3.mk
+++ b/devel/boost/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/29 18:29:02 wiz Exp $
-#
-# This Makefile fragment is included by packages that use boost.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BOOST_BUILDLINK3_MK:=	${BOOST_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ BOOST_BUILDLINK3_MK:=	${BOOST_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	boost
 .endif
 
-.if !empty(BOOST_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			boost
-BUILDLINK_DEPENDS.boost+=		boost>=1.30.2
-BUILDLINK_PKGSRCDIR.boost?=		../../devel/boost
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboost}
+BUILDLINK_PACKAGES+=	boost
 
-.endif # BOOST_BUILDLINK3_MK
+.if !empty(BOOST_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.boost+=	boost>=1.30.2
+BUILDLINK_PKGSRCDIR.boost?=	../../devel/boost
+.endif	# BOOST_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
index d39d6d11544..c53af5aaa22 100644
--- a/devel/ffcall/buildlink3.mk
+++ b/devel/ffcall/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/02 16:05:01 adam Exp $
-#
-# This Makefile fragment is included by packages that use ffcall.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFCALL_BUILDLINK3_MK:=	${FFCALL_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ FFCALL_BUILDLINK3_MK:=	${FFCALL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ffcall
 .endif
 
-.if !empty(FFCALL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			ffcall
-BUILDLINK_DEPENDS.ffcall+=		ffcall>=1.9
-BUILDLINK_PKGSRCDIR.ffcall?=		../../devel/ffcall
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffcall}
+BUILDLINK_PACKAGES+=	ffcall
 
-.endif # FFCALL_BUILDLINK3_MK
+.if !empty(FFCALL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ffcall+=	ffcall>=1.9
+BUILDLINK_PKGSRCDIR.ffcall?=	../../devel/ffcall
+.endif	# FFCALL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/unproven-pthreads/buildlink3.mk b/devel/unproven-pthreads/buildlink3.mk
index bbc78756b9b..851ea76b478 100644
--- a/devel/unproven-pthreads/buildlink3.mk
+++ b/devel/unproven-pthreads/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 23:37:26 grant Exp $
-#
-# This Makefile fragment is included by packages that use unproven-pthreads.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 UNPROVEN_PTHREADS_BUILDLINK3_MK:=	${UNPROVEN_PTHREADS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	unproven-pthreads
 .endif
 
-.if !empty(UNPROVEN_PTHREADS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			unproven-pthreads
-BUILDLINK_DEPENDS.unproven-pthreads+=		unproven-pthreads>=0.17
-BUILDLINK_PKGSRCDIR.unproven-pthreads?=		../../devel/unproven-pthreads
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nunproven-pthreads}
+BUILDLINK_PACKAGES+=	unproven-pthreads
 
-.endif # UNPROVEN_PTHREADS_BUILDLINK3_MK
+.if !empty(UNPROVEN_PTHREADS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.unproven-pthreads+=	unproven-pthreads>=0.17
+BUILDLINK_PKGSRCDIR.unproven-pthreads?=	../../devel/unproven-pthreads
+.endif	# UNPROVEN_PTHREADS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/cln/buildlink3.mk b/math/cln/buildlink3.mk
index f4fc6cdf720..32251ecdb86 100644
--- a/math/cln/buildlink3.mk
+++ b/math/cln/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/03/05 14:46:23 adam Exp $
-#
-# This Makefile fragment is included by packages that use cln.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLN_BUILDLINK3_MK:=	${CLN_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ CLN_BUILDLINK3_MK:=	${CLN_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	cln
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncln}
+BUILDLINK_PACKAGES+=	cln
+
 .if !empty(CLN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			cln
 BUILDLINK_DEPENDS.cln+=		cln>=1.1.6
-BUILDLINK_PKGSRCDIR.cln?=		../../adam/cln
-
-.endif # CLN_BUILDLINK3_MK
+BUILDLINK_PKGSRCDIR.cln?=	../../math/cln
+.endif	# CLN_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/gimp-print-lib/buildlink3.mk b/print/gimp-print-lib/buildlink3.mk
index 78e290d8dda..141c566644d 100644
--- a/print/gimp-print-lib/buildlink3.mk
+++ b/print/gimp-print-lib/buildlink3.mk
@@ -1,20 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/01 00:47:43 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GIMP_PRINT_LIB_BUILDLINK3_MK:=	${GIMP_PRINT_LIB_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gimp-print-lib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp-print-lib}
+BUILDLINK_PACKAGES+=	gimp-print-lib
+
 .if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gimp-print-lib
-BUILDLINK_DEPENDS.gimp-print-lib+=		gimp-print-lib>=4.2.5nb1
-BUILDLINK_PKGSRCDIR.gimp-print-lib?=		../../print/gimp-print-lib
+BUILDLINK_DEPENDS.gimp-print-lib+=	gimp-print-lib>=4.2.5nb1
+BUILDLINK_PKGSRCDIR.gimp-print-lib?=	../../print/gimp-print-lib
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-.endif # GIMP_PRINT_LIB_BUILDLINK3_MK
+.endif	# GIMP_PRINT_LIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/time/py-mxDateTime/buildlink3.mk b/time/py-mxDateTime/buildlink3.mk
index 6bc3e64672f..337cfac6bbf 100644
--- a/time/py-mxDateTime/buildlink3.mk
+++ b/time/py-mxDateTime/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/04 15:02:59 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/06 23:46:06 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_MXDATETIME_BUILDLINK3_MK:=	${PY_MXDATETIME_BUILDLINK3_MK}+
 
 .include "../../lang/python/pyversion.mk"
@@ -10,13 +9,15 @@ PY_MXDATETIME_BUILDLINK3_MK:=	${PY_MXDATETIME_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	py-mxDateTime
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-mxDateTime}
+BUILDLINK_PACKAGES+=	py-mxDateTime
+
 .if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			py-mxDateTime
-BUILDLINK_DEPENDS.py-mxDateTime+=		${PYPKGPREFIX}-mxDateTime>=2.0.5
-BUILDLINK_PKGSRCDIR.py-mxDateTime?=		../../time/py-mxDateTime
+BUILDLINK_DEPENDS.py-mxDateTime+=	${PYPKGPREFIX}-mxDateTime>=2.0.5
+BUILDLINK_PKGSRCDIR.py-mxDateTime?=	../../time/py-mxDateTime
 
 BUILDLINK_INCDIRS.py-mxDateTime+=	${PYSITELIB}/mx/DateTime/mxDateTime
 
-.endif # PY_MXDATETIME_BUILDLINK3_MK
+.endif	# PY_MXDATETIME_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index 46daf79d4c8..7444c2bdd2d 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/04 16:13:35 wiz Exp $
-#
-# This Makefile fragment is included by packages that use lablgtk.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LABLGTK_BUILDLINK3_MK:=	${LABLGTK_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LABLGTK_BUILDLINK3_MK:=	${LABLGTK_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	lablgtk
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk}
+BUILDLINK_PACKAGES+=	lablgtk
+
 .if !empty(LABLGTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			lablgtk
-BUILDLINK_DEPENDS.lablgtk+=		lablgtk>=1.2.5nb3
-BUILDLINK_PKGSRCDIR.lablgtk?=		../../x11/lablgtk
+BUILDLINK_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
+BUILDLINK_PKGSRCDIR.lablgtk?=	../../x11/lablgtk
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 
-.endif # LABLGTK_BUILDLINK3_MK
+.endif	# LABLGTK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}