summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorjlam <jlam>2004-03-05 19:25:06 +0000
committerjlam <jlam>2004-03-05 19:25:06 +0000
commit12109d5b873e13ef999184b4ace84a18e0a72358 (patch)
treea3daf9a5fb572d8089372ce24f3f353d4bac8d47 /fonts
parent04f41a3b8d89ef1b69c652c4374e1b9502c6283d (diff)
downloadpkgsrc-12109d5b873e13ef999184b4ace84a18e0a72358.tar.gz
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/gucharmap/buildlink3.mk19
-rw-r--r--fonts/t1lib/buildlink3.mk16
2 files changed, 15 insertions, 20 deletions
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index 76a14f00f4b..6d0f96933cd 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/16 00:11:32 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gucharmap.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUCHARMAP_BUILDLINK3_MK:= ${GUCHARMAP_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gucharmap
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngucharmap}
+BUILDLINK_PACKAGES+= gucharmap
+
.if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gucharmap
-BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.2.0nb2
-BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
+BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.2.0nb2
+BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
.include "../../devel/popt/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GUCHARMAP_BUILDLINK3_MK
+.endif # GUCHARMAP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk
index 43d85013454..7d8ec97da57 100644
--- a/fonts/t1lib/buildlink3.mk
+++ b/fonts/t1lib/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/03 11:28:11 adam Exp $
-#
-# This Makefile fragment is included by packages that use t1lib.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= t1lib
.endif
-.if !empty(T1LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= t1lib
-BUILDLINK_DEPENDS.t1lib+= t1lib>=5.0.1
-BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nt1lib}
+BUILDLINK_PACKAGES+= t1lib
-.endif # T1LIB_BUILDLINK3_MK
+.if !empty(T1LIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.t1lib+= t1lib>=5.0.1
+BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib
+.endif # T1LIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}