diff options
| author | cube <cube@pkgsrc.org> | 2008-10-05 21:36:32 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2008-10-05 21:36:32 +0000 |
| commit | 403e256ff68dfb7e0b0918954c99f3bed3e40b3b (patch) | |
| tree | 7e3acb4e1cfd62c69446a0e9e96faf8cfb567d76 /graphics/freetype2 | |
| parent | a30aea172505b1d10850d01b7974de0e75626463 (diff) | |
| download | pkgsrc-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/freetype2')
| -rw-r--r-- | graphics/freetype2/builtin.mk | 11 |
1 files changed, 4 insertions, 7 deletions
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 |