Tue Aug 24 06:29:18 2021 UTC ()
xorg-server is now at 1.20.13.


(mrg)
diff -r1.140 -r1.141 src/share/mk/bsd.x11.mk
cvs diff -r1.140 -r1.141 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2021/07/11 00:13:49 1.140
+++ src/share/mk/bsd.x11.mk 2021/08/24 06:29:18 1.141
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.140 2021/07/11 00:13:49 mrg Exp $ 1# $NetBSD: bsd.x11.mk,v 1.141 2021/08/24 06:29:18 mrg Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5BINDIR= ${X11BINDIR} 5BINDIR= ${X11BINDIR}
6LIBDIR= ${X11USRLIBDIR} 6LIBDIR= ${X11USRLIBDIR}
7MANDIR= ${X11MANDIR} 7MANDIR= ${X11MANDIR}
8 8
9COPTS+= -fno-strict-aliasing 9COPTS+= -fno-strict-aliasing
10 10
11.include <bsd.sys.mk> 11.include <bsd.sys.mk>
12 12
13.if !defined(NOSSP) && (${USE_SSP:Uno} != "no") 13.if !defined(NOSSP) && (${USE_SSP:Uno} != "no")
14CPPFLAGS+= -DNO_ALLOCA 14CPPFLAGS+= -DNO_ALLOCA
@@ -123,27 +123,27 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64 @@ -123,27 +123,27 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64
123.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old" 123.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
124X11FLAGS.LOADABLE= -DXFree86LOADER 124X11FLAGS.LOADABLE= -DXFree86LOADER
125.endif 125.endif
126X11FLAGS.LOADABLE+= ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :} 126X11FLAGS.LOADABLE+= ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
127.endif 127.endif
128 128
129# XXX FIX ME 129# XXX FIX ME
130XORG_SERVER_MAJOR= 1 130XORG_SERVER_MAJOR= 1
131.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old" 131.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
132XORG_SERVER_MINOR= 10 132XORG_SERVER_MINOR= 10
133XORG_SERVER_TEENY= 6 133XORG_SERVER_TEENY= 6
134.else 134.else
135XORG_SERVER_MINOR= 20 135XORG_SERVER_MINOR= 20
136XORG_SERVER_TEENY= 12 136XORG_SERVER_TEENY= 13
137.endif 137.endif
138 138
139XVENDORNAMESHORT= '"X.Org"' 139XVENDORNAMESHORT= '"X.Org"'
140XVENDORNAME= '"The X.Org Foundation"' 140XVENDORNAME= '"The X.Org Foundation"'
141XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"' 141XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"'
142__XKBDEFRULES__= '"xorg"' 142__XKBDEFRULES__= '"xorg"'
143XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \ 143XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
144 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\" 144 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
145 145
146XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)" 146XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
147 147
148PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \ 148PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
149 match($$1, "([0-9]+\\.)+[0-9]+"); \ 149 match($$1, "([0-9]+\\.)+[0-9]+"); \