summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2008-02-14 20:01:44 +0000
committertron <tron@pkgsrc.org>2008-02-14 20:01:44 +0000
commit12a974e2e1ee22cc88b243c224ed050c6af9280e (patch)
tree75a62416161378dfa6b4b0ae5acc05e19f5fd53d
parentc89a3c6b681f5a1c621193dfc7d64788e69ed8d0 (diff)
downloadpkgsrc-12a974e2e1ee22cc88b243c224ed050c6af9280e.tar.gz
Unbreak build of a lot of the "pange" package under Mac OS X Leopard.
Checking whether "X11_TYPE" is "xorg" is obsolete and *not* equivalent to checking whether we are not using modular X.org.
-rw-r--r--x11/xproto/buildlink3.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/x11/xproto/buildlink3.mk b/x11/xproto/buildlink3.mk
index 54547a4480a..f88a51bd4a4 100644
--- a/x11/xproto/buildlink3.mk
+++ b/x11/xproto/buildlink3.mk
@@ -1,14 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.8 2008/01/06 00:08:30 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2008/02/14 20:01:44 tron Exp $
#
# This Makefile fragment is included by packages that use xproto.
#
.include "../../mk/bsd.fast.prefs.mk"
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XPROTO_BUILDLINK3_MK:= ${XPROTO_BUILDLINK3_MK}+
@@ -27,5 +23,3 @@ BUILDLINK_DEPMETHOD.xproto?= build
.endif # XPROTO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
-
-.endif