Sat Jan 7 22:34:56 2017 UTC ()
bump required xproto to 7.0.31, as per configure test/changelog.


(maya)
diff -r1.12 -r1.13 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.19 -r1.20 pkgsrc/x11/modular-xorg-server/buildlink3.mk
cvs diff -r1.12 -r1.13 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2016/11/16 10:14:36 1.12
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2017/01/07 22:34:56 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.12 2016/11/16 10:14:36 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.13 2017/01/07 22:34:56 maya Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4 4
5XORG_VERSION= 1.19.0 5XORG_VERSION= 1.19.0
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -98,27 +98,27 @@ PLIST.sparc= yes @@ -98,27 +98,27 @@ PLIST.sparc= yes
98# Workaround for PR#41556. 98# Workaround for PR#41556.
99# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 99# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
100CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no 100CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no
101 101
102INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 102INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
103 103
104BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 104BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
105BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 105BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
106BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 106BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
107BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 107BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
108BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 108BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
109BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 109BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
110BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 110BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
111BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.28 111BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.31
112BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 112BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
113BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 113BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
114BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 114BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
115BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0 115BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
116BUILDLINK_API_DEPENDS.dri+= dri>=7.8 116BUILDLINK_API_DEPENDS.dri+= dri>=7.8
117BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 117BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
118BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16 118BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
119BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6 119BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
120BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 120BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
121BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 121BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
122BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 122BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
123BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 123BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
124BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 124BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
cvs diff -r1.19 -r1.20 pkgsrc/x11/modular-xorg-server/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/buildlink3.mk 2016/11/16 10:14:36 1.19
+++ pkgsrc/x11/modular-xorg-server/buildlink3.mk 2017/01/07 22:34:56 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.19 2016/11/16 10:14:36 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2017/01/07 22:34:56 maya Exp $
2 2
3BUILDLINK_TREE+= modular-xorg-server 3BUILDLINK_TREE+= modular-xorg-server
4 4
5.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK) 5.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK)
6MODULAR_XORG_SERVER_BUILDLINK3_MK:= 6MODULAR_XORG_SERVER_BUILDLINK3_MK:=
7 7
8.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
9 9
10USE_OLD_MODULAR_XORG_SERVER?= no 10USE_OLD_MODULAR_XORG_SERVER?= no
11 11
12.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS]) 12.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
13BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17 13BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17
14BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server112 14BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server112
@@ -32,19 +32,19 @@ BUILDLINK_DEPMETHOD.libpciaccess= full @@ -32,19 +32,19 @@ BUILDLINK_DEPMETHOD.libpciaccess= full
32.include "../../x11/libXfont2/buildlink3.mk" 32.include "../../x11/libXfont2/buildlink3.mk"
33.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build 33.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
34.include "../../x11/resourceproto/buildlink3.mk" 34.include "../../x11/resourceproto/buildlink3.mk"
35.include "../../x11/scrnsaverproto/buildlink3.mk" 35.include "../../x11/scrnsaverproto/buildlink3.mk"
36.include "../../x11/presentproto/buildlink3.mk" 36.include "../../x11/presentproto/buildlink3.mk"
37.endif 37.endif
38.include "../../x11/inputproto/buildlink3.mk" 38.include "../../x11/inputproto/buildlink3.mk"
39BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 39BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
40.include "../../x11/randrproto/buildlink3.mk" 40.include "../../x11/randrproto/buildlink3.mk"
41.include "../../x11/renderproto/buildlink3.mk" 41.include "../../x11/renderproto/buildlink3.mk"
42.include "../../x11/videoproto/buildlink3.mk" 42.include "../../x11/videoproto/buildlink3.mk"
43.include "../../x11/xextproto/buildlink3.mk" 43.include "../../x11/xextproto/buildlink3.mk"
44.include "../../x11/xf86driproto/buildlink3.mk" 44.include "../../x11/xf86driproto/buildlink3.mk"
45BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.28 45BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.31
46.include "../../x11/xproto/buildlink3.mk" 46.include "../../x11/xproto/buildlink3.mk"
47.include "../../x11/xineramaproto/buildlink3.mk" 47.include "../../x11/xineramaproto/buildlink3.mk"
48.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK 48.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
49 49
50BUILDLINK_TREE+= -modular-xorg-server 50BUILDLINK_TREE+= -modular-xorg-server