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/compositeproto/builtin.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'x11/compositeproto')

diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk
index 576e52af0fc..d92fc0dda84 100644
--- a/x11/compositeproto/builtin.mk
+++ b/x11/compositeproto/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/12/16 01:04:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.5 2008/10/05 21:36:32 cube Exp $
 
 BUILTIN_PKG:=	compositeproto
 
@@ -57,6 +57,8 @@ USE_BUILTIN.compositeproto!=						\
 .endif
 MAKEVARS+=	USE_BUILTIN.compositeproto
 
+.include "../../mk/x11.builtin.mk"
+
 CHECK_BUILTIN.compositeproto?=		no
 .if !empty(CHECK_BUILTIN.compositeproto:M[nN][oO])
 
-- 
cgit v1.2.3