Sat Apr 10 21:09:21 2010 UTC ()
revert bl3.mk changes since there were problems with native X11.


(tnn)
diff -r1.5 -r1.6 pkgsrc/x11/inputproto/buildlink3.mk
diff -r1.7 -r1.8 pkgsrc/x11/libXext/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/x11/libXi/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/x11/libXinerama/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/x11/libXtst/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/x11/recordproto/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/x11/xextproto/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/x11/xineramaproto/buildlink3.mk
cvs diff -r1.5 -r1.6 pkgsrc/x11/inputproto/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/inputproto/Attic/buildlink3.mk 2010/04/09 08:21:48 1.5
+++ pkgsrc/x11/inputproto/Attic/buildlink3.mk 2010/04/10 21:09:20 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.5 2010/04/09 08:21:48 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2010/04/10 21:09:20 tnn Exp $
2 2
3BUILDLINK_TREE+= inputproto 3BUILDLINK_TREE+= inputproto
4 4
5.if !defined(INPUTPROTO_BUILDLINK3_MK) 5.if !defined(INPUTPROTO_BUILDLINK3_MK)
6INPUTPROTO_BUILDLINK3_MK:= 6INPUTPROTO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.0 8BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.4
9BUILDLINK_PKGSRCDIR.inputproto?= ../../x11/inputproto 9BUILDLINK_PKGSRCDIR.inputproto?= ../../x11/inputproto
10BUILDLINK_DEPMETHOD.inputproto?= build 10BUILDLINK_DEPMETHOD.inputproto?= build
11.endif # INPUTPROTO_BUILDLINK3_MK 11.endif # INPUTPROTO_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -inputproto 13BUILDLINK_TREE+= -inputproto
cvs diff -r1.7 -r1.8 pkgsrc/x11/libXext/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXext/buildlink3.mk 2010/04/09 08:50:17 1.7
+++ pkgsrc/x11/libXext/buildlink3.mk 2010/04/10 21:09:21 1.8
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.7 2010/04/09 08:50:17 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2010/04/10 21:09:21 tnn Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xext.pc) 5.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xext.pc)
6.include "../../mk/x11.buildlink3.mk" 6.include "../../mk/x11.buildlink3.mk"
7.else 7.else
8 8
9BUILDLINK_TREE+= libXext 9BUILDLINK_TREE+= libXext
10 10
11.if !defined(LIBXEXT_BUILDLINK3_MK) 11.if !defined(LIBXEXT_BUILDLINK3_MK)
12LIBXEXT_BUILDLINK3_MK:= 12LIBXEXT_BUILDLINK3_MK:=
13 13
14BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 14BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0
15BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext 15BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext
16 16
17.include "../../x11/libX11/buildlink3.mk" 17.include "../../x11/libX11/buildlink3.mk"
18# XXX don't include xextproto/bl3 here; packages checking for xext.pc must 18# XXX don't include xextproto/bl3 here; packages checking for xext.pc must
19# include it theirselfes 19# include it theirselfes
20.endif # LIBXEXT_BUILDLINK3_MK 20.endif # LIBXEXT_BUILDLINK3_MK
21 21
22BUILDLINK_TREE+= -libXext 22BUILDLINK_TREE+= -libXext
23 23
24.endif 24.endif
cvs diff -r1.5 -r1.6 pkgsrc/x11/libXi/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXi/buildlink3.mk 2010/04/09 08:46:32 1.5
+++ pkgsrc/x11/libXi/buildlink3.mk 2010/04/10 21:09:21 1.6
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.5 2010/04/09 08:46:32 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2010/04/10 21:09:21 tnn Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" 5.if ${X11_TYPE} != "modular"
6.include "../../mk/x11.buildlink3.mk" 6.include "../../mk/x11.buildlink3.mk"
7.else 7.else
8 8
9BUILDLINK_TREE+= libXi 9BUILDLINK_TREE+= libXi
10 10
11.if !defined(LIBXI_BUILDLINK3_MK) 11.if !defined(LIBXI_BUILDLINK3_MK)
12LIBXI_BUILDLINK3_MK:= 12LIBXI_BUILDLINK3_MK:=
13 13
14BUILDLINK_API_DEPENDS.libXi+= libXi>=1.3 14BUILDLINK_API_DEPENDS.libXi+= libXi>=1.0.0
15BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi 15BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi
16 16
17.include "../../x11/inputproto/buildlink3.mk" 17.include "../../x11/inputproto/buildlink3.mk"
18.include "../../x11/libX11/buildlink3.mk" 18.include "../../x11/libX11/buildlink3.mk"
19.include "../../x11/libXext/buildlink3.mk" 19.include "../../x11/libXext/buildlink3.mk"
20.include "../../x11/xproto/buildlink3.mk" 20.include "../../x11/xproto/buildlink3.mk"
21.endif # LIBXI_BUILDLINK3_MK 21.endif # LIBXI_BUILDLINK3_MK
22 22
23BUILDLINK_TREE+= -libXi 23BUILDLINK_TREE+= -libXi
24 24
25.endif 25.endif
cvs diff -r1.5 -r1.6 pkgsrc/x11/libXinerama/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXinerama/buildlink3.mk 2010/04/09 08:43:00 1.5
+++ pkgsrc/x11/libXinerama/buildlink3.mk 2010/04/10 21:09:21 1.6
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.5 2010/04/09 08:43:00 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2010/04/10 21:09:21 tnn Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xinerama.pc) 5.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xinerama.pc)
6.include "../../mk/x11.buildlink3.mk" 6.include "../../mk/x11.buildlink3.mk"
7.else 7.else
8 8
9BUILDLINK_TREE+= libXinerama 9BUILDLINK_TREE+= libXinerama
10 10
11.if !defined(LIBXINERAMA_BUILDLINK3_MK) 11.if !defined(LIBXINERAMA_BUILDLINK3_MK)
12LIBXINERAMA_BUILDLINK3_MK:= 12LIBXINERAMA_BUILDLINK3_MK:=
13 13
14BUILDLINK_API_DEPENDS.libXinerama+= libXinerama>=1.1 14BUILDLINK_API_DEPENDS.libXinerama+= libXinerama>=1.0.1
15BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama 15BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama
16 16
17.include "../../x11/libX11/buildlink3.mk" 17.include "../../x11/libX11/buildlink3.mk"
18.include "../../x11/libXext/buildlink3.mk" 18.include "../../x11/libXext/buildlink3.mk"
19.include "../../x11/xextproto/buildlink3.mk" 19.include "../../x11/xextproto/buildlink3.mk"
20.include "../../x11/xineramaproto/buildlink3.mk" 20.include "../../x11/xineramaproto/buildlink3.mk"
21.endif # LIBXINERAMA_BUILDLINK3_MK 21.endif # LIBXINERAMA_BUILDLINK3_MK
22 22
23BUILDLINK_TREE+= -libXinerama 23BUILDLINK_TREE+= -libXinerama
24 24
25.endif 25.endif
cvs diff -r1.5 -r1.6 pkgsrc/x11/libXtst/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXtst/buildlink3.mk 2010/04/09 08:41:23 1.5
+++ pkgsrc/x11/libXtst/buildlink3.mk 2010/04/10 21:09:21 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.5 2010/04/09 08:41:23 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2010/04/10 21:09:21 tnn Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= libXtst 5BUILDLINK_TREE+= libXtst
6 6
7.if !defined(LIBXTST_BUILDLINK3_MK) 7.if !defined(LIBXTST_BUILDLINK3_MK)
8LIBXTST_BUILDLINK3_MK:= 8LIBXTST_BUILDLINK3_MK:=
9 9
10BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.1.0 10BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.0.1
11BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst 11BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst
12 12
13.include "../../x11/recordproto/buildlink3.mk" 13.include "../../x11/recordproto/buildlink3.mk"
14.include "../../x11/libX11/buildlink3.mk" 14.include "../../x11/libX11/buildlink3.mk"
15.include "../../x11/libXext/buildlink3.mk" 15.include "../../x11/libXext/buildlink3.mk"
16.include "../../x11/libXi/buildlink3.mk" 16.include "../../x11/libXi/buildlink3.mk"
17.endif # LIBXTST_BUILDLINK3_MK 17.endif # LIBXTST_BUILDLINK3_MK
18 18
19BUILDLINK_TREE+= -libXtst 19BUILDLINK_TREE+= -libXtst
cvs diff -r1.4 -r1.5 pkgsrc/x11/recordproto/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/recordproto/Attic/buildlink3.mk 2010/04/09 08:27:31 1.4
+++ pkgsrc/x11/recordproto/Attic/buildlink3.mk 2010/04/10 21:09:21 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.4 2010/04/09 08:27:31 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2010/04/10 21:09:21 tnn Exp $
2 2
3BUILDLINK_DEPMETHOD.recordproto?= build 3BUILDLINK_DEPMETHOD.recordproto?= build
4 4
5BUILDLINK_TREE+= recordproto 5BUILDLINK_TREE+= recordproto
6 6
7.if !defined(RECORDPROTO_BUILDLINK3_MK) 7.if !defined(RECORDPROTO_BUILDLINK3_MK)
8RECORDPROTO_BUILDLINK3_MK:= 8RECORDPROTO_BUILDLINK3_MK:=
9 9
10BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.14 10BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.1
11BUILDLINK_PKGSRCDIR.recordproto?= ../../x11/recordproto 11BUILDLINK_PKGSRCDIR.recordproto?= ../../x11/recordproto
12.endif # RECORDPROTO_BUILDLINK3_MK 12.endif # RECORDPROTO_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -recordproto 14BUILDLINK_TREE+= -recordproto
cvs diff -r1.10 -r1.11 pkgsrc/x11/xextproto/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/xextproto/Attic/buildlink3.mk 2010/04/09 08:33:38 1.10
+++ pkgsrc/x11/xextproto/Attic/buildlink3.mk 2010/04/10 21:09:21 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.10 2010/04/09 08:33:38 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2010/04/10 21:09:21 tnn Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_DEPMETHOD.xextproto?= build 5BUILDLINK_DEPMETHOD.xextproto?= build
6 6
7BUILDLINK_TREE+= xextproto 7BUILDLINK_TREE+= xextproto
8 8
9.if !defined(XEXTPROTO_BUILDLINK3_MK) 9.if !defined(XEXTPROTO_BUILDLINK3_MK)
10XEXTPROTO_BUILDLINK3_MK:= 10XEXTPROTO_BUILDLINK3_MK:=
11 11
12BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.1 12BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0
13BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto 13BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto
14 14
15.include "../../x11/inputproto/buildlink3.mk" 15.include "../../x11/inputproto/buildlink3.mk"
16.endif # XEXTPROTO_BUILDLINK3_MK 16.endif # XEXTPROTO_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -xextproto 18BUILDLINK_TREE+= -xextproto
cvs diff -r1.3 -r1.4 pkgsrc/x11/xineramaproto/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/xineramaproto/Attic/buildlink3.mk 2010/04/09 08:36:30 1.3
+++ pkgsrc/x11/xineramaproto/Attic/buildlink3.mk 2010/04/10 21:09:21 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.3 2010/04/09 08:36:30 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2010/04/10 21:09:21 tnn Exp $
2 2
3BUILDLINK_DEPMETHOD.xineramaproto?= build 3BUILDLINK_DEPMETHOD.xineramaproto?= build
4 4
5BUILDLINK_TREE+= xineramaproto 5BUILDLINK_TREE+= xineramaproto
6 6
7.if !defined(XINERAMAPROTO_BUILDLINK3_MK) 7.if !defined(XINERAMAPROTO_BUILDLINK3_MK)
8XINERAMAPROTO_BUILDLINK3_MK:= 8XINERAMAPROTO_BUILDLINK3_MK:=
9 9
10BUILDLINK_API_DEPENDS.xineramaproto+= xineramaproto>=1.2 10BUILDLINK_API_DEPENDS.xineramaproto+= xineramaproto>=1.1.1
11BUILDLINK_PKGSRCDIR.xineramaproto?= ../../x11/xineramaproto 11BUILDLINK_PKGSRCDIR.xineramaproto?= ../../x11/xineramaproto
12 12
13.include "../../x11/libX11/buildlink3.mk" 13.include "../../x11/libX11/buildlink3.mk"
14.endif # XINERAMAPROTO_BUILDLINK3_MK 14.endif # XINERAMAPROTO_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -xineramaproto 16BUILDLINK_TREE+= -xineramaproto