diff options
| author | tron <tron@pkgsrc.org> | 2008-01-07 13:59:35 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-01-07 13:59:35 +0000 |
| commit | 5ab01fe2a15516039c24b6a3d96efd1aa19a751e (patch) | |
| tree | 64e2d80624a5230463d9fd65f0b2ae2ee6794929 /x11/compositeproto | |
| parent | f363319856268656d7eb2ec49bc6c2b0c9befbfc (diff) | |
| download | pkgsrc-5ab01fe2a15516039c24b6a3d96efd1aa19a751e.tar.gz | |
Unbreak build of a lot of X11 packages on systems which use native X11
(e.g. NetBSD with bundled XFree86). Checking whether "X11_TYPE" is "xorg"
is obsolete and *not* equivalent to checking whether we are not using
modular X.org.
Diffstat (limited to 'x11/compositeproto')
| -rw-r--r-- | x11/compositeproto/buildlink3.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/x11/compositeproto/buildlink3.mk b/x11/compositeproto/buildlink3.mk index cf3e752cd71..77e7f7e7179 100644 --- a/x11/compositeproto/buildlink3.mk +++ b/x11/compositeproto/buildlink3.mk @@ -1,11 +1,7 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/01/06 16:57:42 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2008/01/07 13:59:36 tron Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} != "modular" -.include "../../mk/x11.buildlink3.mk" -.else - BUILDLINK_DEPMETHOD.compositeproto?= build BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -28,5 +24,3 @@ BUILDLINK_PKGSRCDIR.compositeproto?= ../../x11/compositeproto .include "../../x11/xproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} - -.endif |