Reorder location and setting of BUILDLINK_PACKAGES to match template

buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.

4 files changed, 34 insertions, 34 deletions

diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index e743702cefc..68458847098 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:39 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CUPS_BUILDLINK3_MK:=	${CUPS_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ CUPS_BUILDLINK3_MK:=	${CUPS_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	cups
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncups}
+BUILDLINK_PACKAGES+=	cups
+
 .if !empty(CUPS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		cups
 BUILDLINK_DEPENDS.cups+=	cups>=1.1.19nb3
 BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
 .endif	# CUPS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 8c2318a03b9..41fdcc30d13 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,19 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:34:55 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomeprint.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINT_BUILDLINK3_MK:=	${LIBGNOMEPRINT_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnomeprint
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeprint}
+BUILDLINK_PACKAGES+=	libgnomeprint
+
 .if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgnomeprint
 BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.4.2nb1
 BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 
@@ -24,12 +23,10 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
-.  if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-.    include "../../print/cups/buildlink3.mk"
-.  endif
+.if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
+.  include "../../print/cups/buildlink3.mk"
+.endif
 
-.endif # LIBGNOMEPRINT_BUILDLINK3_MK
+.endif	# LIBGNOMEPRINT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 8ea2a5c9c3d..676643f7948 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:34:55 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomeprintui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINTUI_BUILDLINK3_MK:=	${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnomeprintui
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeprintui}
+BUILDLINK_PACKAGES+=	libgnomeprintui
+
 .if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgnomeprintui
 BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.4.2nb1
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -27,6 +24,6 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
+.endif	# LIBGNOMEPRINTUI_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index 5815ac97e02..5ff869df492 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PDFLIB_BUILDLINK3_MK:=	${PDFLIB_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ PDFLIB_BUILDLINK3_MK:=	${PDFLIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pdflib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npdflib}
+BUILDLINK_PACKAGES+=	pdflib
+
 .if !empty(PDFLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		pdflib
 BUILDLINK_DEPENDS.pdflib+=	pdflib>=4.0.3nb2
 BUILDLINK_PKGSRCDIR.pdflib?=	../../print/pdflib
 
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.endif # PDFLIB_BUILDLINK3_MK
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.endif	# PDFLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}