Reorder location and setting of BUILDLINK_PACKAGES to match template

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

4 files changed, 33 insertions, 45 deletions

diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk
index 47e9621f1c6..f83769314da 100644
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 17:44:17 wiz Exp $
-#
-# This Makefile fragment is included by packages that use ekg.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EKG_BUILDLINK3_MK:=	${EKG_BUILDLINK3_MK}+
@@ -12,8 +7,10 @@ EKG_BUILDLINK3_MK:=	${EKG_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ekg
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nekg}
+BUILDLINK_PACKAGES+=	ekg
+
 .if !empty(EKG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		ekg
 BUILDLINK_DEPENDS.ekg+=		ekg>=1.1
 BUILDLINK_PKGSRCDIR.ekg?=	../../chat/ekg
 
@@ -22,6 +19,6 @@ BUILDLINK_PKGSRCDIR.ekg?=	../../chat/ekg
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif # EKG_BUILDLINK3_MK
+.endif	# EKG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk
index 5402d51791c..e2f4567b73a 100644
--- a/chat/jabberd/buildlink3.mk
+++ b/chat/jabberd/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use jabberd.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JABBERD_BUILDLINK3_MK:=	${JABBERD_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ JABBERD_BUILDLINK3_MK:=	${JABBERD_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	jabberd
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njabberd}
+BUILDLINK_PACKAGES+=	jabberd
+
 .if !empty(JABBERD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			jabberd
-BUILDLINK_DEPENDS.jabberd+=		jabberd>=1.4.2
-BUILDLINK_PKGSRCDIR.jabberd?=		../../chat/jabberd
+BUILDLINK_DEPENDS.jabberd+=	jabberd>=1.4.2
+BUILDLINK_PKGSRCDIR.jabberd?=	../../chat/jabberd
 
 .include "../../security/openssl/buildlink3.mk"
 
-.endif # JABBERD_BUILDLINK3_MK
+.endif	# JABBERD_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/libtlen/buildlink3.mk b/chat/libtlen/buildlink3.mk
index 549e14420cd..e48fe020a35 100644
--- a/chat/libtlen/buildlink3.mk
+++ b/chat/libtlen/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/26 09:24:01 adam Exp $
-#
-# This Makefile fragment is included by packages that use libtlen.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBTLEN_BUILDLINK3_MK:=	${LIBTLEN_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LIBTLEN_BUILDLINK3_MK:=	${LIBTLEN_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libtlen
 .endif
 
-.if !empty(LIBTLEN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libtlen
-BUILDLINK_DEPENDS.libtlen+=		libtlen>=20040212
-BUILDLINK_PKGSRCDIR.libtlen?=		../../chat/libtlen
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtlen}
+BUILDLINK_PACKAGES+=	libtlen
 
-.endif # LIBTLEN_BUILDLINK3_MK
+.if !empty(LIBTLEN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libtlen+=	libtlen>=20040212
+BUILDLINK_PKGSRCDIR.libtlen?=	../../chat/libtlen
+.endif	# LIBTLEN_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk
index de61ecde0bd..3b6b3837238 100644
--- a/chat/loudmouth/buildlink3.mk
+++ b/chat/loudmouth/buildlink3.mk
@@ -1,31 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/20 14:16:19 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use loudmouth.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LOUDMOUTH_BUILDLINK3_MK:=	${LOUDMOUTH_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	loudmouth
 .endif
 
-.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			loudmouth
-BUILDLINK_DEPENDS.loudmouth+=		loudmouth>=0.10.1
-BUILDLINK_PKGSRCDIR.loudmouth?=		../../chat/loudmouth
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nloudmouth}
+BUILDLINK_PACKAGES+=	loudmouth
 
-.include "../../mk/bsd.prefs.mk"
+.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.loudmouth+=	loudmouth>=0.10.1
+BUILDLINK_PKGSRCDIR.loudmouth?=	../../chat/loudmouth
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+
 .if defined(LOUDMOUTH_USE_SSL) && !empty(LOUDMOUTH_USE_SSL:M[Yy][Ee][Ss])
-BUILDLINK_DEPENDS.gnutls=	gnutls>=1.0.0
-.include "../../security/gnutls/buildlink3.mk"
+BUILDLINK_DEPENDS.gnutls+=	gnutls>=1.0.0
+.  include "../../security/gnutls/buildlink3.mk"
 .endif
 
-.endif # LOUDMOUTH_BUILDLINK3_MK
+.endif	# LOUDMOUTH_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}