summaryrefslogtreecommitdiff
path: root/graphics/glu
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2008-10-05 21:36:32 +0000
committercube <cube@pkgsrc.org>2008-10-05 21:36:32 +0000
commit403e256ff68dfb7e0b0918954c99f3bed3e40b3b (patch)
tree7e3acb4e1cfd62c69446a0e9e96faf8cfb567d76 /graphics/glu
parenta30aea172505b1d10850d01b7974de0e75626463 (diff)
downloadpkgsrc-403e256ff68dfb7e0b0918954c99f3bed3e40b3b.tar.gz
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.
Diffstat (limited to 'graphics/glu')
-rw-r--r--graphics/glu/builtin.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index b1b963b23dd..75e48502e16 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:36 cube Exp $
BUILTIN_PKG:= glu
@@ -64,6 +64,9 @@ MAKEVARS+= USE_BUILTIN.glu
### 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.glu?= no
.if !empty(CHECK_BUILTIN.glu:M[nN][oO])
@@ -71,10 +74,4 @@ CHECK_BUILTIN.glu?= no
BUILDLINK_API_DEPENDS.glu+= glu>=6.0
. endif
-. if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
-BUILDLINK_PREFIX.glu= ${X11BASE}
-. include "../../mk/x11.buildlink3.mk"
-. include "../../mk/x11.builtin.mk"
-. endif
-
.endif # CHECK_BUILTIN.glu