Move inclusion of bsd.buildlink.mk to start of file.

86 files changed, 258 insertions, 258 deletions

diff --git a/archivers/bzip2/buildlink.mk b/archivers/bzip2/buildlink.mk
index b98aa7e02ef..718560d9e01 100644
--- a/archivers/bzip2/buildlink.mk
+++ b/archivers/bzip2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:48 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that use bzip2.
 #
@@ -15,6 +15,8 @@
 .if !defined(BZIP2_BUILDLINK_MK)
 BZIP2_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.bzip2?=	bzip2>=1.0.1
 
 .include "../../mk/bsd.prefs.mk"
@@ -50,6 +52,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.bzip2}
 pre-configure: ${BUILDLINK_TARGETS.bzip2}
 bzip2-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# BZIP2_BUILDLINK_MK
diff --git a/archivers/liblzo/buildlink.mk b/archivers/liblzo/buildlink.mk
index 49fcdcd1364..a67f17413fd 100644
--- a/archivers/liblzo/buildlink.mk
+++ b/archivers/liblzo/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/23 19:46:22 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that use liblzo.
 #
@@ -15,6 +15,8 @@
 .if !defined(liblzo_BUILDLINK_MK)
 liblzo_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.liblzo?=	liblzo>=1.04
 DEPENDS+=	${BUILDLINK_DEPENDS.liblzo}:../../archivers/liblzo
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.liblzo}
 pre-configure: ${BUILDLINK_TARGETS.liblzo}
 liblzo-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# liblzo_BUILDLINK_MK
diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index 9ff9cb45750..2b92a4a15c8 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:09 jlam Exp $
 #
 # This Makefile fragment is included by packages that use esound.
 #
@@ -15,6 +15,8 @@
 .if !defined(ESOUND_BUILDLINK_MK)
 ESOUND_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
 DEPENDS+=			${BUILDLINK_DEPENDS.esound}:../../audio/esound
 
@@ -39,6 +41,4 @@ pre-configure: ${BUILDLINK_TARGETS.esound}
 esound-buildlink: _BUILDLINK_USE
 esound-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# ESOUND_BUILDLINK_MK
diff --git a/audio/gsm/buildlink.mk b/audio/gsm/buildlink.mk
index 33bf27d068c..58d211dc7f7 100644
--- a/audio/gsm/buildlink.mk
+++ b/audio/gsm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 09:30:51 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:09 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gsm.
 #
@@ -15,6 +15,8 @@
 .if !defined(GSM_BUILDLINK_MK)
 GSM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gsm?=	gsm>=1.0.10
 DEPENDS+=	${BUILDLINK_DEPENDS.gsm}:../../audio/gsm
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gsm}
 pre-configure: ${BUILDLINK_TARGETS.gsm}
 gsm-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GSM_BUILDLINK_MK
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index f85a27f6159..0dd29ce4251 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:09 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libaudiofile.
 #
@@ -15,6 +15,8 @@
 .if !defined(AUDIOFILE_BUILDLINK_MK)
 AUDIOFILE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.audiofile}:../../audio/libaudiofile
 
@@ -40,6 +42,4 @@ pre-configure: ${BUILDLINK_TARGETS.audiofile}
 audiofile-buildlink: _BUILDLINK_USE
 audiofile-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# AUDIOFILE_BUILDLINK_MK
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index d158c6a725e..b0a4d31a785 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmikmod.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBMIKMOD_BUILDLINK_MK)
 LIBMIKMOD_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libmikmod?=	libmikmod>=3.1.9
 DEPENDS+=	${BUILDLINK_DEPENDS.libmikmod}:../../audio/libmikmod
 
@@ -37,6 +39,4 @@ pre-configure: ${BUILDLINK_TARGETS.libmikmod}
 libmikmod-buildlink: _BUILDLINK_USE
 libmikmod-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBMIKMOD_BUILDLINK_MK
diff --git a/audio/libogg/buildlink.mk b/audio/libogg/buildlink.mk
index b7ae8aecefc..fdd9fad92f4 100644
--- a/audio/libogg/buildlink.mk
+++ b/audio/libogg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 13:06:21 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libogg.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIGOGG_BUILDLINK_MK)
 LIGOGG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libogg}:../../audio/libogg
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libogg}
 pre-configure: ${BUILDLINK_TARGETS.libogg}
 libogg-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIGOGG_BUILDLINK_MK
diff --git a/audio/libsidplay/buildlink.mk b/audio/libsidplay/buildlink.mk
index 2964e7275e8..e2aaf9f67ec 100644
--- a/audio/libsidplay/buildlink.mk
+++ b/audio/libsidplay/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 18:09:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libsidplay.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBSIDPLAY_BUILDLINK_MK)
 LIBSIDPLAY_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libsidplay?=	libsidplay>=1.36.38
 DEPENDS+=	${BUILDLINK_DEPENDS.libsidplay}:../../audio/libsidplay
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libsidplay}
 pre-configure: ${BUILDLINK_TARGETS.libsidplay}
 libsidplay-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBSIDPLAY_BUILDLINK_MK
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index 94e052653ab..40e884a7953 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 13:07:37 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libvorbis.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBVORBIS_BUILDLINK_MK)
 LIBVORBIS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libvorbis}:../../databases/libvorbis
 
@@ -32,6 +34,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libvorbis}
 pre-configure: ${BUILDLINK_TARGETS.libvorbis}
 libvorbis-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBVORBIS_BUILDLINK_MK
diff --git a/audio/nas/buildlink.mk b/audio/nas/buildlink.mk
index 5df10afa8e4..43726b391f7 100644
--- a/audio/nas/buildlink.mk
+++ b/audio/nas/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 03:07:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:11 jlam Exp $
 #
 # This Makefile fragment is included by packages that use nas.
 #
@@ -15,6 +15,8 @@
 .if !defined(NAS_BUILDLINK_MK)
 NAS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.nas?=	nas>=1.4
 DEPENDS+=	${BUILDLINK_DEPENDS.nas}:../../audio/nas
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.nas}
 pre-configure: ${BUILDLINK_TARGETS.nas}
 nas-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# NAS_BUILDLINK_MK
diff --git a/audio/rplay/buildlink.mk b/audio/rplay/buildlink.mk
index 308899c8d7f..93f9349da23 100644
--- a/audio/rplay/buildlink.mk
+++ b/audio/rplay/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 09:47:50 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:11 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rplay.
 #
@@ -15,6 +15,8 @@
 .if !defined(RPLAY_BUILDLINK_MK)
 RPLAY_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rplay?=	rplay>=3.3.2
 DEPENDS+=	${BUILDLINK_DEPENDS.rplay}:../../audio/rplay
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rplay}
 pre-configure: ${BUILDLINK_TARGETS.rplay}
 rplay-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RPLAY_BUILDLINK_MK
diff --git a/comms/jpilot/buildlink.mk b/comms/jpilot/buildlink.mk
index 980e1a6c953..8fe19747426 100644
--- a/comms/jpilot/buildlink.mk
+++ b/comms/jpilot/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:12 jlam Exp $
 #
 # This Makefile fragment is included by packages that use jpilot.
 #
@@ -15,6 +15,8 @@
 .if !defined(JPILOT_BUILDLINK_MK)
 JPILOT_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99
 BUILD_DEPENDS+=			${BUILDLINK_DEPENDS.jpilot}:../../comms/jpilot
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.jpilot}
 pre-configure: ${BUILDLINK_TARGETS.jpilot}
 jpilot-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# JPILOT_BUILDLINK_MK
diff --git a/comms/pilot-link-libs/buildlink.mk b/comms/pilot-link-libs/buildlink.mk
index 0849d3863ea..85305e7da9d 100644
--- a/comms/pilot-link-libs/buildlink.mk
+++ b/comms/pilot-link-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/27 18:28:05 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:12 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pilot-link-libs.
 #
@@ -15,6 +15,8 @@
 .if !defined(PILOT_LINK_LIBS_BUILDLINK_MK)
 PILOT_LINK_LIBS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.9.5
 DEPENDS+=	${BUILDLINK_DEPENDS.pilot-link-libs}:../../comms/pilot-link-libs
 
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+=			${BUILDLINK_TARGETS.pilot-link-libs}
 pre-configure: ${BUILDLINK_TARGETS.pilot-link-libs}
 pilot-link-libs-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PILOT_LINK_LIBS_BUILDLINK_MK
diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk
index e9df357329d..678e8369bb6 100644
--- a/converters/libiconv/buildlink.mk
+++ b/converters/libiconv/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:50 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:12 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libiconv.
 #
@@ -15,6 +15,8 @@
 .if !defined(ICONV_BUILDLINK_MK)
 ICONV_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.iconv?=	libiconv>=1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.iconv}
 pre-configure: ${BUILDLINK_TARGETS.iconv}
 iconv-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# ICONV_BUILDLINK_MK
diff --git a/databases/db/buildlink.mk b/databases/db/buildlink.mk
index 703ac4a3d1f..6e68788ce0e 100644
--- a/databases/db/buildlink.mk
+++ b/databases/db/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:50 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:13 jlam Exp $
 #
 # This Makefile fragment is included by packages that use db.
 #
@@ -15,6 +15,8 @@
 .if !defined(DB_BUILDLINK_MK)
 DB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.db?=	db>=2.7.3
 DEPENDS+=		${BUILDLINK_DEPENDS.db}:../../databases/db
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.db}
 pre-configure: ${BUILDLINK_TARGETS.db}
 db-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# DB_BUILDLINK_MK
diff --git a/databases/freetds/buildlink.mk b/databases/freetds/buildlink.mk
index 025a5141eb1..3bc8aa596ae 100644
--- a/databases/freetds/buildlink.mk
+++ b/databases/freetds/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:42:11 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:13 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetds.
 #
@@ -15,6 +15,8 @@
 .if !defined(FREETDS_BUILDLINK_MK)
 FREETDS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.freetds?=	freetds>=0.50
 DEPENDS+=	${BUILDLINK_DEPENDS.freetds}:../../databases/freetds
 
@@ -31,6 +33,4 @@ BUILDLINK_FIX_LIBTOOL_SED+=	-e "s|-L${BUILDLINK_DIR}/freetds/|-L${LOCALBASE}/fre
 pre-configure: ${BUILDLINK_TARGETS.freetds}
 freetds-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# FREETDS_BUILDLINK_MK
diff --git a/databases/gdbm/buildlink.mk b/databases/gdbm/buildlink.mk
index bd11d55b5c7..ed769852d28 100644
--- a/databases/gdbm/buildlink.mk
+++ b/databases/gdbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:51 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:13 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdbm.
 #
@@ -15,6 +15,8 @@
 .if !defined(GDBM_BUILDLINK_MK)
 GDBM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gdbm?=	gdbm>=1.7.3
 DEPENDS+=	${BUILDLINK_DEPENDS.gdbm}:../../databases/gdbm
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gdbm}
 pre-configure: ${BUILDLINK_TARGETS.gdbm}
 gdbm-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GDBM_BUILDLINK_MK
diff --git a/databases/postgresql-lib/buildlink.mk b/databases/postgresql-lib/buildlink.mk
index 2e736463e22..aee1f548bb8 100644
--- a/databases/postgresql-lib/buildlink.mk
+++ b/databases/postgresql-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:51 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:13 jlam Exp $
 #
 # This Makefile fragment is included by packages that use postgresql-lib.
 #
@@ -15,6 +15,8 @@
 .if !defined(POSTGRESQL_LIB_BUILDLINK_MK)
 POSTGRESQL_LIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-{6.5.3*,7.0*,lib-*}
 DEPENDS+=	${BUILDLINK_DEPENDS.postgresql-lib}:../../databases/postgresql-lib
 
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+=			${BUILDLINK_TARGETS.postgresql-lib}
 pre-configure: ${BUILDLINK_TARGETS.postgresql-lib}
 postgresql-lib-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# POSTGRESQL_LIB_BUILDLINK_MK
diff --git a/databases/tcl-postgresql/buildlink.mk b/databases/tcl-postgresql/buildlink.mk
index cb23f6b78b7..271c906d590 100644
--- a/databases/tcl-postgresql/buildlink.mk
+++ b/databases/tcl-postgresql/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tcl-postgresql.
 #
@@ -15,6 +15,8 @@
 .if !defined(TCL_POSTGRESQL_BUILDLINK_MK)
 TCL_POSTGRESQL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.tcl-postgresql?=	tcl-postgresql>=7.0
 DEPENDS+=	${BUILDLINK_DEPENDS.tcl-postgresql}:../../databases/tcl-postgresql
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=			${BUILDLINK_TARGETS.tcl-postgresql}
 pre-configure: ${BUILDLINK_TARGETS.tcl-postgresql}
 tcl-postgresql-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# TCL_POSTGRESQL_BUILDLINK_MK
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 4d8cde2f424..3ce0a91b2eb 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/28 21:41:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -15,6 +15,8 @@
 .if !defined(SDL_BUILDLINK_MK)
 SDL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.SDL?=	SDL>=1.2.0
 DEPENDS+=		${BUILDLINK_DEPENDS.SDL}:../../devel/SDL
 
@@ -49,6 +51,4 @@ pre-configure: ${BUILDLINK_TARGETS.SDL}
 SDL-buildlink: _BUILDLINK_USE
 SDL-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SDL_BUILDLINK_MK
diff --git a/devel/SDL_ttf/buildlink.mk b/devel/SDL_ttf/buildlink.mk
index eb97242ec3d..cd9ba6a5444 100644
--- a/devel/SDL_ttf/buildlink.mk
+++ b/devel/SDL_ttf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/26 21:42:52 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL_ttf.
 #
@@ -15,6 +15,8 @@
 .if !defined(SDL_ttf_BUILDLINK_MK)
 SDL_ttf_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.SDL_ttf?=	SDL_ttf>=2.0.3
 DEPENDS+=	${BUILDLINK_DEPENDS.SDL_ttf}:../../devel/SDL_ttf
 
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL_ttf}
 pre-configure: ${BUILDLINK_TARGETS.SDL_ttf}
 SDL_ttf-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SDL_ttf_BUILDLINK_MK
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 14fc8ad8d4a..9762ba6988e 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gettext.
 #
@@ -15,6 +15,8 @@
 .if !defined(GETTEXT_BUILDLINK_MK)
 GETTEXT_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gettext?=	gettext-lib>=0.10.35nb1
 
 .if defined(USE_GNU_GETTEXT)
@@ -55,6 +57,4 @@ LIBS+=			-lintl
 pre-configure: ${BUILDLINK_TARGETS.gettext}
 gettext-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GETTEXT_BUILDLINK_MK
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index e56efe5460f..1599e12b31d 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -15,6 +15,8 @@
 .if !defined(GLIB_BUILDLINK_MK)
 GLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.glib?=	glib>=1.2.8
 DEPENDS+=	${BUILDLINK_DEPENDS.glib}:../../devel/glib
 
@@ -42,6 +44,4 @@ pre-configure: ${BUILDLINK_TARGETS.glib}
 glib-buildlink: _BUILDLINK_USE
 glib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GLIB_BUILDLINK_MK
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index 21d38e3c4c1..c71fd421bfe 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
@@ -15,6 +15,8 @@
 .if !defined(GMP_BUILDLINK_MK)
 GMP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gmp?=	gmp>=3.0
 DEPENDS+=		${BUILDLINK_DEPENDS.gmp}:../../devel/gmp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gmp}
 pre-configure: ${BUILDLINK_TARGETS.gmp}
 gmp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GMP_BUILDLINK_MK
diff --git a/devel/libdockapp/buildlink.mk b/devel/libdockapp/buildlink.mk
index 6d5ceb4d8f9..a273b80e2f1 100644
--- a/devel/libdockapp/buildlink.mk
+++ b/devel/libdockapp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 21:16:40 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libdockapp.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBDOCKAPP_BUILDLINK_MK)
 LIBDOCKAPP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libdockapp?=	libdockapp>=0.4.0
 DEPENDS+=	${BUILDLINK_DEPENDS.libdockapp}:../../devel/libdockapp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libdockapp}
 pre-configure: ${BUILDLINK_TARGETS.libdockapp}
 libdockapp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBDOCKAPP_BUILDLINK_MK
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index c4f466a75ad..130b94c320a 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/07/01 22:59:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use getopt_long().
 #
@@ -14,6 +14,8 @@
 .if !defined(GETOPT_BUILDLINK_MK)
 GETOPT_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.getopt?=	libgetopt>=1.3
 
 .if exists(/usr/include/getopt.h)
@@ -37,6 +39,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.getopt}
 pre-configure: ${BUILDLINK_TARGETS.getopt}
 getopt-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GETOPT_BUILDLINK_MK
diff --git a/devel/libproplist/buildlink.mk b/devel/libproplist/buildlink.mk
index 3192d6c897e..593f2db59db 100644
--- a/devel/libproplist/buildlink.mk
+++ b/devel/libproplist/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/29 16:10:46 nra Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libproplist.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBPROPLIST_BUILDLINK_MK)
 LIBPROPLIST_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libproplist?=	libproplist>=0.10.1
 DEPENDS+=	${BUILDLINK_DEPENDS.libproplist}:../../devel/libproplist
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libproplist}
 pre-configure: ${BUILDLINK_TARGETS.libproplist}
 libproplist-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBPROPLIST_BUILDLINK_MK
diff --git a/devel/libslang/buildlink.mk b/devel/libslang/buildlink.mk
index e1d8b7f0836..0f4cb1f61d0 100644
--- a/devel/libslang/buildlink.mk
+++ b/devel/libslang/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 14:26:03 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libslang.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBSLANG_BUILDLINK_MK)
 LIBSLANG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libslang?=	libslang>=1.4.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libslang}:../../devel/libslang
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libslang}
 pre-configure: ${BUILDLINK_TARGETS.libslang}
 libslang-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBSLANG_BUILDLINK_MK
diff --git a/devel/libtool/buildlink.mk b/devel/libtool/buildlink.mk
index f9f61a408a3..18abf44a730 100644
--- a/devel/libtool/buildlink.mk
+++ b/devel/libtool/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ltdl.
 #
@@ -13,6 +13,8 @@
 .if !defined(LTDL_BUILDLINK_MK)
 LTDL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ltdl?=	libtool>=${LIBTOOL_REQD}
 DEPENDS+=	${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool
 
@@ -26,6 +28,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.ltdl}
 pre-configure: ${BUILDLINK_TARGETS.ltdl}
 ltdl-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LTDL_BUILDLINK_MK
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 0bae73af493..93ba7f49fc5 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lwp.
 #
@@ -15,6 +15,8 @@
 .if !defined(LWP_BUILDLINK_MK)
 LWP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.lwp?=	lwp>=1.6
 DEPENDS+=		${BUILDLINK_DEPENDS.lwp}:../../devel/lwp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.lwp}
 pre-configure: ${BUILDLINK_TARGETS.lwp}
 lwp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LWP_BUILDLINK_MK
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index 1af1556b096..62c2f9df02f 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 21:10:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ncurses.
 #
@@ -12,6 +12,8 @@
 # (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ncurses?=	ncurses>=5.0
 
 .if defined(USE_NCURSES)
@@ -88,5 +90,3 @@ ncurses-extra-includes-buildlink:
 	for file in $${extra_includes}; do				\
 		${TOUCH} ${TOUCH_FLAGS} $${BUILDLINK_DIR}/$${file};	\
 	done
-
-.include "../../mk/bsd.buildlink.mk"
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 130f1d17135..9f660fcfd99 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/27 03:46:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -15,6 +15,8 @@
 .if !defined(PCRE_BUILDLINK_MK)
 PCRE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.pcre?=	pcre>=3.4
 DEPENDS+=	${BUILDLINK_DEPENDS.pcre}:../../devel/pcre
 
@@ -39,6 +41,4 @@ pre-configure: ${BUILDLINK_TARGETS.pcre}
 pcre-buildlink: _BUILDLINK_USE
 pcre-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PCRE_BUILDLINK_MK
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 33174d125f5..980415f824d 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
@@ -15,6 +15,8 @@
 .if !defined(PTH_BUILDLINK_MK)
 PTH_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.pth?=	pth>=1.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.pth}:../../devel/pth
 
@@ -40,6 +42,4 @@ pth-buildlink: _BUILDLINK_USE
 pth-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 pth-pthread-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PTH_BUILDLINK_MK
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index 5c473266630..3617897ca7d 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.12 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.13 2001/07/01 22:59:18 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
@@ -18,6 +18,8 @@
 .if !defined(READLINE_BUILDLINK_MK)
 READLINE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.readline?=	readline>=2.2
 
 .if defined(USE_GNU_READLINE)
@@ -71,6 +73,4 @@ pre-configure: ${BUILDLINK_TARGETS.readline}
 readline-buildlink: _BUILDLINK_USE
 history-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# READLINE_BUILDLINK_MK
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index ad513f59b73..4293e6d719e 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpc2.
 #
@@ -15,6 +15,8 @@
 .if !defined(RPC2_BUILDLINK_MK)
 RPC2_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rpc2?=	rpc2>=1.10
 DEPENDS+=			${BUILDLINK_DEPENDS.rpc2}:../../devel/rpc2
 
@@ -32,6 +34,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.rpc2}
 pre-configure: ${BUILDLINK_TARGETS.rpc2}
 rpc2-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RPC2_BUILDLINK_MK
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 2d08c6c3dbc..91a73d6535d 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
@@ -15,6 +15,8 @@
 .if !defined(RVM_BUILDLINK_MK)
 RVM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rvm?=	rvm>=1.3
 DEPENDS+=		${BUILDLINK_DEPENDS.rvm}:../../devel/rvm
 
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rvm}
 pre-configure: ${BUILDLINK_TARGETS.rvm}
 rvm-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RVM_BUILDLINK_MK
diff --git a/devel/rx/buildlink.mk b/devel/rx/buildlink.mk
index 555af0c379c..dc36d506c15 100644
--- a/devel/rx/buildlink.mk
+++ b/devel/rx/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 09:28:15 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rx.
 #
@@ -15,6 +15,8 @@
 .if !defined(RX_BUILDLINK_MK)
 RX_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rx?=	rx>=1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.rx}:../../devel/rx
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rx}
 pre-configure: ${BUILDLINK_TARGETS.rx}
 rx-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RX_BUILDLINK_MK
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index a86e80d7507..307e10d60b4 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/28 22:03:41 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:20 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -15,6 +15,8 @@
 .if !defined(SMPEG_BUILDLINK_MK)
 SMPEG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.smpeg?=	smpeg>=0.4.3
 DEPENDS+=	${BUILDLINK_DEPENDS.smpeg}:../../devel/smpeg
 
@@ -40,6 +42,4 @@ pre-configure: ${BUILDLINK_TARGETS.smpeg}
 smpeg-buildlink: _BUILDLINK_USE
 smpeg-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SMPEG_BUILDLINK_MK
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index 6dadc4a7cfd..61786b89818 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:20 jlam Exp $
 #
 # This Makefile fragment is included by packages that use zlib. 
 #
@@ -15,6 +15,8 @@
 .if !defined(ZLIB_BUILDLINK_MK)
 ZLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.zlib?=	zlib>=1.1.3
 
 .if exists(/usr/include/zlib.h)
@@ -40,6 +42,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.zlib}
 pre-configure: ${BUILDLINK_TARGETS.zlib}
 zlib-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# ZLIB_BUILDLINK_MK
diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk
index 4d5cb34be71..7f137fdcdbe 100644
--- a/graphics/ImageMagick/buildlink.mk
+++ b/graphics/ImageMagick/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/23 19:24:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ImageMagick.
 #
@@ -15,6 +15,8 @@
 .if !defined(IMAGEMAGICK_BUILDLINK_MK)
 IMAGEMAGICK_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ImageMagick?=	ImageMagick>=5.2.8
 DEPENDS+=	${BUILDLINK_DEPENDS.ImageMagick}:../../graphics/ImageMagick
 
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ImageMagick}
 pre-configure: ${BUILDLINK_TARGETS.ImageMagick}
 ImageMagick-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# IMAGEMAGICK_BUILDLINK_MK
diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk
index a4925f5baa0..87301b46245 100644
--- a/graphics/Mesa/buildlink.mk
+++ b/graphics/Mesa/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/17 17:45:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Mesa.
 #
@@ -13,6 +13,8 @@
 .if !defined(MESA_BUILDLINK_MK)
 MESA_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 USE_MESA=		# defined
 
 # We double-list because we're not sure if the files are in ${X11BASE}
@@ -40,6 +42,4 @@ pre-configure: ${BUILDLINK_TARGETS.Mesa}
 Mesa-x11base-buildlink: _BUILDLINK_USE
 Mesa-localbase-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# MESA_BUILDLINK_MK
diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk
index 3684d6b05ae..d162342cb3f 100644
--- a/graphics/avifile/buildlink.mk
+++ b/graphics/avifile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 09:56:28 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile.
 #
@@ -15,6 +15,8 @@
 .if !defined(AVIFILE_BUILDLINK_MK)
 AVIFILE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.avifile?=	avifile>=0.53.5
 DEPENDS+=	${BUILDLINK_DEPENDS.avifile}:../../graphics/avifile
 
@@ -38,6 +40,4 @@ pre-configure: ${BUILDLINK_TARGETS.avifile}
 avifile-buildlink: _BUILDLINK_USE
 avifile-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# AVIFILE_BUILDLINK_MK
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index 1fbf37bbbc1..97e13d8f26b 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 11:26:32 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
@@ -15,6 +15,8 @@
 .if !defined(CLANLIB_BUILDLINK_MK)
 CLANLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ClanLib?=	ClanLib>=0.4.4
 DEPENDS+=	${BUILDLINK_DEPENDS.ClanLib}:../../graphics/clanlib
 
@@ -52,6 +54,4 @@ pre-configure: ${BUILDLINK_TARGETS.ClanLib}
 ClanLib-buildlink: _BUILDLINK_USE
 ClanLib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# CLANLIB_BUILDLINK_MK
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index 49990046fc1..05673b386bb 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype.
 #
@@ -15,6 +15,8 @@
 .if !defined(FREETYPE_BUILDLINK_MK)
 FREETYPE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1
 DEPENDS+=	${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.freetype}
 pre-configure: ${BUILDLINK_TARGETS.freetype}
 freetype-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# FREETYPE_BUILDLINK_MK
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index 881b71f9cd2..43fd6775a2b 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/26 22:02:26 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype2.
 #
@@ -15,6 +15,8 @@
 .if !defined(FREETYPE2_BUILDLINK_MK)
 FREETYPE2_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.0.3
 DEPENDS+=	${BUILDLINK_DEPENDS.freetype2}:../../graphics/freetype2
 
@@ -43,6 +45,4 @@ pre-configure: ${BUILDLINK_TARGETS.freetype2}
 freetype2-buildlink: _BUILDLINK_USE
 freetype2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# FREETYPE2_BUILDLINK_MK
diff --git a/graphics/gd/buildlink.mk b/graphics/gd/buildlink.mk
index 42dac59df63..463d2ef1610 100644
--- a/graphics/gd/buildlink.mk
+++ b/graphics/gd/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 22:48:24 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gd.
 #
@@ -15,6 +15,8 @@
 .if !defined(GD_BUILDLINK_MK)
 GD_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gd?=	gd>=1.8.3
 DEPENDS+=	${BUILDLINK_DEPENDS.gd}:../../graphics/gd
 
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gd}
 pre-configure: ${BUILDLINK_TARGETS.gd}
 gd-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GD_BUILDLINK_MK
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 24d307c53db..14b93d668ed 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:23 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf.
 #
@@ -15,6 +15,8 @@
 .if !defined(GDK_PIXBUF_BUILDLINK_MK)
 GDK_PIXBUF_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gkd-pixbuf?=	gdk-pixbuf>=0.8.0nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gkd-pixbuf}:../../graphics/gdk-pixbuf
 
@@ -42,6 +44,4 @@ pre-configure: ${BUILDLINK_TARGETS.gdk-pixbuf}
 gdk-pixbuf-buildlink: _BUILDLINK_USE
 gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GDK_PIXBUF_BUILDLINK_MK
diff --git a/graphics/hermes/buildlink.mk b/graphics/hermes/buildlink.mk
index 3a76eb05bc4..810f7a759d9 100644
--- a/graphics/hermes/buildlink.mk
+++ b/graphics/hermes/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 11:09:50 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:23 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Hermes.
 #
@@ -15,6 +15,8 @@
 .if !defined(HERMES_BUILDLINK_MK)
 HERMES_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.Hermes?=	Hermes>=1.3.2
 DEPENDS+=	${BUILDLINK_DEPENDS.Hermes}:../../graphics/hermes
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.Hermes}
 pre-configure: ${BUILDLINK_TARGETS.Hermes}
 Hermes-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# HERMES_BUILDLINK_MK
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index 165ce4fabfe..33d0ae7932a 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:23 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imlib.
 #
@@ -15,6 +15,8 @@
 .if !defined(IMLIB_BUILDLINK_MK)
 IMLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.8
 DEPENDS+=	${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib
 
@@ -50,6 +52,4 @@ pre-configure: ${BUILDLINK_TARGETS.imlib}
 imlib-buildlink: _BUILDLINK_USE
 imlib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# IMLIB_BUILDLINK_MK
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index c8d59f0f976..af77b33aff6 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:24 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libjpeg.
 #
@@ -15,6 +15,8 @@
 .if !defined(JPEG_BUILDLINK_MK)
 JPEG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.jpeg?=	jpeg-6b
 DEPENDS+=	${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg
 
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.jpeg}
 pre-configure: ${BUILDLINK_TARGETS.jpeg}
 jpeg-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# JPEG_BUILDLINK_MK
diff --git a/graphics/lcms/buildlink.mk b/graphics/lcms/buildlink.mk
index 01e06f60be8..36e41d8f710 100644
--- a/graphics/lcms/buildlink.mk
+++ b/graphics/lcms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lcms.
 #
@@ -15,6 +15,8 @@
 .if !defined(LCMS_BUILDLINK_MK)
 LCMS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.lcms?=	lcms>=1.06
 DEPENDS+=	${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.lcms}
 pre-configure: ${BUILDLINK_TARGETS.lcms}
 lcms-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LCMS_BUILDLINK_MK
diff --git a/graphics/libungif/buildlink.mk b/graphics/libungif/buildlink.mk
index 6f2b9e011dd..ef6ac61d77e 100644
--- a/graphics/libungif/buildlink.mk
+++ b/graphics/libungif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libungif.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBUNGIF_BUILDLINK_MK)
 LIBUNGIF_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
 DEPENDS+=	${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libungif}
 pre-configure: ${BUILDLINK_TARGETS.libungif}
 libungif-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBUNGIF_BUILDLINK_MK
diff --git a/graphics/mng/buildlink.mk b/graphics/mng/buildlink.mk
index ba0dd7b3488..402aa494259 100644
--- a/graphics/mng/buildlink.mk
+++ b/graphics/mng/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:24 jlam Exp $
 #
 # This Makefile fragment is included by packages that use mng.
 #
@@ -15,6 +15,8 @@
 .if !defined(MNG_BUILDLINK_MK)
 MNG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.mng?=	mng>=1.0.0
 DEPENDS+=		${BUILDLINK_DEPENDS.mng}:../../graphics/mng
 
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.mng}
 pre-configure: ${BUILDLINK_TARGETS.mng}
 mng-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# MNG_BUILDLINK_MK
diff --git a/graphics/mpeg-lib/buildlink.mk b/graphics/mpeg-lib/buildlink.mk
index c94c2ba9460..fca2829635f 100644
--- a/graphics/mpeg-lib/buildlink.mk
+++ b/graphics/mpeg-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 22:25:06 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:25 jlam Exp $
 #
 # This Makefile fragment is included by packages that use mpeg.
 #
@@ -15,6 +15,8 @@
 .if !defined(MPEG_BUILDLINK_MK)
 MPEG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.mpeg?=	mpeg>=1.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.mpeg}:../../graphics/mpeg-lib
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.mpeg}
 pre-configure: ${BUILDLINK_TARGETS.mpeg}
 mpeg-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# MPEG_BUILDLINK_MK
diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk
index 27de7b8f594..07c0ffcfc1b 100644
--- a/graphics/netpbm/buildlink.mk
+++ b/graphics/netpbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:25 jlam Exp $
 #
 # This Makefile fragment is included by packages that use netpbm.
 #
@@ -15,6 +15,8 @@
 .if !defined(NETPBM_BUILDLINK_MK)
 NETPBM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.netpbm?=	netpbm>=9.7
 DEPENDS+=	${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
 
@@ -37,6 +39,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.netpbm}
 pre-configure: ${BUILDLINK_TARGETS.netpbm}
 netpbm-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# NETPBM_BUILDLINK_MK
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index 266fff55ecb..2e41ea229f0 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:25 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
@@ -15,6 +15,8 @@
 .if !defined(PNG_BUILDLINK_MK)
 PNG_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.png?=	png>=1.0.11
 DEPENDS+=		${BUILDLINK_DEPENDS.png}:../../graphics/png
 
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.png}
 pre-configure: ${BUILDLINK_TARGETS.png}
 png-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PNG_BUILDLINK_MK
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index 27c7a916105..99040097329 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:26 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -15,6 +15,8 @@
 .if !defined(TIFF_BUILDLINK_MK)
 TIFF_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.tiff?=	tiff>=3.5.4
 DEPENDS+=	${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff
 
@@ -33,6 +35,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.tiff}
 pre-configure: ${BUILDLINK_TARGETS.tiff}
 tiff-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# TIFF_BUILDLINK_MK
diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk
index 7c77b93a3b1..d5653d7272d 100644
--- a/graphics/xpm/buildlink.mk
+++ b/graphics/xpm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/17 17:54:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:26 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xpm.
 #
@@ -13,6 +13,8 @@
 .if !defined(XPM_BUILDLINK_MK)
 XPM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 USE_XPM=		# defined
 
 # We double-list because we're not sure if the files are in ${X11BASE}
@@ -38,6 +40,4 @@ pre-configure: ${BUILDLINK_TARGETS.xpm}
 xpm-x11base-buildlink: _BUILDLINK_USE
 xpm-localbase-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# XPM_BUILDLINK_MK
diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk
index 522e7c34cba..9a800052e5b 100644
--- a/japanese/vflib-lib/buildlink.mk
+++ b/japanese/vflib-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:26 jlam Exp $
 #
 # This Makefile fragment is included by packages that use VFlib.
 #
@@ -15,6 +15,8 @@
 .if !defined(VFLIB_BUILDLINK_MK)
 VFLIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.vflib?=	ja-vflib-lib>=2.24.2
 DEPENDS+=	${BUILDLINK_DEPENDS.vflib}:../../japanese/vflib-lib
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.vflib}
 pre-configure: ${BUILDLINK_TARGETS.vflib}
 vflib-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# VFLIB_BUILDLINK_MK
diff --git a/lang/tcl/buildlink.mk b/lang/tcl/buildlink.mk
index e162bf06de1..60b8cefd528 100644
--- a/lang/tcl/buildlink.mk
+++ b/lang/tcl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:26 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tcl.
 #
@@ -15,6 +15,8 @@
 .if !defined(TCL_BUILDLINK_MK)
 TCL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.tcl?=	tcl>=8.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.tcl}:../../lang/tcl
 
@@ -45,6 +47,4 @@ tclConfig-buildlink:
 		${TOUCH} ${TOUCH_FLAGS} $${cookie};			\
 	fi
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# TCL_BUILDLINK_MK
diff --git a/mail/imap-uw/buildlink.mk b/mail/imap-uw/buildlink.mk
index d9fd416d1d6..bee689e4f09 100644
--- a/mail/imap-uw/buildlink.mk
+++ b/mail/imap-uw/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imap-uw.
 #
@@ -15,6 +15,8 @@
 .if !defined(IMAP_UW_BUILDLINK_MK)
 IMAP_UW_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.imap-uw?=	imap-uw>=2000.0.3nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.imap-uw}:../../mail/imap-uw
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.imap-uw}
 pre-configure: ${BUILDLINK_TARGETS.imap-uw}
 imap-uw-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# IMAP_UW_BUILDLINK_MK
diff --git a/misc/rpm/buildlink.mk b/misc/rpm/buildlink.mk
index 4b3a82f5a00..56c9cdb676d 100644
--- a/misc/rpm/buildlink.mk
+++ b/misc/rpm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpm.
 #
@@ -15,6 +15,8 @@
 .if !defined(RPM_BUILDLINK_MK)
 RPM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 # This adds a build-dependency as rpm only has a static library.
 BUILDLINK_DEPENDS.rpm?=	rpm>=2.4.3
 BUILD_DEPENDS+=		${BUILDLINK_DEPENDS.rpm}:../../misc/rpm
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rpm}
 pre-configure: ${BUILDLINK_TARGETS.rpm}
 rpm-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RPM_BUILDLINK_MK
diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk
index 508d6b90991..41576d23aeb 100644
--- a/net/ORBit/buildlink.mk
+++ b/net/ORBit/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:59 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ORBit.
 #
@@ -15,6 +15,8 @@
 .if !defined(ORBIT_BUILDLINK_MK)
 ORBIT_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.ORBit?=	ORBit>=0.5.1
 DEPENDS+=	${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit
 
@@ -59,6 +61,4 @@ ORBit-buildlink: _BUILDLINK_USE
 libIDL-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 orbit-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# ORBIT_BUILDLINK_MK
diff --git a/net/socks4/buildlink.mk b/net/socks4/buildlink.mk
index 809a465b142..8a0c161dc4b 100644
--- a/net/socks4/buildlink.mk
+++ b/net/socks4/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/28 20:32:02 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use socks4.
 #
@@ -15,6 +15,8 @@
 .if !defined(SOCKS4_BUILDLINK_MK)
 SOCKS4_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.socks4?=	socks4>=2.2
 DEPENDS+=	${BUILDLINK_DEPENDS.socks4}:../../net/socks4
 
@@ -27,6 +29,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.socks4}
 pre-configure: ${BUILDLINK_TARGETS.socks4}
 socks4-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SOCKS4_BUILDLINK_MK
diff --git a/net/socks5/buildlink.mk b/net/socks5/buildlink.mk
index 580b28d8e20..147571f1da4 100644
--- a/net/socks5/buildlink.mk
+++ b/net/socks5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/28 20:31:26 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:28 jlam Exp $
 #
 # This Makefile fragment is included by packages that use socks5.
 #
@@ -15,6 +15,8 @@
 .if !defined(SOCKS5_BUILDLINK_MK)
 SOCKS5_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
 DEPENDS+=	${BUILDLINK_DEPENDS.socks5}:../../net/socks5
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.socks5}
 pre-configure: ${BUILDLINK_TARGETS.socks5}
 socks5-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# SOCKS5_BUILDLINK_MK
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk
index 8311126d6c7..c32c86f1365 100644
--- a/print/cups/buildlink.mk
+++ b/print/cups/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:59 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:28 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libcups.
 #
@@ -15,6 +15,8 @@
 .if !defined(CUPS_BUILDLINK_MK)
 CUPS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.cups?=	cups>=1.1.1
 DEPENDS+=	${BUILDLINK_DEPENDS.cups}:../../print/cups
 
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.cups}
 pre-configure: ${BUILDLINK_TARGETS.cups}
 cups-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# CUPS_BUILDLINK_MK
diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk
index a59b8503c54..e0690111562 100644
--- a/security/PAM/buildlink.mk
+++ b/security/PAM/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/06/23 19:26:59 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:28 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpam.
 #
@@ -15,6 +15,8 @@
 .if !defined(PAM_BUILDLINK_MK)
 PAM_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.pam?=	PAM>=0.72
 DEPENDS+=		${BUILDLINK_DEPENDS.pam}:../../security/PAM
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.pam}
 pre-configure: ${BUILDLINK_TARGETS.pam}
 pam-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# PAM_BUILDLINK_MK
diff --git a/security/libcrack/buildlink.mk b/security/libcrack/buildlink.mk
index 6f3fe1310f3..a557bddd1b9 100644
--- a/security/libcrack/buildlink.mk
+++ b/security/libcrack/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:28 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libcrack.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBCRACK_BUILDLINK_MK)
 LIBCRACK_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
 DEPENDS+=	${BUILDLINK_DEPENDS.libcrack}:../../security/libcrack
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libcrack}
 pre-configure: ${BUILDLINK_TARGETS.libcrack}
 libcrack-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBCRACK_BUILDLINK_MK
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk
index 45821b66e9e..da97f7f0547 100644
--- a/security/openssl/buildlink.mk
+++ b/security/openssl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/28 21:22:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:29 jlam Exp $
 #
 # This Makefile fragment is included by packages that use OpenSSL.
 #
@@ -14,6 +14,8 @@
 .if !defined(OPENSSL_BUILDLINK_MK)
 OPENSSL_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.openssl?=	openssl-0.9.[56]*
 
 # Check for a usable installed version of OpenSSL.  Version must be greater
@@ -63,6 +65,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.openssl}
 pre-configure: ${BUILDLINK_TARGETS.openssl}
 openssl-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# OPENSSL_BUILDLINK_MK
diff --git a/security/rsaref/buildlink.mk b/security/rsaref/buildlink.mk
index d4f1c3f860f..ef79d4321b9 100644
--- a/security/rsaref/buildlink.mk
+++ b/security/rsaref/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 09:17:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:29 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rsaref.
 #
@@ -15,6 +15,8 @@
 .if !defined(RSAREF_BUILDLINK_MK)
 RSAREF_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
 DEPENDS+=	${BUILDLINK_DEPENDS.rsaref}:../../security/rsaref
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rsaref}
 pre-configure: ${BUILDLINK_TARGETS.rsaref}
 rsaref-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# RSAREF_BUILDLINK_MK
diff --git a/security/tcp_wrappers/buildlink.mk b/security/tcp_wrappers/buildlink.mk
index 02229e6c4c8..24aabc8fcb6 100644
--- a/security/tcp_wrappers/buildlink.mk
+++ b/security/tcp_wrappers/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:29 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tcp_wrappers.
 #
@@ -15,6 +15,8 @@
 .if !defined(TCP_WRAPPERS_BUILDLINK_MK)
 TCP_WRAPPERS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.tcp_wrappers?=	tcp_wrappers>=7.6.1nb1
 
 .if exists(/usr/include/tcpd.h)
@@ -39,6 +41,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.tcp_wrappers}
 pre-configure: ${BUILDLINK_TARGETS.tcp_wrappers}
 tcp_wrappers-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# TCP_WRAPPERS_BUILDLINK_MK
diff --git a/textproc/jade/buildlink.mk b/textproc/jade/buildlink.mk
index 20072eac925..edff4e8b65a 100644
--- a/textproc/jade/buildlink.mk
+++ b/textproc/jade/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/25 03:48:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use jade.
 #
@@ -15,6 +15,8 @@
 .if !defined(JADE_BUILDLINK_MK)
 JADE_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.jade?=	jade>=1.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.jade}:../../textproc/jade
 
@@ -33,6 +35,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.jade}
 pre-configure: ${BUILDLINK_TARGETS.jade}
 jade-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# JADE_BUILDLINK_MK
diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk
index 5ac01cf7f5b..dcac136782e 100644
--- a/textproc/libxml/buildlink.mk
+++ b/textproc/libxml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:00 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBXML_BUILDLINK_MK)
 LIBXML_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libxml?=	libxml>=1.8.11
 DEPENDS+=	${BUILDLINK_DEPENDS.libxml}:../../textproc/libxml
 
@@ -40,6 +42,4 @@ pre-configure: ${BUILDLINK_TARGETS.libxml}
 libxml-buildlink: _BUILDLINK_USE
 libxml-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBXML_BUILDLINK_MK
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index 6dfa475e69a..dbc2a531ba1 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBXML2_BUILDLINK_MK)
 LIBXML2_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.3.12
 DEPENDS+=	${BUILDLINK_DEPENDS.libxml2}:../../textproc/libxml2
 
@@ -41,6 +43,4 @@ pre-configure: ${BUILDLINK_TARGETS.libxml2}
 libxml2-buildlink: _BUILDLINK_USE
 libxml2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBXML2_BUILDLINK_MK
diff --git a/textproc/t1lib/buildlink.mk b/textproc/t1lib/buildlink.mk
index a0cbd10a198..e086dfb9d52 100644
--- a/textproc/t1lib/buildlink.mk
+++ b/textproc/t1lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 19:47:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use t1lib.
 #
@@ -15,6 +15,8 @@
 .if !defined(T1LIB_BUILDLINK_MK)
 T1LIB_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.t1lib?=	t1lib>=1.0.1
 DEPENDS+=	${BUILDLINK_DEPENDS.t1lib}:../../textproc/t1lib
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.t1lib}
 pre-configure: ${BUILDLINK_TARGETS.t1lib}
 t1lib-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# T1LIB_BUILDLINK_MK
diff --git a/www/libghttp/buildlink.mk b/www/libghttp/buildlink.mk
index 190ce6b40ec..949dc7dc5f6 100644
--- a/www/libghttp/buildlink.mk
+++ b/www/libghttp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 10:34:42 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libghttp.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBGHTTP_BUILDLINK_MK)
 LIBGHTTP_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libghttp?=	libghttp>=1.0.9
 DEPENDS+=	${BUILDLINK_DEPENDS.libghttp}:../../www/libghttp
 
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libghttp}
 pre-configure: ${BUILDLINK_TARGETS.libghttp}
 libghttp-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBGHTTP_BUILDLINK_MK
diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk
index 0d507d94984..41c776cf63f 100644
--- a/www/libwww/buildlink.mk
+++ b/www/libwww/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/28 20:58:12 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwww.
 #
@@ -15,6 +15,8 @@
 .if !defined(LIBWWW_BUILDLINK_MK)
 LIBWWW_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.libwww?=	libwww>=5.3.2
 DEPENDS+=	${BUILDLINK_DEPENDS.libwww}:../../www/libwww
 
@@ -64,6 +66,4 @@ pre-configure: ${BUILDLINK_TARGETS.libwww}
 libwww-buildlink: _BUILDLINK_USE
 libwww-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LIBWWW_BUILDLINK_MK
diff --git a/x11/Xaw3d/buildlink.mk b/x11/Xaw3d/buildlink.mk
index a44ef84ee3f..438f53787a6 100644
--- a/x11/Xaw3d/buildlink.mk
+++ b/x11/Xaw3d/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Xaw3d.
 #
@@ -15,6 +15,8 @@
 .if !defined(XAW3D_BUILDLINK_MK)
 XAW3D_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.Xaw3d?=	Xaw3d-1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.Xaw3d}:../../x11/Xaw3d
 
@@ -35,6 +37,4 @@ pre-configure: ${BUILDLINK_TARGETS.Xaw3d}
 Xaw3d-buildlink: _BUILDLINK_USE
 Xaw3d-libXaw-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# XAW3D_BUILDLINK_MK
diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index 691eb0770a8..9e216e3fb59 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:27:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
@@ -15,6 +15,8 @@
 .if !defined(FLTK_BUILDLINK_MK)
 FLTK_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.fltk?=	fltk>=1.0.9
 DEPENDS+=	${BUILDLINK_DEPENDS.fltk}:../../x11/fltk
 
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.fltk}
 pre-configure: ${BUILDLINK_TARGETS.fltk}
 fltk-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# FLTK_BUILDLINK_MK
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index ac589b452fe..31e75af71a4 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/30 14:52:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -15,6 +15,8 @@
 .if !defined(GNOME_LIBS_BUILDLINK_MK)
 GNOME_LIBS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.0.53
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
 
@@ -63,6 +65,4 @@ gnome-libs-buildlink: _BUILDLINK_USE
 gnome-libs-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 libart-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# GNOME_LIBS_BUILDLINK_MK
diff --git a/x11/lesstif/buildlink.mk b/x11/lesstif/buildlink.mk
index 8f20fbadbf3..37cc56df8c8 100644
--- a/x11/lesstif/buildlink.mk
+++ b/x11/lesstif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 20:42:16 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif.
 #
@@ -15,6 +15,8 @@
 .if !defined(LESSTIF_BUILDLINK_MK)
 LESSTIF_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.lesstif?=	lesstif>=0.91.4
 
 .include "../../mk/bsd.prefs.mk"
@@ -67,6 +69,4 @@ MOTIFLIB?=	-Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -L
 pre-configure: ${BUILDLINK_TARGETS.lesstif}
 lesstif-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LESSTIF_BUILDLINK_MK
diff --git a/x11/lesstif12/buildlink.mk b/x11/lesstif12/buildlink.mk
index 1e36a72416e..89991a289e3 100644
--- a/x11/lesstif12/buildlink.mk
+++ b/x11/lesstif12/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 20:42:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif12.
 #
@@ -15,6 +15,8 @@
 .if !defined(LESSTIF12_BUILDLINK_MK)
 LESSTIF12_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.lesstif12?=	lesstif12>=0.91.4
 
 .include "../../mk/bsd.prefs.mk"
@@ -74,6 +76,4 @@ MOTIFLIB?=	-Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -L
 pre-configure: ${BUILDLINK_TARGETS.lesstif12}
 lesstif12-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# LESSTIF12_BUILDLINK_MK
diff --git a/x11/qt2-designer/buildlink.mk b/x11/qt2-designer/buildlink.mk
index 61450bdc2b3..0c9a2904880 100644
--- a/x11/qt2-designer/buildlink.mk
+++ b/x11/qt2-designer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/26 17:46:11 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-designer.
 #
@@ -15,6 +15,8 @@
 .if !defined(QT2_DESIGNER_BUILDLINK_MK)
 QT2_DESIGNER_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.qt2-designer?=	qt2-designer>=2.2.4
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
 
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.qt2-designer}
 pre-configure: ${BUILDLINK_TARGETS.qt2-designer}
 qt2-designer-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# QT2_DESIGNER_BUILDLINK_MK
diff --git a/x11/qt2-libs/buildlink.mk b/x11/qt2-libs/buildlink.mk
index 87eb6db2e37..f2305125952 100644
--- a/x11/qt2-libs/buildlink.mk
+++ b/x11/qt2-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/26 17:53:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-libs.
 #
@@ -15,6 +15,8 @@
 .if !defined(QT2_LIBS_BUILDLINK_MK)
 QT2_LIBS_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.2.4
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-libs}:../../x11/qt2-libs
 
@@ -45,6 +47,4 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.qt2-libs}
 pre-configure: ${BUILDLINK_TARGETS.qt2-libs}
 qt2-libs-buildlink: _BUILDLINK_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# QT2_LIBS_BUILDLINK_MK
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk
index 8aa851d1329..0345e2a4341 100644
--- a/x11/tk/buildlink.mk
+++ b/x11/tk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:27:02 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tk.
 #
@@ -15,6 +15,8 @@
 .if !defined(TK_BUILDLINK_MK)
 TK_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.tk?=	tk>=8.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.tk}:../../x11/tk
 
@@ -49,6 +51,4 @@ tkConfig-buildlink:
 		${TOUCH} ${TOUCH_FLAGS} $${cookie};			\
 	fi
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# TK_BUILDLINK_MK
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index bc0bf0c1ddb..215b6b2cf0a 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 09:28:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -15,6 +15,8 @@
 .if !defined(WXGTK_BUILDLINK_MK)
 WXGTK_BUILDLINK_MK=	# defined
 
+.include "../../mk/bsd.buildlink.mk"
+
 BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.2.2
 DEPENDS+=			${BUILDLINK_DEPENDS.wxGTK}:../../x11/wxGTK
 
@@ -58,6 +60,4 @@ wxGTK-buildlink: _BUILDLINK_USE
 wxGTK-1-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 wxGTK-2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
-.include "../../mk/bsd.buildlink.mk"
-
 .endif	# WXGTK_BUILDLINK_MK