diff options
author | cube <cube> | 2008-10-05 21:36:32 +0000 |
---|---|---|
committer | cube <cube> | 2008-10-05 21:36:32 +0000 |
commit | 2c8f273533926f8b1e1655584dcb2080f2e79048 (patch) | |
tree | 7e3acb4e1cfd62c69446a0e9e96faf8cfb567d76 /graphics | |
parent | 65393655c330983dfd10414dd9fbf359b7d9ebd8 (diff) | |
download | pkgsrc-2c8f273533926f8b1e1655584dcb2080f2e79048.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')
-rw-r--r-- | graphics/MesaLib/builtin.mk | 8 | ||||
-rw-r--r-- | graphics/freetype2/builtin.mk | 11 | ||||
-rw-r--r-- | graphics/glu/builtin.mk | 11 | ||||
-rw-r--r-- | graphics/xpm/builtin.mk | 12 |
4 files changed, 12 insertions, 30 deletions
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk index 317a10a45e7..86961a001cd 100644 --- a/graphics/MesaLib/builtin.mk +++ b/graphics/MesaLib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:00 reed Exp $ +# $NetBSD: builtin.mk,v 1.15 2008/10/05 21:36:35 cube Exp $ BUILTIN_PKG:= MesaLib @@ -74,12 +74,8 @@ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} . endif -. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) -BUILDLINK_PREFIX.MesaLib= ${X11BASE} BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" +. include "../../mk/x11.builtin.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -. endif .endif # CHECK_BUILTIN.MesaLib diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk index ff321dc54b9..d2842992800 100644 --- a/graphics/freetype2/builtin.mk +++ b/graphics/freetype2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.11 2008/04/24 11:18:13 tron Exp $ +# $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:35 cube Exp $ BUILTIN_PKG:= freetype2 @@ -70,6 +70,9 @@ MAKEVARS+= USE_BUILTIN.freetype2 ### 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.freetype2?= no .if !empty(CHECK_BUILTIN.freetype2:M[nN][oO]) @@ -77,10 +80,4 @@ CHECK_BUILTIN.freetype2?= no BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 . endif -. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) -BUILDLINK_PREFIX.freetype2= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" -. endif - .endif # CHECK_BUILTIN.freetype2 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 diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index c5adc96d509..86ecad54a4b 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.15 2007/09/21 15:17:14 rillig Exp $ +# $NetBSD: builtin.mk,v 1.16 2008/10/05 21:36:36 cube Exp $ BUILTIN_PKG:= xpm @@ -84,13 +84,5 @@ MAKEVARS+= USE_BUILTIN.xpm ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### -CHECK_BUILTIN.xpm?= no -.if !empty(CHECK_BUILTIN.xpm:M[nN][oO]) -. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) -BUILDLINK_PREFIX.xpm= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" -. endif - -.endif # CHECK_BUILTIN.xpm +.include "../../mk/x11.builtin.mk" |