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.

1 files changed, 4 insertions, 46 deletions

diff --git a/x11/libXinerama/builtin.mk b/x11/libXinerama/builtin.mk
index f988d3f5d63..95e0a0e8b7b 100644
--- a/x11/libXinerama/builtin.mk
+++ b/x11/libXinerama/builtin.mk
@@ -1,49 +1,7 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/16 23:08:05 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
 
 BUILTIN_PKG:=	libXinerama
+PKGCONFIG_FILE.libXinerama=	${X11BASE}/lib/pkgconfig/xinerama.pc
 
-BUILTIN_FIND_FILES_VAR:=	LIB_XINERAMA
-BUILTIN_FIND_FILES.LIB_XINERAMA=${X11BASE}/lib/libXinerama.la
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if ${X11BASE} == ${LOCALBASE}
-IS_BUILTIN.libXinerama=	no
-.elif !defined(IS_BUILTIN.libXinerama)
-IS_BUILTIN.libXinerama=	no
-.  if empty(LIB_XINERAMA:M__nonexistent__)
-IS_BUILTIN.libXinerama=	yes
-.  endif
-.endif
-MAKEVARS+=	IS_BUILTIN.libXinerama
-
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.libXinerama)
-.  if ${PREFER.libXinerama} == "pkgsrc"
-USE_BUILTIN.libXinerama=	no
-.  else
-USE_BUILTIN.libXinerama=	${IS_BUILTIN.libXinerama}
-.    if defined(BUILTIN_PKG.libXinerama) && \
-        !empty(IS_BUILTIN.libXinerama:M[yY][eE][sS])
-USE_BUILTIN.libXinerama=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.libXinerama}
-.        if !empty(USE_BUILTIN.libXinerama:M[yY][eE][sS])
-USE_BUILTIN.libXinerama!=							\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXinerama:Q}; then \
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.libXinerama
-.endif
-MAKEVARS+=	USE_BUILTIN.libXinerama
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"