Reorder location and setting of BUILDLINK_PACKAGES to match template

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

25 files changed, 193 insertions, 159 deletions

diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 795bb8de46c..24a032b0b80 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:35 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
@@ -9,19 +9,22 @@ GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc}
+BUILDLINK_PACKAGES+=	gcc
+
 .if !empty(GCC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		gcc
 BUILDLINK_DEPENDS.gcc+=		gcc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc
 BUILDLINK_LIBDIRS.gcc?=		\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc?=	build
-.  endif
+.endif
+
 .endif	# GCC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index cf84ea105eb..cdfbf09d26d 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3CXX_BUILDLINK3_MK:=	${GCC3CXX_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3CXX_BUILDLINK3_MK:=	${GCC3CXX_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc3cxx
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3cxx}
+BUILDLINK_PACKAGES+=	gcc3cxx
+
 .if !empty(GCC3CXX_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PACKAGES+=		gcc3cxx
 BUILDLINK_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3cxx?=	../../lang/gcc3-c++
 BUILDLINK_LIBDIRS.gcc3cxx?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3cxx+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3cxx?=	build
-.  endif
+.endif
+
 .endif	# GCC3CXX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 49b600bfd27..ac946757f5b 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/05 20:58:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
@@ -9,6 +9,9 @@ GCC3C_BUILDLINK3_MK:=	${GCC3C_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc3c
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3c}
+BUILDLINK_PACKAGES+=	gcc3c
+
 .if !empty(GCC3C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
@@ -16,21 +19,21 @@ BUILDLINK_DEPENDS+=	gcc3c
 # as GCC3_DEFAULT_SUBPREFIX.
 #
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PACKAGES+=		gcc3c
 BUILDLINK_DEPENDS.gcc3c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
 BUILDLINK_LIBDIRS.gcc3c?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3c+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3c?=	build
-.  endif
+.endif
+
 .endif	# GCC3C_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index d8f0e28b8f7..dce33460154 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3F77_BUILDLINK3_MK:=	${GCC3F77_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3F77_BUILDLINK3_MK:=	${GCC3F77_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc3f77
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3f77}
+BUILDLINK_PACKAGES+=	gcc3f77
+
 .if !empty(GCC3F77_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PACKAGES+=		gcc3f77
 BUILDLINK_DEPENDS.gcc3f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3f77?=	../../lang/gcc3-f77
 BUILDLINK_LIBDIRS.gcc3f77?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3f77}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3f77+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3f77?=	build
-.  endif
+.endif
+
 .endif	# GCC3F77_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index d09fdcf927b..43fa2995708 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3JAVA_BUILDLINK3_MK:=	${GCC3JAVA_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3JAVA_BUILDLINK3_MK:=	${GCC3JAVA_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc3java
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3java}
+BUILDLINK_PACKAGES+=	gcc3java
+
 .if !empty(GCC3JAVA_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PACKAGES+=		gcc3java
 BUILDLINK_DEPENDS.gcc3java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3java?=	../../lang/gcc3-java
 BUILDLINK_LIBDIRS.gcc3java?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3java}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3java+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3java?=	build
-.  endif
+.endif
+
 .endif	# GCC3JAVA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 5b0c6c7e9e3..ffa88c74cde 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3OBJC_BUILDLINK3_MK:=	${GCC3OBJC_BUILDLINK3_MK}+
@@ -9,25 +9,27 @@ GCC3OBJC_BUILDLINK3_MK:=	${GCC3OBJC_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	gcc3objc
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc3objc}
+BUILDLINK_PACKAGES+=	gcc3objc
+
 .if !empty(GCC3OBJC_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF=			_${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PACKAGES+=		gcc3objc
-BUILDLINK_DEPENDS+=		gcc3objc
 BUILDLINK_DEPENDS.gcc3objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3objc?=	../../lang/gcc3-objc
 BUILDLINK_LIBDIRS.gcc3objc?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3objc}\///}
 
 # Packages that link against shared libraries need a full dependency.
-.  if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
 BUILDLINK_DEPMETHOD.gcc3objc+=	full
-.  else
+.else
 BUILDLINK_DEPMETHOD.gcc3objc?=	build
-.  endif
+.endif
+
 .endif	# GCC3OBJC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index 8003677a4a7..0774a312cee 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:16:47 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use guile.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILE_BUILDLINK3_MK:=	${GUILE_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ GUILE_BUILDLINK3_MK:=	${GUILE_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	guile
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile}
+BUILDLINK_PACKAGES+=	guile
+
 .if !empty(GUILE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			guile
-BUILDLINK_DEPENDS.guile+=		guile>=1.6.3nb1
-BUILDLINK_PKGSRCDIR.guile?=		../../lang/guile
+BUILDLINK_DEPENDS.guile+=	guile>=1.6.3nb1
+BUILDLINK_PKGSRCDIR.guile?=	../../lang/guile
 
 .include "../../devel/libtool/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 
-.endif # GUILE_BUILDLINK3_MK
+.endif	# GUILE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index c06ec5a6f70..d941a7de213 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 02:18:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	libperl
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibperl}
+BUILDLINK_PACKAGES+=	libperl
+
 .if !empty(LIBPERL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		libperl
 BUILDLINK_DEPENDS.libperl+=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
 BUILDLINK_PKGSRCDIR.libperl?=	../../lang/libperl
 
 LIBPERL5_REQD?=		${_PERL5_REQD}
 
-.  include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+
 .endif	# LIBPERL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index 4ba8a012088..36263ed67e4 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/15 15:02:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBREP_BUILDLINK3_MK:=	${LIBREP_BUILDLINK3_MK}+
@@ -7,15 +7,18 @@ LIBREP_BUILDLINK3_MK:=	${LIBREP_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	librep
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrep}
+BUILDLINK_PACKAGES+=	librep
+
 .if !empty(LIBREP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		librep
 BUILDLINK_DEPENDS.librep+=	librep>=0.16.1nb1
 BUILDLINK_PKGSRCDIR.librep?=	../../lang/librep
 
 MAKE_FLAGS+=	rep_LIBTOOL=${LIBTOOL}
 
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../devel/gmp/buildlink3.mk"
-.endif # LIBREP_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+
+.endif	# LIBREP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index 69cbe64f24f..6bdfac44205 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/24 00:05:26 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LUA_BUILDLINK3_MK:=	${LUA_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LUA_BUILDLINK3_MK:=	${LUA_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	lua
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua}
+BUILDLINK_PACKAGES+=	lua
+
 .if !empty(LUA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			lua
-BUILDLINK_DEPENDS.lua+=			lua>=5.0
-BUILDLINK_PKGSRCDIR.lua?=		../../lang/lua
-.endif # LUA_BUILDLINK3_MK
+BUILDLINK_DEPENDS.lua+=		lua>=5.0
+BUILDLINK_PKGSRCDIR.lua?=	../../lang/lua
+.endif	# LUA_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 83aca3c06ef..d799856b414 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/14 20:39:38 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -8,14 +7,16 @@ MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	mono
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
+BUILDLINK_PACKAGES+=	mono
+
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mono
-BUILDLINK_DEPENDS.mono+=		mono>=0.30
-BUILDLINK_PKGSRCDIR.mono?=		../../lang/mono
+BUILDLINK_DEPENDS.mono+=	mono>=0.30
+BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 
-.endif # MONO_BUILDLINK3_MK
+.endif	# MONO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index af71a8ded04..cff602c181c 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	ocaml
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nocaml}
+BUILDLINK_PACKAGES+=	ocaml
+
 .if !empty(OCAML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		ocaml
 BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.06
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 BUILDLINK_DEPMETHOD.ocaml?=	build
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index a2849b4d4c7..8db263b5db4 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,29 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/10 02:18:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
 
-.if !empty(PERL5_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	perl
+.endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperl}
+BUILDLINK_PACKAGES+=	perl
+
+.if !empty(PERL5_BUILDLINK3_MK:M+)
 USE_PERL5?=	run
 PERL5_REQD+=	5.0
 
 BUILDLINK_DEPENDS.perl+=	perl>=${_PERL5_REQD}
 BUILDLINK_PKGSRCDIR.perl?=	${PERL5_PKGSRCDIR}
 
-.  if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
+.if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
 BUILDLINK_DEPMETHOD.perl?=	build
-.  endif
-.endif  # PERL5_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	perl
 .endif
 
-.if !empty(PERL5_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=	perl
-
 _PERL5_SITEVARS=							\
 	INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH			\
 	INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR				\
@@ -37,8 +36,8 @@ _PERL5_SITEVAR.INSTALLSITEMAN3DIR=	installsiteman3dir
 _PERL5_SITEVAR.SITELIBEXP=		sitelibexp
 _PERL5_SITEVAR.SITEARCHEXP=		sitearchexp
 
-.  if exists(${PERL5})
-.    if !defined(_PERL5_SITEPREFIX)
+.if exists(${PERL5})
+.  if !defined(_PERL5_SITEPREFIX)
 _PERL5_PREFIX!=		\
 	eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
 _PERL5_SITEPREFIX!=	\
@@ -46,13 +45,13 @@ _PERL5_SITEPREFIX!=	\
 MAKEFLAGS+=	_PERL5_PREFIX=${_PERL5_PREFIX:Q}
 MAKEFLAGS+=	_PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
 
-.      for _var_ in ${_PERL5_SITEVARS}
+.    for _var_ in ${_PERL5_SITEVARS}
 PERL5_SUB_${_var_}!=	\
 	eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`;	\
 	${ECHO} $${${_PERL5_SITEVAR.${_var_}}} |			\
 	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
 MAKEFLAGS+=	PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q}
-.      endfor
+.    endfor
 PERL5_SUB_INSTALLARCHLIB!=	\
 	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
 	${ECHO} $$installarchlib |					\
@@ -63,8 +62,8 @@ PERL5_SUB_INSTALLSCRIPT!=	\
 	${ECHO} $$installscript |					\
 	${SED} -e "s,^${_PERL5_PREFIX}/,,"
 MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
-.    endif
-.    if ${PKG_INSTALLATION_TYPE} == "overwrite"
+.  endif
+.  if ${PKG_INSTALLATION_TYPE} == "overwrite"
 #
 # Perl keeps headers and odd libraries in an odd path not caught by the
 # default BUILDLINK_FILES_CMD, so name them to be symlinked into
@@ -73,8 +72,9 @@ MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
 BUILDLINK_FILES.perl=							\
 	${PERL5_SUB_INSTALLARCHLIB}/CORE/*				\
 	${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
-.    endif
 .  endif
+.endif
+
 .endif  # PERL5_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index 39e8d5bc5ec..3429f06c0a5 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:37:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use pnet.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNET_BUILDLINK3_MK:=	${PNET_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ PNET_BUILDLINK3_MK:=	${PNET_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pnet
 .endif
 
-.if !empty(PNET_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pnet
-BUILDLINK_DEPENDS.pnet+=		pnet>=0.6.2
-BUILDLINK_PKGSRCDIR.pnet?=		../../lang/pnet
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnet}
+BUILDLINK_PACKAGES+=	pnet
 
-.endif # PNET_BUILDLINK3_MK
+.if !empty(PNET_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pnet+=	pnet>=0.6.2
+BUILDLINK_PKGSRCDIR.pnet?=	../../lang/pnet
+.endif	# PNET_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index 3d90817fd2c..1c82f6ae4c1 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:37:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use pnetC.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETC_BUILDLINK3_MK:=	${PNETC_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ PNETC_BUILDLINK3_MK:=	${PNETC_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pnetC
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpnetC}
+BUILDLINK_PACKAGES+=	pnetC
+
 .if !empty(PNETC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pnetC
-BUILDLINK_DEPENDS.pnetC+=		pnetC>=0.6.0
-BUILDLINK_PKGSRCDIR.pnetC?=		../../lang/pnetC
+BUILDLINK_DEPENDS.pnetC+=	pnetC>=0.6.0
+BUILDLINK_PKGSRCDIR.pnetC?=	../../lang/pnetC
 
 .include "../../lang/pnet/buildlink3.mk"
 
-.endif # PNETC_BUILDLINK3_MK
+.endif	# PNETC_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index 5e5ffc0b607..e455f8e5728 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:37:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use pnetlib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETLIB_BUILDLINK3_MK:=	${PNETLIB_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ PNETLIB_BUILDLINK3_MK:=	${PNETLIB_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	pnetlib
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnetlib}
+BUILDLINK_PACKAGES+=	pnetlib
+
 .if !empty(PNETLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pnetlib
-BUILDLINK_DEPENDS.pnetlib+=		pnetlib>=0.6.2
-BUILDLINK_PKGSRCDIR.pnetlib?=		../../lang/pnetlib
+BUILDLINK_DEPENDS.pnetlib+=	pnetlib>=0.6.2
+BUILDLINK_PKGSRCDIR.pnetlib?=	../../lang/pnetlib
 
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../lang/pnet/buildlink3.mk"
 
-.endif # PNETLIB_BUILDLINK3_MK
+.endif	# PNETLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python15/buildlink3.mk b/lang/python15/buildlink3.mk
index 1d79949cbba..c7b49fddf79 100644
--- a/lang/python15/buildlink3.mk
+++ b/lang/python15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON15_BUILDLINK3_MK:=	${PYTHON15_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON15_BUILDLINK3_MK:=	${PYTHON15_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python15
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython15}
+BUILDLINK_PACKAGES+=	python15
+
 .if !empty(PYTHON15_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		python15
 BUILDLINK_DEPENDS.python15+=	python15>=1.5
 BUILDLINK_PKGSRCDIR.python15?=	../../lang/python15
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python15?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
-BUILDLINK_INCDIRS.python15=	include/python1.5
-BUILDLINK_LIBDIRS.python15=	lib/python1.5/config
+BUILDLINK_INCDIRS.python15+=	include/python1.5
+BUILDLINK_LIBDIRS.python15+=	lib/python1.5/config
 BUILDLINK_TRANSFORM+=		l:python:python1.5
 
-.endif # PYTHON15_BUILDLINK3_MK
+.endif	# PYTHON15_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
index 809ea4a7b0f..ee74b722068 100644
--- a/lang/python20/buildlink3.mk
+++ b/lang/python20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON20_BUILDLINK3_MK:=	${PYTHON20_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON20_BUILDLINK3_MK:=	${PYTHON20_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python20
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython20}
+BUILDLINK_PACKAGES+=	python20
+
 .if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		python20
 BUILDLINK_DEPENDS.python20+=	python20>=2.0
 BUILDLINK_PKGSRCDIR.python20?=	../../lang/python20
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python20?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
 BUILDLINK_INCDIRS.python20+=	include/python2.0
 BUILDLINK_LIBDIRS.python20+=	lib/python2.0/config
 BUILDLINK_TRANSFORM+=		l:python:python2.0
 
-.endif # PYTHON20_BUILDLINK3_MK
+.endif	# PYTHON20_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21-pth/buildlink3.mk b/lang/python21-pth/buildlink3.mk
index f3802fbab31..0daeadc96e9 100644
--- a/lang/python21-pth/buildlink3.mk
+++ b/lang/python21-pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON21_PTH_BUILDLINK3_MK:=	${PYTHON21_PTH_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON21_PTH_BUILDLINK3_MK:=	${PYTHON21_PTH_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python21-pth
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython21-pth}
+BUILDLINK_PACKAGES+=	python21-pth
+
 .if !empty(PYTHON21_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python21-pth
 BUILDLINK_DEPENDS.python21-pth+=	python21-pth>=2.1.3nb2
 BUILDLINK_PKGSRCDIR.python21-pth?=	../../lang/python21-pth
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python21pth?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
 BUILDLINK_INCDIRS.python21-pth+=	include/python2p1
 BUILDLINK_LIBDIRS.python21-pth+=	lib/python2p1/config
 BUILDLINK_TRANSFORM+=			l:python:python2p1
 
-.endif # PYTHON21_PTH_BUILDLINK3_MK
+.endif	# PYTHON21_PTH_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index b617c2177cb..683bcbcc4d9 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON21_BUILDLINK3_MK:=	${PYTHON21_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON21_BUILDLINK3_MK:=	${PYTHON21_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python21
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython21}
+BUILDLINK_PACKAGES+=	python21
+
 .if !empty(PYTHON21_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		python21
 BUILDLINK_DEPENDS.python21+=	python21>=2.1
 BUILDLINK_PKGSRCDIR.python21?=	../../lang/python21
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python21?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
 BUILDLINK_INCDIRS.python21+=	include/python2.1
 BUILDLINK_LIBDIRS.python21+=	lib/python2.1/config
 BUILDLINK_TRANSFORM+=		l:python:python2.1
 
-.endif # PYTHON21_BUILDLINK3_MK
+.endif	# PYTHON21_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python22-pth/buildlink3.mk b/lang/python22-pth/buildlink3.mk
index a87e3a03185..26fa57ccba5 100644
--- a/lang/python22-pth/buildlink3.mk
+++ b/lang/python22-pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON22_PTH_BUILDLINK3_MK:=	${PYTHON22_PTH_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PYTHON22_PTH_BUILDLINK3_MK:=	${PYTHON22_PTH_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python22-pth
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython22-pth}
+BUILDLINK_PACKAGES+=	python22-pth
+
 .if !empty(PYTHON22_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python22-pth
 BUILDLINK_DEPENDS.python22-pth+=	python22-pth>=2.2.2nb1
 BUILDLINK_PKGSRCDIR.python22-pth?=	../../lang/python22-pth
 
@@ -20,6 +22,6 @@ BUILDLINK_INCDIRS.python22-pth+=	include/python2p2
 BUILDLINK_LIBDIRS.python22-pth+=	lib/python2p2/config
 BUILDLINK_TRANSFORM+=			l:python:python2p2
 
-.endif # PYTHON22_PTH_BUILDLINK3_MK
+.endif	# PYTHON22_PTH_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python22/buildlink3.mk b/lang/python22/buildlink3.mk
index f8ecda95e89..a8064b8d6ea 100644
--- a/lang/python22/buildlink3.mk
+++ b/lang/python22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON22_BUILDLINK3_MK:=	${PYTHON22_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON22_BUILDLINK3_MK:=	${PYTHON22_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python22
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython22}
+BUILDLINK_PACKAGES+=	python22
+
 .if !empty(PYTHON22_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		python22
 BUILDLINK_DEPENDS.python22+=	python22>=2.2
 BUILDLINK_PKGSRCDIR.python22?=	../../lang/python22
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python22?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
 BUILDLINK_INCDIRS.python22+=	include/python2.2
 BUILDLINK_LIBDIRS.python22+=	lib/python2.2/config
 BUILDLINK_TRANSFORM+=		l:python:python2.2
 
-.endif # PYTHON22_BUILDLINK3_MK
+.endif	# PYTHON22_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python23-pth/buildlink3.mk b/lang/python23-pth/buildlink3.mk
index 94bda11e581..2d780e343c5 100644
--- a/lang/python23-pth/buildlink3.mk
+++ b/lang/python23-pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_PTH_BUILDLINK3_MK:=	${PYTHON23_PTH_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON23_PTH_BUILDLINK3_MK:=	${PYTHON23_PTH_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python23-pth
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23-pth}
+BUILDLINK_PACKAGES+=	python23-pth
+
 .if !empty(PYTHON23_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			python23-pth
 BUILDLINK_DEPENDS.python23-pth+=	python23-pth>=2.3
 BUILDLINK_PKGSRCDIR.python23-pth?=	../../lang/python23-pth
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python23pth?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
 BUILDLINK_INCDIRS.python23-pth+=	include/python2p3
 BUILDLINK_LIBDIRS.python23-pth+=	lib/python2p3/config
 BUILDLINK_TRANSFORM+=			l:python:python2p3
 
-.endif # PYTHON23_PTH_BUILDLINK3_MK
+.endif	# PYTHON23_PTH_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index 9b6be27d6d5..300358e43da 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/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:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_BUILDLINK3_MK:=	${PYTHON23_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON23_BUILDLINK3_MK:=	${PYTHON23_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	python23
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23}
+BUILDLINK_PACKAGES+=	python23
+
 .if !empty(PYTHON23_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		python23
 BUILDLINK_DEPENDS.python23+=	python23>=2.3
 BUILDLINK_PKGSRCDIR.python23?=	../../lang/python23
 
-.  if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
 BUILDLINK_DEPMETHOD.python23?=	${BUILDLINK_DEPMETHOD.python}
-.  endif
+.endif
 
 BUILDLINK_INCDIRS.python23+=	include/python2.3
 BUILDLINK_LIBDIRS.python23+=	lib/python2.3/config
 BUILDLINK_TRANSFORM+=		l:python:python2.3
 
-.endif # PYTHON23_BUILDLINK3_MK
+.endif	# PYTHON23_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 71884a9bc43..b54abac7031 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:37 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
 BUILDLINK_DEPENDS+=	tcl
 .endif
 
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
+BUILDLINK_PACKAGES+=	tcl
+
 .if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		tcl
 BUILDLINK_DEPENDS.tcl+=		tcl>=8.3.4
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
 
@@ -20,6 +22,7 @@ BUILDLINK_FILES.tcl=	bin/tclsh*
 BUILDLINK_TRANSFORM+=	l:tcl:tcl83
 
 TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+
 .endif	# TCL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}