Module Name: src
Committed By: mrg
Date: Thu Jun 11 05:34:22 UTC 2009
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.73 src/share/mk/bsd.x11.mk:1.74
--- src/share/mk/bsd.x11.mk:1.73 Wed Jun 10 08:28:20 2009
+++ src/share/mk/bsd.x11.mk Thu Jun 11 05:34:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.73 2009/06/10 08:28:20 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.74 2009/06/11 05:34:22 mrg Exp $
.include <bsd.init.mk>
@@ -130,7 +130,7 @@
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)"
+XORG_VERSION_CURRENT="(((1) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)"
.endif
PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
@@ -279,6 +279,8 @@
s,@sdkdir@,\\$$\{includedir\}/xorg,; \
s,@PIXMAN_CFLAGS@,,; \
s,@LIB_DIR@,/lib,; \
+ s,@INSTALL_LIB_DIR@,\\$$\{prefix\}/lib,; \
+ s,@INSTALL_INC_DIR@,\\$$\{prefix\}/include,; \
s,@XKBPROTO_REQUIRES@,kbproto,; \
s,@FREETYPE_REQUIRES@,freetype2,; \
s,@EXPAT_LIBS@,-lexpat,; \
@@ -288,6 +290,9 @@
s,@X11_EXTRA_DEPS@,,; \
s,@XTHREAD_CFLAGS@,-D_REENTRANT,; \
s,@XTHREADLIB@,-lpthread,; \
+ s,@GL_PC_REQ_PRIV@,x11 xext,; \
+ s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
+ s,@GL_PC_CFLAGS@,,; \
s,@fchown_define@,-DHAS_FCHOWN,; \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
-e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 &%g' \
