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 /textproc | |
| 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 'textproc')
| -rw-r--r-- | textproc/expat/builtin.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk index c363e0ad9fe..2d339d4f6d7 100644 --- a/textproc/expat/builtin.mk +++ b/textproc/expat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.12 2006/10/26 19:13:48 wiz Exp $ +# $NetBSD: builtin.mk,v 1.13 2008/10/05 21:36:34 cube Exp $ BUILTIN_PKG:= expat @@ -80,14 +80,10 @@ CHECK_BUILTIN.expat?= no BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4 . endif -. if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) -. if !empty(H_EXPAT:M${X11BASE}/) -BUILDLINK_PREFIX.expat= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" -. else +. if !empty(H_EXPAT:M${X11BASE}/*) +. include "../../mk/x11.builtin.mk" +. else BUILDLINK_PREFIX.expat= /usr -. endif . endif .endif # CHECK_BUILTIN.expat |