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 /x11/libXres | |
| 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 'x11/libXres')
| -rw-r--r-- | x11/libXres/buildlink3.mk | 8 | ||||
| -rw-r--r-- | x11/libXres/builtin.mk | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/x11/libXres/buildlink3.mk b/x11/libXres/buildlink3.mk index 1fd73c6f312..c2dfd269147 100644 --- a/x11/libXres/buildlink3.mk +++ b/x11/libXres/buildlink3.mk @@ -1,11 +1,7 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/01/14 11:04:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2008/10/05 21:36:33 cube Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} != "modular" -.include "../../x11/Xrender/buildlink3.mk" -.else - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXRES_BUILDLINK3_MK:= ${LIBXRES_BUILDLINK3_MK}+ @@ -27,5 +23,3 @@ BUILDLINK_PKGSRCDIR.libXres?= ../../x11/libXres .include "../../x11/xproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} - -.endif diff --git a/x11/libXres/builtin.mk b/x11/libXres/builtin.mk new file mode 100644 index 00000000000..d63015c45dd --- /dev/null +++ b/x11/libXres/builtin.mk @@ -0,0 +1,8 @@ +# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $ + +BUILTIN_PKG:= libXres +PKGCONFIG_FILE.libXres= ${X11BASE}/lib/pkgconfig/xres.pc \ + ${X11BASE}/lib/libXRes.so + +.include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" |