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 /x11/libXdamage | |
| 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 'x11/libXdamage')
| -rw-r--r-- | x11/libXdamage/buildlink3.mk | 8 | ||||
| -rw-r--r-- | x11/libXdamage/builtin.mk | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/x11/libXdamage/buildlink3.mk b/x11/libXdamage/buildlink3.mk index 655f48b8459..24feddda819 100644 --- a/x11/libXdamage/buildlink3.mk +++ b/x11/libXdamage/buildlink3.mk @@ -1,11 +1,7 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 23:02:25 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 "../../mk/x11.buildlink3.mk" -.else - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXDAMAGE_BUILDLINK3_MK:= ${LIBXDAMAGE_BUILDLINK3_MK}+ @@ -28,5 +24,3 @@ BUILDLINK_PKGSRCDIR.libXdamage?= ../../x11/libXdamage .include "../../x11/xproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} - -.endif diff --git a/x11/libXdamage/builtin.mk b/x11/libXdamage/builtin.mk new file mode 100644 index 00000000000..3d04b6891fa --- /dev/null +++ b/x11/libXdamage/builtin.mk @@ -0,0 +1,8 @@ +# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $ + +BUILTIN_PKG:= libXdamage +PKGCONFIG_FILE.libXdamage= ${X11BASE}/lib/pkgconfig/xdamage.pc \ + ${X11BASE}/lib/libXdamage.so + +.include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" |