Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes.

The redundant parsing of bsd.prefs.mk is mostly avoided now and
parse time e.g. for x11/kdebase3 gets reduced by up to 10%.

64 files changed, 128 insertions, 128 deletions

diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index eb07ca282e0..396f640f511 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:34 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libao+=	libao>=0.8.6nb3
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 .  if !defined(_LIBAO_BUILDING_PLUGIN)
-.    include "../../mk/bsd.prefs.mk"
+.    include "../../mk/bsd.fast.prefs.mk"
 .    if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS"
 _LIBAO_DEFAULT_PLUGIN=		oss
 .    elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index c4a2ec4945c..dc07fa6e807 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMIKMOD_BUILDLINK3_MK:=	${LIBMIKMOD_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_API_DEPENDS.libmikmod+=	libmikmod>=3.1.9
 BUILDLINK_ABI_DEPENDS.libmikmod+=	libmikmod>=3.1.11.1nb2
 BUILDLINK_PKGSRCDIR.libmikmod?=	../../audio/libmikmod
 
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 .  if !defined(PKG_BUILD_OPTIONS.libmikmod)
 PKG_BUILD_OPTIONS.libmikmod!=	cd ${BUILDLINK_PKGSRCDIR.libmikmod} && \
 			${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index c01e18dfbfd..684a2ecec15 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB_BUILDLINK3_MK:=	${DB_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.db2?=	../../databases/db
 BUILDLINK_INCDIRS.db2?=		include/db2
 BUILDLINK_LDADD.db2=		-ldb2
 
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 .  if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
 BUILDLINK_LIBS.db2=		${BUILDLINK_LDADD.db2}
 BUILDLINK_TRANSFORM+=		l:db:db2
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index 9b33f8d38d5..7413120912c 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_INCDIRS.db3?=		include/db3
 BUILDLINK_LDADD.db3=		-ldb3
 BUILDLINK_TRANSFORM+=		l:db-3:db3
 
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 .  if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
 BUILDLINK_LIBS.db3=		${BUILDLINK_LDADD.db3}
 BUILDLINK_TRANSFORM+=		l:db:db3
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 3b3e805ca5c..dd418d28053 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2006/07/08 23:10:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_INCDIRS.db4?=		include/db4
 BUILDLINK_LDADD.db4=		-ldb4
 BUILDLINK_TRANSFORM+=		l:db-4:db4
 
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 .  if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
 #
 # Older db4 packages didn't enable the db-1.85 compatibility API.
diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk
index a68f728aa47..5fce146c13c 100644
--- a/databases/openldap-client/buildlink3.mk
+++ b/databases/openldap-client/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=		${OPENLDAP_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=			openldap-client
diff --git a/databases/postgresql80-client/buildlink3.mk b/databases/postgresql80-client/buildlink3.mk
index 640e0ed135a..85c73739834 100644
--- a/databases/postgresql80-client/buildlink3.mk
+++ b/databases/postgresql80-client/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL80_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL80_CLIENT_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	postgresql80-client
diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk
index 821fb43ba5e..7a35b79577f 100644
--- a/databases/postgresql81-client/buildlink3.mk
+++ b/databases/postgresql81-client/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL81_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	postgresql81-client
diff --git a/databases/postgresql82-client/buildlink3.mk b/databases/postgresql82-client/buildlink3.mk
index 4fdbf7c6aec..202d15fb05c 100644
--- a/databases/postgresql82-client/buildlink3.mk
+++ b/databases/postgresql82-client/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/09 15:35:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL82_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL82_CLIENT_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	postgresql82-client
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 1cca6dae507..604bda3786f 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/11/06 11:21:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
 
 PTHREAD_OPTS+=	require
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${OPSYS} != "IRIX" && ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index e36d4f6fd27..3a37f953f0f 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/10/23 09:55:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@ BUILDLINK_FILES.apr+=	bin/apr-config
 BUILDLINK_FILES.apr+=	bin/apu-config
 BUILDLINK_FILES.apr+=	lib/*.exp
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .  if !defined(PKG_BUILD_OPTIONS.apr)
 PKG_BUILD_OPTIONS.apr!=	cd ${BUILDLINK_PKGSRCDIR.apr} && \
diff --git a/devel/apr1/buildlink3.mk b/devel/apr1/buildlink3.mk
index 87037bfc5b4..9a6bd5a5ac6 100644
--- a/devel/apr1/buildlink3.mk
+++ b/devel/apr1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_FILES.apr+=	bin/apr-config
 BUILDLINK_FILES.apr+=	bin/apu-config
 BUILDLINK_FILES.apr+=	lib/*.exp
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .  if !defined(PKG_BUILD_OPTIONS.apr)
 PKG_BUILD_OPTIONS.apr!=	cd ${BUILDLINK_PKGSRCDIR.apr} && \
diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk
index c9b86d9f421..62195facab0 100644
--- a/devel/libltdl/buildlink3.mk
+++ b/devel/libltdl/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBLTDL_BUILDLINK3_MK:=	${LIBLTDL_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 .  if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
 _SKIP_LIBLTDL=		yes
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index ab820a8cb19..83554f3312f 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libslang
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index dd68375e2ca..252bdfc426e 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/12/06 17:23:24 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.pango+=	pango>=1.12.1nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PKG_BUILD_OPTIONS.pango)
 PKG_BUILD_OPTIONS.pango!= \
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index b6ee3e71d95..3d6126d14f1 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2006/10/01 14:23:20 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=	${READLINE_BUILDLINK3_MK}+
@@ -27,7 +27,7 @@ BUILDLINK_TRANSFORM.readline+= \
 # when testing for -lreadline.  If BROKEN_READLINE_DETECTION is set to
 # "yes", then automatically add the right one.
 #
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 BROKEN_READLINE_DETECTION?=	no
 .  if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
 BUILDLINK_RL_TERMLIB.Linux=	curses
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index 075eb48c2d7..5e651f1c726 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
 
 .if !empty(BUILDLINK_DEPTH:M+)
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index aac34edb8c1..cd804df6b1b 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2006/07/08 23:10:50 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2006/12/12 21:52:35 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ BUILDLINK_TRANSFORM+=		l:MesaGL:GL
 
 .endif	# MESALIB_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
 .include "../../devel/pthread-stublib/buildlink3.mk"
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index b1fb292fca5..a23cb2ebaef 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/11/06 09:46:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .endif	# CAIRO_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PKG_BUILD_OPTIONS.cairo)
 PKG_BUILD_OPTIONS.cairo!= \
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 808d8b9d520..2f53a6e3c7f 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME_ICON_THEME_BUILDLINK3_MK:=	${GNOME_ICON_THEME_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gnome-icon-theme?=	../../graphics/gnome-icon-theme
 #
 USE_TOOLS+=	perl
 
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 
 dirs!=	${GREP} "^@dirrm" ${.CURDIR}/../../graphics/gnome-icon-theme/PLIST | \
 	${CUT} -d ' ' -f 2
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index 0bdfa0a0eb8..8809c122720 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 HICOLOR_ICON_THEME_BUILDLINK3_MK:=	${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_API_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.4
 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+=	hicolor-icon-theme>=0.9nb1
 BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 dirs!=	${GREP} "^@dirrm" ${.CURDIR}/../../graphics/hicolor-icon-theme/PLIST | \
 	${CUT} -d ' ' -f 2
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 52f3e2ef90d..282756ae95a 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_API_DEPENDS.png+=		png>=1.2.4
 BUILDLINK_ABI_DEPENDS.png?=	png>=1.2.9nb2
 BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 
-.   include "../../mk/bsd.prefs.mk"
+.   include "../../mk/bsd.fast.prefs.mk"
 # keep this in sync with the same code in Makefile
 .  if ${MACHINE_ARCH} != "i386"
 CPPFLAGS+=	-DPNG_NO_ASSEMBLER_CODE
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index 31d39e78c52..c9eb2ee54f4 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SANE_BACKENDS_BUILDLINK3_MK:=	${SANE_BACKENDS_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.sane-backends+=	sane-backends>=1.0.17nb1
 BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
 .endif	# SANE_BACKENDS_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if (${OPSYS} != "SunOS")
 . include "../../devel/libusb/buildlink3.mk"
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index febf3729e07..3a2e758a6be 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gcc
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 30a60db8f8a..40b5bf179d0 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_CXX_BUILDLINK3_MK:=	${GCC3_CXX_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gcc3-cxx
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 321a68a1cdb..66785f0d9d0 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gcc3-c
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 5ca6387dbf3..ef4979caa52 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_F77_BUILDLINK3_MK:=	${GCC3_F77_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gcc3-f77
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index 99a1e4308b7..941ea380bfd 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_JAVA_BUILDLINK3_MK:=	${GCC3_JAVA_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gcc3-java
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 4badf45713c..64ed5f7b571 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_OBJC_BUILDLINK3_MK:=	${GCC3_OBJC_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gcc3-objc
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 33dfccbc204..e4977b6f523 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=3.09.1nb2
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 BUILDLINK_DEPMETHOD.ocaml?=	build
 
-.  include "../../mk/bsd.prefs.mk"
+.  include "../../mk/bsd.fast.prefs.mk"
 .  if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=		yes
 .  endif
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 5a3485d819f..48a95cfdbde 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	perl
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl
 
 .if !empty(PERL5_BUILDLINK3_MK:M+)
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 USE_TOOLS+=			perl
 PERL5_REQD+=			5.8.7
 TOOLS_DEPENDS.perl=		# buildlink3 will handle the dependency
diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk
index 261bf5606e6..e4b4d86a02d 100644
--- a/lang/spidermonkey/buildlink3.mk
+++ b/lang/spidermonkey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/12/09 00:22:00 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SPIDERMONKEY_BUILDLINK3_MK:=	${SPIDERMONKEY_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspidermonkey}
 BUILDLINK_PACKAGES+=	spidermonkey
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spidermonkey
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.spidermonkey+=	spidermonkey>=1.5
diff --git a/math/octave-current/buildlink3.mk b/math/octave-current/buildlink3.mk
index 3dee6675b50..99bbe2d426d 100644
--- a/math/octave-current/buildlink3.mk
+++ b/math/octave-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/12/12 21:52:36 joerg Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -18,7 +18,7 @@ BUILDLINK_ABI_DEPENDS.octave-current+=	octave-current>=2.9.4nb1
 BUILDLINK_PKGSRCDIR.octave-current?=	../../math/octave-current
 .endif	# OCTAVE_CURRENT_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PKG_OPTIONS.octave:) || !empty(PKG_OPTIONS.octave:Mhdf5)
 .include "../../devel/hdf5/buildlink3.mk"
diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk
index db36f74d462..c40a4f95d4a 100644
--- a/math/octave/buildlink3.mk
+++ b/math/octave/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCTAVE_BUILDLINK3_MK:=	${OCTAVE_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.octave?=	octave>=2.1.72nb1
 BUILDLINK_PKGSRCDIR.octave?=	../../math/octave
 .endif	# OCTAVE_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PKG_OPTIONS.octave:) || !empty(PKG_OPTIONS.octave:Mhdf5)
 .include "../../devel/hdf5/buildlink3.mk"
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index 29b4512ac78..7558ef11c4c 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	mjpegtools
diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk
index e96d2cc7414..0959ac58e32 100644
--- a/net/libares/buildlink3.mk
+++ b/net/libares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBARES_BUILDLINK3_MK:=	${LIBARES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibares}
 BUILDLINK_PACKAGES+=	libares
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libares
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(LIBARES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libares+=	libares>=1.1.1
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index 733671991c8..a154e59afd1 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libpcap
diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk
index 9155095c141..50769db811b 100644
--- a/net/libradius/buildlink3.mk
+++ b/net/libradius/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRADIUS_LINUX_BUILDLINK3_MK:=	${LIBRADIUS_LINUX_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libradius
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 2105868ee74..6daba76a4f8 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINT_BUILDLINK3_MK:=	${LIBGNOMEPRINT_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libgnomeprint
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index aaaa13aaf17..09c1379d12a 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.30 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	heimdal
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index addc30da157..990f0604fd7 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.32 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	openssl
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index 61d9f5e8608..5776176e524 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
 .endif	# TCP_WRAPPERS_BUILDLINK3_MK
 
 # need libnsl and libsocket to link into an executable on Solaris.
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
 BUILDLINK_LDADD.tcp_wrappers+=		-lnsl -lsocket
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk
index c95be12e7a1..cae7d1ae09c 100644
--- a/textproc/eb/buildlink3.mk
+++ b/textproc/eb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EB_BUILDLINK3_MK:=	${EB_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ _EB_REQD=		3.3.2nb1
 # configure argument.)
 #
 # XXX We need something generic.
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 PKG_SYSCONFDIR.eb=$$(						\
 	if ${PKG_ADMIN} pmatch 'eb>=${_EB_REQD}'		\
 	    $$( ${PKG_INFO} -e eb ) 2>/dev/null; then		\
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 79e5171f629..adbf1463895 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/10/01 08:53:05 schwarz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML2_BUILDLINK3_MK:=	${LIBXML2_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 BUILDLINK_FILES.libxml2+=	bin/xml2-config
 .endif	# LIBXML2_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .if !empty(LOWER_OPSYS:Mirix5*)
 # for glob
 . include "../../pkgtools/libnbcompat/buildlink3.mk"
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 2eab6e065f9..da45096eb4f 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/09/24 16:28:20 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/12/12 21:52:37 joerg Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
@@ -19,7 +19,7 @@ BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=1.8.2
 BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.16.0nb1
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index 8a892af8a92..e437ca9283b 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/09/24 17:40:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libwww+=	libwww>=5.4.0nb5
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
 .endif	# LIBWWW_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PKG_BUILD_OPTIONS.libwww)
 PKG_BUILD_OPTIONS.libwww!= \
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index 54873060527..32f8b175535 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW_XPM_BUILDLINK3_MK:=	${XAW_XPM_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.Xaw-Xpm?=	Xaw-Xpm>=1.1nb2
 BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 .endif	# XAW_XPM_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
 LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw-Xpm}/lib			\
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
index 80168c35416..e48d2f5f323 100644
--- a/x11/Xaw3d/buildlink3.mk
+++ b/x11/Xaw3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW3D_BUILDLINK3_MK:=	${XAW3D_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.Xaw3d?=	Xaw3d>=1.5Enb1
 BUILDLINK_PKGSRCDIR.Xaw3d?=	../../x11/Xaw3d
 .endif	# XAW3D_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .include "../../mk/x11.buildlink3.mk"
 
 LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw3d}/lib				\
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index 344ab211568..21a082b916a 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/11 14:42:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 6a1a6b6ffc9..999eb3df729 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/11 14:42:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 72bc0bf6858..22637c0aab6 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.26 2006/07/12 12:31:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/12/12 21:52:37 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 984553afa19..4be6da2fdf5 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.43 2006/07/12 12:31:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2006/12/12 21:52:37 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk
index f7162feef43..64229c7b38c 100644
--- a/x11/compositeproto/buildlink3.mk
+++ b/x11/compositeproto/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/12/12 21:52:37 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk
index 415b3d95638..449596236e8 100644
--- a/x11/fixesproto/buildlink3.mk
+++ b/x11/fixesproto/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/12/12 21:52:37 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 06a7ee38436..88892b412fc 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2006/12/05 21:26:59 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2006/12/12 21:52:38 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules|
 				{ print "@comment in gtk2: " $$0; next; }
 .endif	# GTK2_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PKG_BUILD_OPTIONS.gtk2+)
 PKG_BUILD_OPTIONS.gtk2+!= \
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index ccbe41c271b..dba4d01e854 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/12/12 21:52:38 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	kdelibs
diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk
index f1e248457e9..6fe662db25e 100644
--- a/x11/neXtaw/buildlink3.mk
+++ b/x11/neXtaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/12/12 21:52:38 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEXTAW_BUILDLINK3_MK:=	${NEXTAW_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.neXtaw+=	neXtaw>=0.15.1nb2
 BUILDLINK_PKGSRCDIR.neXtaw?=	../../x11/neXtaw
 .endif	# NEXTAW_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .include "../../mk/x11.buildlink3.mk"
 
 LIBXAW?=	-L${BUILDLINK_PREFIX.neXtaw}/lib			\
diff --git a/x11/randrproto/buildlink3.mk b/x11/randrproto/buildlink3.mk
index a42bdb83f17..edcac577829 100644
--- a/x11/randrproto/buildlink3.mk
+++ b/x11/randrproto/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/12/12 21:52:38 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk
index c7eb818f8cd..ff127c0d786 100644
--- a/x11/renderproto/buildlink3.mk
+++ b/x11/renderproto/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/11 14:42:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/12/12 21:52:38 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index fbbea1b9d66..7962efa40cb 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:38 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK24_BUILDLINK3_MK:=	${WXGTK24_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	wxGTK24
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 23b10470a69..26541bc96a5 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/07/13 00:57:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/12/12 21:52:38 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk
index c7a88b4ae32..255b1cc0c1b 100644
--- a/x11/xextproto/buildlink3.mk
+++ b/x11/xextproto/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/11 14:42:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/12/12 21:52:38 joerg Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index eb5de56f03f..7c4dd56bc90 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/10 21:50:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/12/12 21:52:38 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -15,7 +15,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxorg-libs}
 BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xorg-libs
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk
index 10d28f0e589..a0515998b34 100644
--- a/x11/xproto/buildlink3.mk
+++ b/x11/xproto/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/11/03 17:04:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/12/12 21:52:38 joerg Exp $
 #
 # This Makefile fragment is included by packages that use xproto.
 #
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} == "xorg"
 .include "../../mk/x11.buildlink3.mk"