Reorder location and setting of BUILDLINK_PACKAGES to match template

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

3 files changed, 24 insertions, 32 deletions

diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk
index c12ca23287e..cacde221d46 100644
--- a/comms/jpilot/buildlink3.mk
+++ b/comms/jpilot/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:43:43 minskim Exp $
-#
-# This Makefile fragment is included by packages that use jpilot.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPILOT_BUILDLINK3_MK:=	${JPILOT_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ JPILOT_BUILDLINK3_MK:=	${JPILOT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	jpilot
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njpilot}
+BUILDLINK_PACKAGES+=	jpilot
+
 .if !empty(JPILOT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			jpilot
-BUILDLINK_DEPENDS.jpilot+=		jpilot>=0.99.5nb4
-BUILDLINK_PKGSRCDIR.jpilot?=		../../comms/jpilot
+BUILDLINK_DEPENDS.jpilot+=	jpilot>=0.99.5nb4
+BUILDLINK_PKGSRCDIR.jpilot?=	../../comms/jpilot
 
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # JPILOT_BUILDLINK3_MK
+.endif	# JPILOT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk
index 875f981a541..53376f40aff 100644
--- a/comms/openobex/buildlink3.mk
+++ b/comms/openobex/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/26 12:49:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use openobex.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENOBEX_BUILDLINK3_MK:=	${OPENOBEX_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	openobex
 .endif
 
-.if !empty(OPENOBEX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			openobex
-BUILDLINK_DEPENDS.openobex+=		openobex>=1.0.1
-BUILDLINK_PKGSRCDIR.openobex?=		../../comms/openobex
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenobex}
+BUILDLINK_PACKAGES+=	openobex
 
-.endif # OPENOBEX_BUILDLINK3_MK
+.if !empty(OPENOBEX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.openobex+=	openobex>=1.0.1
+BUILDLINK_PKGSRCDIR.openobex?=	../../comms/openobex
+.endif	# OPENOBEX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/comms/pilot-link-libs/buildlink3.mk b/comms/pilot-link-libs/buildlink3.mk
index 7d20f46cf9e..74119fed909 100644
--- a/comms/pilot-link-libs/buildlink3.mk
+++ b/comms/pilot-link-libs/buildlink3.mk
@@ -1,24 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:31:23 minskim Exp $
-#
-# This Makefile fragment is included by packages that use pilot-link-libs.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PILOT_LINK_LIBS_BUILDLINK3_MK:=	${PILOT_LINK_LIBS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	pilot-link-libs
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npilot-link-libs}
+BUILDLINK_PACKAGES+=	pilot-link-libs
+
 .if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pilot-link-libs
-BUILDLINK_DEPENDS.pilot-link-libs+=		pilot-link-libs>=0.11.7nb1
-BUILDLINK_PKGSRCDIR.pilot-link-libs?=		../../comms/pilot-link-libs
+BUILDLINK_DEPENDS.pilot-link-libs+=	pilot-link-libs>=0.11.7nb1
+BUILDLINK_PKGSRCDIR.pilot-link-libs?=	../../comms/pilot-link-libs
 
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 
-.endif # PILOT_LINK_LIBS_BUILDLINK3_MK
+.endif	# PILOT_LINK_LIBS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}