Reorder location and setting of BUILDLINK_PACKAGES to match template

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

13 files changed, 85 insertions, 91 deletions

diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk
index 4c5f87ff7a1..e9e9ade1d27 100644
--- a/net/GeoIP/buildlink3.mk
+++ b/net/GeoIP/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 03:34:07 minskim Exp $
-#
-# This Makefile fragment is included by packages that use GeoIP.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEOIP_BUILDLINK3_MK:=	${GEOIP_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ GEOIP_BUILDLINK3_MK:=	${GEOIP_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	GeoIP
 .endif
 
-.if !empty(GEOIP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			GeoIP
-BUILDLINK_DEPENDS.GeoIP+=		GeoIP>=1.3.1
-BUILDLINK_PKGSRCDIR.GeoIP?=		../../net/GeoIP
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeoIP}
+BUILDLINK_PACKAGES+=	GeoIP
 
-.endif # GEOIP_BUILDLINK3_MK
+.if !empty(GEOIP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GeoIP+=	GeoIP>=1.3.1
+BUILDLINK_PKGSRCDIR.GeoIP?=	../../net/GeoIP
+.endif	# GEOIP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index fe7d0b0ccae..b92e3d33512 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT_BUILDLINK3_MK:=	${ORBIT_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ ORBIT_BUILDLINK3_MK:=	${ORBIT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ORBit
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit}
+BUILDLINK_PACKAGES+=	ORBit
+
 .if !empty(ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		ORBit
 BUILDLINK_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
 BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
 
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../devel/glib/buildlink3.mk"
-.  include "../../security/tcp_wrappers/buildlink3.mk"
-.endif # ORBIT_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+
+.endif	# ORBIT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index f8117c0e6e1..fb964e39e3b 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/11 00:21:09 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ORBit2.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT2_BUILDLINK3_MK:=	${ORBIT2_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ ORBIT2_BUILDLINK3_MK:=	${ORBIT2_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ORBit2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit2}
+BUILDLINK_PACKAGES+=	ORBit2
+
 .if !empty(ORBIT2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			ORBit2
-BUILDLINK_DEPENDS.ORBit2+=		ORBit2>=2.8.2
-BUILDLINK_PKGSRCDIR.ORBit2?=		../../net/ORBit2
+BUILDLINK_DEPENDS.ORBit2+=	ORBit2>=2.8.2
+BUILDLINK_PKGSRCDIR.ORBit2?=	../../net/ORBit2
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 
-.endif # ORBIT2_BUILDLINK3_MK
+.endif	# ORBIT2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index 4bafcaacc16..86d0e16da8b 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 17:56:42 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gnet.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET_BUILDLINK3_MK:=	${GNET_BUILDLINK3_MK}+
@@ -10,13 +7,15 @@ GNET_BUILDLINK3_MK:=	${GNET_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gnet
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet}
+BUILDLINK_PACKAGES+=	gnet
+
 .if !empty(GNET_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnet
-BUILDLINK_DEPENDS.gnet+=		gnet>=2.0.3nb1
-BUILDLINK_PKGSRCDIR.gnet?=		../../net/gnet
+BUILDLINK_DEPENDS.gnet+=	gnet>=2.0.3nb1
+BUILDLINK_PKGSRCDIR.gnet?=	../../net/gnet
 
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif # GNET_BUILDLINK3_MK
+.endif	# GNET_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index c089d491d6e..503519f7731 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 03:29:46 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gnet1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET1_BUILDLINK3_MK:=	${GNET1_BUILDLINK3_MK}+
@@ -10,13 +7,15 @@ GNET1_BUILDLINK3_MK:=	${GNET1_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gnet1
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet1}
+BUILDLINK_PACKAGES+=	gnet1
+
 .if !empty(GNET1_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gnet1
-BUILDLINK_DEPENDS.gnet1+=		gnet1>=1.1.8nb2
-BUILDLINK_PKGSRCDIR.gnet1?=		../../net/gnet1
+BUILDLINK_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
+BUILDLINK_PKGSRCDIR.gnet1?=	../../net/gnet1
 
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif # GNET1_BUILDLINK3_MK
+.endif	# GNET1_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index de9cc2300e8..69ce8b1a0f2 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/11 00:21:09 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libIDL.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDL_BUILDLINK3_MK:=	${LIBIDL_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBIDL_BUILDLINK3_MK:=	${LIBIDL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libIDL
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibIDL}
+BUILDLINK_PACKAGES+=	libIDL
+
 .if !empty(LIBIDL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libIDL
-BUILDLINK_DEPENDS.libIDL+=		libIDL>=0.8.2
-BUILDLINK_PKGSRCDIR.libIDL?=		../../net/libIDL
+BUILDLINK_DEPENDS.libIDL+=	libIDL>=0.8.2
+BUILDLINK_PKGSRCDIR.libIDL?=	../../net/libIDL
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-.endif # LIBIDL_BUILDLINK3_MK
+.endif	# LIBIDL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index b81a58d1b3b..c45e3c0b482 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:06:30 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libsoup.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libsoup
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup}
+BUILDLINK_PACKAGES+=	libsoup
+
 .if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libsoup
-BUILDLINK_DEPENDS.libsoup+=		libsoup>=1.99.26
-BUILDLINK_PKGSRCDIR.libsoup?=		../../net/libsoup
+BUILDLINK_DEPENDS.libsoup+=	libsoup>=1.99.26
+BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif # LIBSOUP_BUILDLINK3_MK
+.endif	# LIBSOUP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index ad2b8f21d15..97bb87568ca 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,22 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:51:23 minskim Exp $
-#
-# This Makefile fragment is included by packages that use netatalk.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	netatalk
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGESNnetatalk}
+BUILDLINK_PACKAGES+=	netatalk
+
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			netatalk
-BUILDLINK_DEPENDS.netatalk+=		netatalk>=1.6.2
-BUILDLINK_PKGSRCDIR.netatalk?=		../../net/netatalk
+BUILDLINK_DEPENDS.netatalk+=	netatalk>=1.6.2
+BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
 
 .include "../../devel/rx/buildlink3.mk"
 
-.endif # NETATALK_BUILDLINK3_MK
+.endif	# NETATALK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index 04f67eea011..d0409cb0f40 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	openslp
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenslp}
+BUILDLINK_PACKAGES+=	openslp
+
 .if !empty(OPENSLP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		openslp
 BUILDLINK_DEPENDS.openslp+=	openslp>=1.0.1
 BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 .endif	# OPENSLP_BUILDLINK3_MK
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index 7348c30c356..3837a8d39b7 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,9 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-ORBit.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
 
 .include "../../lang/python/pyversion.mk"
@@ -12,13 +9,15 @@ PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pyorbit
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyorbit}
+BUILDLINK_PACKAGES+=	pyorbit
+
 .if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pyorbit
-BUILDLINK_DEPENDS.pyorbit+=		${PYPKGPREFIX}-ORBit>=2.0.0nb1
-BUILDLINK_PKGSRCDIR.pyorbit?=		../../net/py-ORBit
+BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
+BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
 
 .include "../../net/ORBit2/buildlink3.mk"
 
-.endif # PY_ORBIT_BUILDLINK3_MK
+.endif	# PY_ORBIT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index 5122784290d..e83b6e5c4d9 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	socks4
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks4}
+BUILDLINK_PACKAGES+=	socks4
+
 .if !empty(SOCKS4_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		socks4
 BUILDLINK_DEPENDS.socks4+=	socks4>=2.2
 BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 
 BUILDLINK_TRANSFORM+=	l:socks:socks4
+
 .endif	# SOCKS4_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 48e23cb6881..8a9980928c1 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:39 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	socks5
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks5}
+BUILDLINK_PACKAGES+=	socks5
+
 .if !empty(SOCKS5_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		socks5
 BUILDLINK_DEPENDS.socks5+=	socks5>=1.0.2
 BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 .endif	# SOCKS5_BUILDLINK3_MK
diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk
index 8813ff7315c..135749cf18b 100644
--- a/net/spread/buildlink3.mk
+++ b/net/spread/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:18:13 jlam Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPREAD_BUILDLINK3_MK:=	${SPREAD_BUILDLINK3_MK}+
@@ -8,10 +7,12 @@ SPREAD_BUILDLINK3_MK:=	${SPREAD_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	spread
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspread}
+BUILDLINK_PACKAGES+=	spread
+
 .if !empty(SPREAD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		spread
 BUILDLINK_DEPENDS.spread+=	spread>=3.17.1
 BUILDLINK_PKGSRCDIR.spread?=	../../net/spread
-.endif # SPREAD_BUILDLINK3_MK
+.endif	# SPREAD_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}