Sun Apr 5 17:17:15 2015 UTC ()
Switch to MesaLib7


(tnn)
diff -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server112/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server112/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server112/Attic/Makefile 2015/04/03 09:46:18 1.1
+++ pkgsrc/x11/modular-xorg-server112/Attic/Makefile 2015/04/05 17:17:15 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2015/04/03 09:46:18 tnn Exp $ 1# $NetBSD: Makefile,v 1.2 2015/04/05 17:17:15 tnn Exp $
2 2
3DISTNAME= xorg-server-1.12.4 3DISTNAME= xorg-server-1.12.4
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 12 5PKGREVISION= 12
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
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Modular X11 server from modular X.org 12COMMENT= Modular X11 server from modular X.org
13 13
14SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 14SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
@@ -30,26 +30,32 @@ XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX @@ -30,26 +30,32 @@ XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX
30 30
31CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 31CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
32CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 32CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
33 33
34.if !empty(USE_TOOLS:Mauto*) 34.if !empty(USE_TOOLS:Mauto*)
35TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 35TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
36.endif 36.endif
37 37
38DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 38DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
39DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 39DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42 42
 43.if empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
 44PKG_FAIL_REASON+= "This is a legacy X.org server package."
 45PKG_FAIL_REASON+= "You must set USE_OLD_MODULAR_XORG_SERVER=yes in mk.conf"
 46PKG_FAIL_REASON+= "to make xf86-* drivers use the old ABI."
 47.endif
 48
43.if ${OPSYS} == "NetBSD" 49.if ${OPSYS} == "NetBSD"
44CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 50CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
45CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 51CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
46# TLS is not supported by NetBSD<6 52# TLS is not supported by NetBSD<6
47. if !empty(OS_VERSION:M[0-5].*) 53. if !empty(OS_VERSION:M[0-5].*)
48CONFIGURE_ENV+= ac_cv_tls=no 54CONFIGURE_ENV+= ac_cv_tls=no
49CONFIGURE_ARGS+= --disable-glx-tls 55CONFIGURE_ARGS+= --disable-glx-tls
50. endif 56. endif
51.endif 57.endif
52CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 58CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
53 59
54CONFIGURE_ARGS+= --enable-xorg 60CONFIGURE_ARGS+= --enable-xorg
55 61
@@ -91,27 +97,27 @@ SUNOS_ARCH= amd64 @@ -91,27 +97,27 @@ SUNOS_ARCH= amd64
91. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" 97. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
92SUNOS_ARCH= sparcv8plus 98SUNOS_ARCH= sparcv8plus
93. endif 99. endif
94.endif 100.endif
95 101
96# Workaround for PR#41556. 102# Workaround for PR#41556.
97# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 103# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
98.if ${OPSYS} == "NetBSD" 104.if ${OPSYS} == "NetBSD"
99CONFIGURE_ENV+= ac_cv_header_sys_event_h=no 105CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
100.endif 106.endif
101 107
102INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 108INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
103 109
104BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0<10 110BUILDLINK_API_DEPENDS.MesaLib7+= MesaLib7>=7.8.0<10
105BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 111BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
106BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 112BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
107BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 113BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
108BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 114BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
109BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 115BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
110BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 116BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
111BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22 117BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22
112BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 118BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
113BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 119BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
114BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 120BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
115BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0 121BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
116BUILDLINK_API_DEPENDS.dri+= dri>=7.8 122BUILDLINK_API_DEPENDS.dri+= dri>=7.8
117BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 123BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
@@ -122,27 +128,27 @@ BUILDLINK_API_DEPENDS.pixman+= pixman>= @@ -122,27 +128,27 @@ BUILDLINK_API_DEPENDS.pixman+= pixman>=
122BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0 128BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0
123BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 129BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
124BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 130BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
125BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0 131BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
126 132
127BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 133BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
128CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 134CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
129 135
130.include "options.mk" 136.include "options.mk"
131 137
132.include "../../devel/ncurses/buildlink3.mk" 138.include "../../devel/ncurses/buildlink3.mk"
133.include "../../devel/zlib/buildlink3.mk" 139.include "../../devel/zlib/buildlink3.mk"
134.include "../../fonts/libfontenc/buildlink3.mk" 140.include "../../fonts/libfontenc/buildlink3.mk"
135.include "../../graphics/MesaLib/buildlink3.mk" 141.include "../../graphics/MesaLib7/buildlink3.mk"
136.include "../../security/openssl/buildlink3.mk" 142.include "../../security/openssl/buildlink3.mk"
137BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 143BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
138BUILDLINK_DEPMETHOD.libpciaccess= full 144BUILDLINK_DEPMETHOD.libpciaccess= full
139.include "../../sysutils/libpciaccess/buildlink3.mk" 145.include "../../sysutils/libpciaccess/buildlink3.mk"
140.include "../../x11/bigreqsproto/buildlink3.mk" 146.include "../../x11/bigreqsproto/buildlink3.mk"
141.include "../../x11/compositeproto/buildlink3.mk" 147.include "../../x11/compositeproto/buildlink3.mk"
142.include "../../x11/damageproto/buildlink3.mk" 148.include "../../x11/damageproto/buildlink3.mk"
143.include "../../x11/dri2proto/buildlink3.mk" 149.include "../../x11/dri2proto/buildlink3.mk"
144.include "../../x11/evieext/buildlink3.mk" 150.include "../../x11/evieext/buildlink3.mk"
145.include "../../x11/fixesproto/buildlink3.mk" 151.include "../../x11/fixesproto/buildlink3.mk"
146.include "../../x11/fontsproto/buildlink3.mk" 152.include "../../x11/fontsproto/buildlink3.mk"
147.include "../../x11/glproto/buildlink3.mk" 153.include "../../x11/glproto/buildlink3.mk"
148.include "../../x11/inputproto/buildlink3.mk" 154.include "../../x11/inputproto/buildlink3.mk"