Reorder location and setting of BUILDLINK_PACKAGES to match template

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

12 files changed, 85 insertions, 109 deletions

diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index b22548f6ade..36ed0058231 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:59:54 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ap-perl.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ap-perl
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nap-perl}
+BUILDLINK_PACKAGES+=	ap-perl
+
 .if !empty(AP_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			ap-perl
-BUILDLINK_DEPENDS.ap-perl+=		ap-perl>=1.25nb1
-BUILDLINK_PKGSRCDIR.ap-perl?=		../../www/ap-perl
+BUILDLINK_DEPENDS.ap-perl+=	ap-perl>=1.25nb1
+BUILDLINK_PKGSRCDIR.ap-perl?=	../../www/ap-perl
 
 BUILDLINK_FILES.ap-perl+=	lib/httpd/mod_perl.*
 BUILDLINK_FILES.ap-perl+=	\
@@ -25,6 +22,6 @@ BUILDLINK_FILES.ap-perl+=	\
 
 .include "../../www/apache/buildlink3.mk"
 
-.endif # AP_PERL_BUILDLINK3_MK
+.endif	# AP_PERL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 82c539c440b..22b3368dd22 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/11 18:35:43 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -7,22 +7,26 @@ APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	apache
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
+BUILDLINK_PACKAGES+=	apache
+
 .if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		apache
 BUILDLINK_DEPENDS.apache+=	apache{,6}-1.3.*
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
-.  if defined(APACHE_MODULE)
+
+.if defined(APACHE_MODULE)
 BUILDLINK_DEPMETHOD.apache+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.apache?=	build
-.  endif
+.endif
 
 USE_PERL5?=	build	# for "apxs"
 APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
 
-.  if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--with-apxs="${APXS}"
-.  endif
+.endif
+
 .endif	# APACHE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk
index a9876805d81..0bd1eb72dce 100644
--- a/www/cgilib/buildlink3.mk
+++ b/www/cgilib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CGILIB_BUILDLINK3_MK:=	${CGILIB_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ CGILIB_BUILDLINK3_MK:=	${CGILIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	cgilib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncgilib}
+BUILDLINK_PACKAGES+=	cgilib
+
 .if !empty(CGILIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		cgilib
 BUILDLINK_DEPENDS.cgilib+=	cgilib>=0.5nb1
 BUILDLINK_PKGSRCDIR.cgilib?=	../../www/cgilib
-.endif # CGILIB_BUILDLINK3_MK
+.endif	# CGILIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 924cf88f1c5..d2daffb4b68 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 01:24:01 wiz Exp $
-#
-# This Makefile fragment is included by packages that use curl.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	curl
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncurl}
+BUILDLINK_PACKAGES+=	curl
+
 .if !empty(CURL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			curl
-BUILDLINK_DEPENDS.curl+=		curl>=7.9.1
-BUILDLINK_PKGSRCDIR.curl?=		../../www/curl
+BUILDLINK_DEPENDS.curl+=	curl>=7.9.1
+BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif # CURL_BUILDLINK3_MK
+.endif	# CURL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/gtkhtml3/buildlink3.mk b/www/gtkhtml3/buildlink3.mk
index 601021af722..496ba52ddde 100644
--- a/www/gtkhtml3/buildlink3.mk
+++ b/www/gtkhtml3/buildlink3.mk
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:59:51 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gtkhtml3.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML3_BUILDLINK3_MK:=	${GTKHTML3_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtkhtml3
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml3}
+BUILDLINK_PACKAGES+=	gtkhtml3
+
 .if !empty(GTKHTML3_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			gtkhtml3
-BUILDLINK_DEPENDS.gtkhtml3+=		gtkhtml3>=3.0.9nb5
-BUILDLINK_PKGSRCDIR.gtkhtml3?=		../../www/gtkhtml3
+BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.0.9nb5
+BUILDLINK_PKGSRCDIR.gtkhtml3?=	../../www/gtkhtml3
 
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gal2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 
-.endif # GTKHTML3_BUILDLINK3_MK
+.endif	# GTKHTML3_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk
index 1ce1b84894c..fdb8635a16a 100644
--- a/www/libghttp/buildlink3.mk
+++ b/www/libghttp/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 09:53:02 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libghttp.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGHTTP_BUILDLINK3_MK:=	${LIBGHTTP_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libghttp
 .endif
 
-.if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libghttp
-BUILDLINK_DEPENDS.libghttp+=		libghttp>=1.0.9
-BUILDLINK_PKGSRCDIR.libghttp?=		../../www/libghttp
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibghttp}
+BUILDLINK_PACKAGES+=	libghttp
 
-.endif # LIBGHTTP_BUILDLINK3_MK
+.if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libghttp+=	libghttp>=1.0.9
+BUILDLINK_PKGSRCDIR.libghttp?=	../../www/libghttp
+.endif	# LIBGHTTP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index 80168aa90e2..fb56ae59e10 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/13 19:36:38 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libgtkhtml.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgtkhtml
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtkhtml}
+BUILDLINK_PACKAGES+=	libgtkhtml
+
 .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libgtkhtml
 BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.4.1nb5
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
@@ -22,6 +19,6 @@ BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # LIBGTKHTML_BUILDLINK3_MK
+.endif	# LIBGTKHTML_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index d87398b2260..8aaaee452f1 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 21:39:32 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libwww.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
@@ -10,14 +7,16 @@ LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libwww
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwww}
+BUILDLINK_PACKAGES+=	libwww
+
 .if !empty(LIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libwww
-BUILDLINK_DEPENDS.libwww+=		libwww>=5.3.2nb2
-BUILDLINK_PKGSRCDIR.libwww?=		../../www/libwww
+BUILDLINK_DEPENDS.libwww+=	libwww>=5.3.2nb2
+BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
-.endif # LIBWWW_BUILDLINK3_MK
+.endif	# LIBWWW_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index 620b6942e7b..aac132d836c 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mozilla-gtk2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_GTK2_BUILDLINK3_MK:=	${MOZILLA_GTK2_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	mozilla-gtk2
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmozilla-gtk2}
+BUILDLINK_PACKAGES+=	mozilla-gtk2
+
 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mozilla-gtk2
 BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.6nb1
 BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-.endif # MOZILLA_GTK2_BUILDLINK3_MK
+.endif	# MOZILLA_GTK2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla-stable/buildlink3.mk b/www/mozilla-stable/buildlink3.mk
index 5b98b88fb7b..0e5d285d06e 100644
--- a/www/mozilla-stable/buildlink3.mk
+++ b/www/mozilla-stable/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mozilla-stable.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_STABLE_BUILDLINK3_MK:=	${MOZILLA_STABLE_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	mozilla-stable
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmozilla-stable}
+BUILDLINK_PACKAGES+=	mozilla-stable
+
 .if !empty(MOZILLA_STABLE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mozilla-stable
 BUILDLINK_DEPENDS.mozilla-stable+=	mozilla-stable>=1.4.1nb2
 BUILDLINK_PKGSRCDIR.mozilla-stable?=	../../www/mozilla-stable
 
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.mozilla-stable?=	../../www/mozilla-stable
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
-.endif # MOZILLA_STABLE_BUILDLINK3_MK
+.endif	# MOZILLA_STABLE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index 65c8bf7531d..bbbe8efdcd8 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mozilla.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOZILLA_BUILDLINK3_MK:=	${MOZILLA_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ MOZILLA_BUILDLINK3_MK:=	${MOZILLA_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	mozilla
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmozilla}
+BUILDLINK_PACKAGES+=	mozilla
+
 .if !empty(MOZILLA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mozilla
-BUILDLINK_DEPENDS.mozilla+=		mozilla>=1.6
-BUILDLINK_PKGSRCDIR.mozilla?=		../../www/mozilla
+BUILDLINK_DEPENDS.mozilla+=	mozilla>=1.6
+BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.mozilla?=		../../www/mozilla
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
  
-.endif # MOZILLA_BUILDLINK3_MK
+.endif	# MOZILLA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk
index 3e7270f84f9..bddccc2c862 100644
--- a/www/tidy/buildlink3.mk
+++ b/www/tidy/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 01:13:57 minskim Exp $
-#
-# This Makefile fragment is included by packages that use tidy.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIDY_BUILDLINK3_MK:=	${TIDY_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ TIDY_BUILDLINK3_MK:=	${TIDY_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	tidy
 .endif
 
-.if !empty(TIDY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			tidy
-BUILDLINK_DEPENDS.tidy+=		tidy>=20031002
-BUILDLINK_PKGSRCDIR.tidy?=		../../www/tidy
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntidy}
+BUILDLINK_PACKAGES+=	tidy
 
-.endif # TIDY_BUILDLINK3_MK
+.if !empty(TIDY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tidy+=	tidy>=20031002
+BUILDLINK_PKGSRCDIR.tidy?=	../../www/tidy
+.endif	# TIDY_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}