Thu Jun 11 05:34:22 2009 UTC ()
update XORG_VERSION_CURRENT.
update the pkgconfig sed script to handle newer pixman.

XXX: should make the pkgconfig sed script barf it it ends up leaving
XXX: behind something that looks like "@.*@", i think.


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

--- src/share/mk/bsd.x11.mk 2009/06/10 08:28:20 1.73
+++ src/share/mk/bsd.x11.mk 2009/06/11 05:34:22 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.73 2009/06/10 08:28:20 mrg Exp $ 1# $NetBSD: bsd.x11.mk,v 1.74 2009/06/11 05:34:22 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.if defined(USE_SSP) && (${USE_SSP} != "no") 11.if defined(USE_SSP) && (${USE_SSP} != "no")
12CPPFLAGS+= -DNO_ALLOCA 12CPPFLAGS+= -DNO_ALLOCA
13.endif 13.endif
14 14
@@ -120,27 +120,27 @@ X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_ @@ -120,27 +120,27 @@ X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_
120 -fno-merge-constants 120 -fno-merge-constants
121.endif 121.endif
122  122
123# XXX FIX ME 123# XXX FIX ME
124.if ${X11FLAVOUR} == "Xorg" 124.if ${X11FLAVOUR} == "Xorg"
125XVENDORNAMESHORT= '"X.Org"' 125XVENDORNAMESHORT= '"X.Org"'
126XVENDORNAME= '"The X.Org Foundation"' 126XVENDORNAME= '"The X.Org Foundation"'
127XORG_RELEASE= '"Release 1.4.2"' 127XORG_RELEASE= '"Release 1.4.2"'
128__XKBDEFRULES__= '"xorg"' 128__XKBDEFRULES__= '"xorg"'
129XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \ 129XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
130 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\" 130 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
131 131
132# XXX oh yeah, fix me later 132# XXX oh yeah, fix me later
133XORG_VERSION_CURRENT="(((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)" 133XORG_VERSION_CURRENT="(((1) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)"
134.endif 134.endif
135 135
136PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \ 136PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
137 match($$1, "([0-9]+\\.)+[0-9]+"); \ 137 match($$1, "([0-9]+\\.)+[0-9]+"); \
138 version = substr($$1, RSTART, RLENGTH); \ 138 version = substr($$1, RSTART, RLENGTH); \
139 } END { print version }' 139 } END { print version }'
140 140
141 141
142# Extract X11VERSION 142# Extract X11VERSION
143PRINTX11VERSION=${TOOL_AWK} ' \ 143PRINTX11VERSION=${TOOL_AWK} ' \
144 /^\#define XF86_VERSION_MAJOR/ {major = $$3} \ 144 /^\#define XF86_VERSION_MAJOR/ {major = $$3} \
145 /^\#define XF86_VERSION_MINOR/ {minor = $$3} \ 145 /^\#define XF86_VERSION_MINOR/ {minor = $$3} \
146 /^\#define XF86_VERSION_PATCH/ {patch = $$3} \ 146 /^\#define XF86_VERSION_PATCH/ {patch = $$3} \
@@ -269,35 +269,40 @@ pkgconfig-install: ${_PKGDEST.${_pkg}} @@ -269,35 +269,40 @@ pkgconfig-install: ${_PKGDEST.${_pkg}}
269 s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \ 269 s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \
270 s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \ 270 s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \
271 s,@PACKAGE_VERSION@,$${_pkg_version},; \ 271 s,@PACKAGE_VERSION@,$${_pkg_version},; \
272 s,@VERSION@,$${_pkg_version},; \ 272 s,@VERSION@,$${_pkg_version},; \
273 s,@COMPOSITEEXT_VERSION@,$${_pkg_version%.*},; \ 273 s,@COMPOSITEEXT_VERSION@,$${_pkg_version%.*},; \
274 s,@DAMAGEEXT_VERSION@,$${_pkg_version%.*},; \ 274 s,@DAMAGEEXT_VERSION@,$${_pkg_version%.*},; \
275 s,@FIXESEXT_VERSION@,$${_pkg_version%.*},; \ 275 s,@FIXESEXT_VERSION@,$${_pkg_version%.*},; \
276 s,@RANDR_VERSION@,$${_pkg_version%.*},; \ 276 s,@RANDR_VERSION@,$${_pkg_version%.*},; \
277 s,@RENDER_VERSION@,$${_pkg_version%.*}," \ 277 s,@RENDER_VERSION@,$${_pkg_version%.*}," \
278 -e "s,@moduledir@,\\$$\{libdir\}/modules,; \ 278 -e "s,@moduledir@,\\$$\{libdir\}/modules,; \
279 s,@sdkdir@,\\$$\{includedir\}/xorg,; \ 279 s,@sdkdir@,\\$$\{includedir\}/xorg,; \
280 s,@PIXMAN_CFLAGS@,,; \ 280 s,@PIXMAN_CFLAGS@,,; \
281 s,@LIB_DIR@,/lib,; \ 281 s,@LIB_DIR@,/lib,; \
 282 s,@INSTALL_LIB_DIR@,\\$$\{prefix\}/lib,; \
 283 s,@INSTALL_INC_DIR@,\\$$\{prefix\}/include,; \
282 s,@XKBPROTO_REQUIRES@,kbproto,; \ 284 s,@XKBPROTO_REQUIRES@,kbproto,; \
283 s,@FREETYPE_REQUIRES@,freetype2,; \ 285 s,@FREETYPE_REQUIRES@,freetype2,; \
284 s,@EXPAT_LIBS@,-lexpat,; \ 286 s,@EXPAT_LIBS@,-lexpat,; \
285 s,@FREETYPE_LIBS@,-lfreetype,; \ 287 s,@FREETYPE_LIBS@,-lfreetype,; \
286 s,@DEP_CFLAGS@,,; \ 288 s,@DEP_CFLAGS@,,; \
287 s,@DEP_LIBS@,,; \ 289 s,@DEP_LIBS@,,; \
288 s,@X11_EXTRA_DEPS@,,; \ 290 s,@X11_EXTRA_DEPS@,,; \
289 s,@XTHREAD_CFLAGS@,-D_REENTRANT,; \ 291 s,@XTHREAD_CFLAGS@,-D_REENTRANT,; \
290 s,@XTHREADLIB@,-lpthread,; \ 292 s,@XTHREADLIB@,-lpthread,; \
 293 s,@GL_PC_REQ_PRIV@,x11 xext,; \
 294 s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
 295 s,@GL_PC_CFLAGS@,,; \
291 s,@fchown_define@,-DHAS_FCHOWN,; \ 296 s,@fchown_define@,-DHAS_FCHOWN,; \
292 s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \ 297 s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
293 -e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 &%g' \ 298 -e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 &%g' \
294 < ${.IMPSRC} > ${.TARGET}.tmp && \ 299 < ${.IMPSRC} > ${.TARGET}.tmp && \
295 mv -f ${.TARGET}.tmp ${.TARGET} 300 mv -f ${.TARGET}.tmp ${.TARGET}
296 301
297CLEANFILES+= ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/} 302CLEANFILES+= ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/}
298.endif 303.endif
299 304
300# 305#
301# APPDEFS (app defaults) handling 306# APPDEFS (app defaults) handling
302# 307#
303.if defined(APPDEFS) # { 308.if defined(APPDEFS) # {