Thu Feb 14 20:01:44 2008 UTC ()
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.


(tron)
diff -r1.8 -r1.9 pkgsrc/x11/xproto/buildlink3.mk
cvs diff -r1.8 -r1.9 pkgsrc/x11/xproto/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/xproto/Attic/buildlink3.mk 2008/01/06 00:08:30 1.8
+++ pkgsrc/x11/xproto/Attic/buildlink3.mk 2008/02/14 20:01:44 1.9
@@ -1,31 +1,25 @@ @@ -1,31 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.8 2008/01/06 00:08:30 rillig Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2008/02/14 20:01:44 tron Exp $
2# 2#
3# This Makefile fragment is included by packages that use xproto. 3# This Makefile fragment is included by packages that use xproto.
4# 4#
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8.if ${X11_TYPE} != "modular" 
9.include "../../mk/x11.buildlink3.mk" 
10.else 
11 
12BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 8BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
13XPROTO_BUILDLINK3_MK:= ${XPROTO_BUILDLINK3_MK}+ 9XPROTO_BUILDLINK3_MK:= ${XPROTO_BUILDLINK3_MK}+
14 10
15.if !empty(BUILDLINK_DEPTH:M+) 11.if !empty(BUILDLINK_DEPTH:M+)
16BUILDLINK_DEPENDS+= xproto 12BUILDLINK_DEPENDS+= xproto
17.endif 13.endif
18 14
19BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxproto} 15BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxproto}
20BUILDLINK_PACKAGES+= xproto 16BUILDLINK_PACKAGES+= xproto
21BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xproto 17BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xproto
22 18
23.if !empty(XPROTO_BUILDLINK3_MK:M+) 19.if !empty(XPROTO_BUILDLINK3_MK:M+)
24BUILDLINK_API_DEPENDS.xproto?= xproto>=7.0.9 20BUILDLINK_API_DEPENDS.xproto?= xproto>=7.0.9
25BUILDLINK_PKGSRCDIR.xproto?= ../../x11/xproto 21BUILDLINK_PKGSRCDIR.xproto?= ../../x11/xproto
26BUILDLINK_DEPMETHOD.xproto?= build 22BUILDLINK_DEPMETHOD.xproto?= build
27.endif # XPROTO_BUILDLINK3_MK 23.endif # XPROTO_BUILDLINK3_MK
28 24
29BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 25BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
30 
31.endif