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.

3 files changed, 15 insertions, 10 deletions

diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index ac3dba3bf8e..4c900dc738f 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2008/01/05 17:24:12 tron Exp $
+# $NetBSD: builtin.mk,v 1.17 2008/10/05 21:36:35 cube Exp $
 
 BUILTIN_PKG:=	Xft2
 
@@ -86,6 +86,9 @@ MAKEVARS+=	USE_BUILTIN.Xft2
 ### 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.Xft2?=	no
 .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
 
@@ -93,9 +96,4 @@ CHECK_BUILTIN.Xft2?=	no
 BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1nb2
 .  endif
 
-.  if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
-BUILDLINK_PREFIX.Xft2=	${X11BASE}
-BUILDLINK_FILES.Xft2+=	lib/pkgconfig/xft.pc
-.  endif
-
 .endif	# CHECK_BUILTIN.Xft2
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index d046f36709a..82d5afb1cdd 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $
+# $NetBSD: builtin.mk,v 1.10 2008/10/05 21:36:35 cube Exp $
 
 BUILTIN_PKG:=	fontconfig
 
@@ -85,6 +85,9 @@ MAKEVARS+=	USE_BUILTIN.fontconfig
 ### 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.fontconfig?=	no
 .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
 
@@ -94,9 +97,6 @@ BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.3
 .  endif
 
 .  if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
-BUILDLINK_PREFIX.fontconfig=	${X11BASE}
-BUILDLINK_FILES.fontconfig+=	lib/pkgconfig/fontconfig.pc
-
 USE_BUILTIN.expat=	yes
 USE_BUILTIN.freetype2=	yes
 USE_BUILTIN.zlib=	yes
diff --git a/fonts/libfontenc/builtin.mk b/fonts/libfontenc/builtin.mk
new file mode 100644
index 00000000000..1597118e222
--- /dev/null
+++ b/fonts/libfontenc/builtin.mk
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:35 cube Exp $
+
+BUILTIN_PKG:=	libfontenc
+PKGCONFIG_FILE.libfontenc=	${X11BASE}/lib/pkgconfig/fontenc.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"