[src/trunk]: src/share/mk add/fix some transforms for some font, GL and xcb ....

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49b66ac16010
branches:  trunk
changeset: 757110:49b66ac16010
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Aug 15 06:48:56 2010 +0000

description:
add/fix some transforms for some font, GL and xcb .pc files.

XXX: xcb still has pythondir=@pythondir@ in it.

diffstat:

 share/mk/bsd.x11.mk |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r e14348b5aa7d -r 49b66ac16010 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sun Aug 15 05:38:35 2010 +0000
+++ b/share/mk/bsd.x11.mk       Sun Aug 15 06:48:56 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.87 2010/07/18 07:05:39 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.88 2010/08/15 06:48:56 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -252,10 +252,6 @@
 # And yes, it has to be splitted in two otherwise it's too long
 # for sed to handle.
 
-# missing transforms: 
-#   @GLU_PC_REQ@
-#   @GLW_PC_REQ_PRIV@
-#   @GLW_PC_LIB_PRIV@
 # hacky transforms:
 #   @XCBPROTO_VERSION@
 
@@ -288,6 +284,10 @@
                s,@RANDR_VERSION@,$${_pkg_version%.*},; \
                s,@RENDER_VERSION@,$${_pkg_version%.*}," \
                -e "s,@LIBS@,,; \
+               s,@Z_LIBS@,-lz,; \
+               s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \
+               s,@xcbincludedir@,\\$$\{prefix\}/include/xcb,; \
+               s,@fontrootdir@,\\$$\{libdir\}/X11/fonts,; \
                s,@NEEDED@,," \
                -e "s,@moduledir@,\\$$\{libdir\}/modules,; \
                s,@sdkdir@,\\$$\{includedir\}/xorg,; \
@@ -296,7 +296,7 @@
                s,@INSTALL_LIB_DIR@,\\$$\{prefix\}/lib,; \
                s,@INSTALL_INC_DIR@,\\$$\{prefix\}/include,; \
                s,@XKBPROTO_REQUIRES@,kbproto,; \
-               s,@XCBPROTO_VERSION@,1.6,; \
+               s,@XCBPROTO_VERSION@,1.7,; \
                s,@FREETYPE_REQUIRES@,freetype2,; \
                s,@EXPAT_LIBS@,-lexpat,; \
                s,@FREETYPE_LIBS@,-lfreetype,; \
@@ -310,6 +310,7 @@
                s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
                s,@GL_PC_CFLAGS@,,; \
                s,@GLU_LIB@,GLU,; \
+               s,@GLU_PC_REQ@,osmesa,; \
                s,@GLU_PC_REQ_PRIV@,,; \
                s,@GLU_PC_LIB_PRIV@,-lGLU,; \
                s,@GLU_PC_CFLAGS@,,; \
@@ -318,6 +319,8 @@
                s,@GLUT_PC_LIB_PRIV@,-lglut,; \
                s,@GLUT_PC_CFLAGS@,,; \
                s,@GLW_PC_CFLAGS@,,; \
+               s,@GLW_PC_REQ_PRIV@,x11 xt,; \
+               s,@GLW_PC_LIB_PRIV@,,; \
                s,@GLW_LIB@,GLw,; \
                s,@abi_ansic@,0.4,; \
                s,@abi_videodrv@,5.0,; \