From 2c8f273533926f8b1e1655584dcb2080f2e79048 Mon Sep 17 00:00:00 2001
From: cube <cube>
Date: Sun, 5 Oct 2008 21:36:32 +0000
Subject: Merge cube-native-xorg, so that pkgsrc-current can be used with the
 native X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
---
 x11/xextproto/builtin.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'x11/xextproto')

diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk
index 8e8dd7e329f..a555a2bd5a2 100644
--- a/x11/xextproto/builtin.mk
+++ b/x11/xextproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2007/02/22 19:27:28 wiz Exp $
+# $NetBSD: builtin.mk,v 1.6 2008/10/05 21:36:34 cube Exp $
 
 BUILTIN_PKG:=	xextproto
 
@@ -58,15 +58,12 @@ MAKEVARS+=	USE_BUILTIN.xextproto
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
+
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.xextproto?=	no
 .if !empty(CHECK_BUILTIN.xextproto:M[nN][oO])
 
-.  if !empty(USE_BUILTIN.xextproto:M[yY][eE][sS])
-BUILDLINK_PREFIX.xextproto=	${X11BASE}
-.    include "../../mk/x11.buildlink3.mk"
-.    include "../../mk/x11.builtin.mk"
-.  endif
-
 # If we are using the builtin version, check whether it has a xextproto.pc
 # file or not.  If the latter, generate a fake one.
 .  if !empty(USE_BUILTIN.xextproto:M[Yy][Ee][Ss])
-- 
cgit v1.2.3