From 31bf35755b09765547f31f3e842cc8d22c8b8ae4 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 12 Dec 2006 21:52:34 +0000
Subject: 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%.

---
 x11/Xaw-Xpm/buildlink3.mk          | 4 ++--
 x11/Xaw3d/buildlink3.mk            | 4 ++--
 x11/Xcomposite/buildlink3.mk       | 4 ++--
 x11/Xfixes/buildlink3.mk           | 4 ++--
 x11/Xrandr-mixedcase/buildlink3.mk | 4 ++--
 x11/Xrender/buildlink3.mk          | 4 ++--
 x11/compositeproto/buildlink3.mk   | 4 ++--
 x11/fixesproto/buildlink3.mk       | 4 ++--
 x11/gtk2/buildlink3.mk             | 4 ++--
 x11/kdelibs3/buildlink3.mk         | 4 ++--
 x11/neXtaw/buildlink3.mk           | 4 ++--
 x11/randrproto/buildlink3.mk       | 4 ++--
 x11/renderproto/buildlink3.mk      | 4 ++--
 x11/wxGTK24/buildlink3.mk          | 4 ++--
 x11/xcursor/buildlink3.mk          | 4 ++--
 x11/xextproto/buildlink3.mk        | 4 ++--
 x11/xorg-libs/buildlink3.mk        | 4 ++--
 x11/xproto/buildlink3.mk           | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'x11')

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"
-- 
cgit v1.2.3