Tue Nov 23 00:02:20 2010 UTC ()
add transforms for dri.pc.


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

--- src/share/mk/bsd.x11.mk 2010/10/22 16:48:38 1.90
+++ src/share/mk/bsd.x11.mk 2010/11/23 00:02:20 1.91
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.90 2010/10/22 16:48:38 yhardy Exp $ 1# $NetBSD: bsd.x11.mk,v 1.91 2010/11/23 00:02:20 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(USE_SSP) && (${USE_SSP} != "no") 13.if defined(USE_SSP) && (${USE_SSP} != "no")
14CPPFLAGS+= -DNO_ALLOCA 14CPPFLAGS+= -DNO_ALLOCA
@@ -311,26 +311,28 @@ pkgconfig-install: ${_PKGDEST.${_pkg}} @@ -311,26 +311,28 @@ pkgconfig-install: ${_PKGDEST.${_pkg}}
311 s,@GL_PC_CFLAGS@,,; \ 311 s,@GL_PC_CFLAGS@,,; \
312 s,@GLU_LIB@,GLU,; \ 312 s,@GLU_LIB@,GLU,; \
313 s,@GLU_PC_REQ@,gl,; \ 313 s,@GLU_PC_REQ@,gl,; \
314 s,@GLU_PC_REQ_PRIV@,,; \ 314 s,@GLU_PC_REQ_PRIV@,,; \
315 s,@GLU_PC_LIB_PRIV@,-lGLU,; \ 315 s,@GLU_PC_LIB_PRIV@,-lGLU,; \
316 s,@GLU_PC_CFLAGS@,,; \ 316 s,@GLU_PC_CFLAGS@,,; \
317 s,@GLUT_LIB@,glut,; \ 317 s,@GLUT_LIB@,glut,; \
318 s,@GLUT_PC_REQ_PRIV@,gl glu,; \ 318 s,@GLUT_PC_REQ_PRIV@,gl glu,; \
319 s,@GLUT_PC_LIB_PRIV@,-lglut,; \ 319 s,@GLUT_PC_LIB_PRIV@,-lglut,; \
320 s,@GLUT_PC_CFLAGS@,,; \ 320 s,@GLUT_PC_CFLAGS@,,; \
321 s,@GLW_PC_CFLAGS@,,; \ 321 s,@GLW_PC_CFLAGS@,,; \
322 s,@GLW_PC_REQ_PRIV@,x11 xt,; \ 322 s,@GLW_PC_REQ_PRIV@,x11 xt,; \
323 s,@GLW_PC_LIB_PRIV@,,; \ 323 s,@GLW_PC_LIB_PRIV@,,; \
 324 s,@DRI_DRIVER_DIR@,\\$$\{libdir\}/modules/dri,; \
 325 s,@DRI_PC_REQ_PRIV@,,; \
324 s,@GLW_LIB@,GLw,; \ 326 s,@GLW_LIB@,GLw,; \
325 s,@abi_ansic@,0.4,; \ 327 s,@abi_ansic@,0.4,; \
326 s,@abi_videodrv@,5.0,; \ 328 s,@abi_videodrv@,5.0,; \
327 s,@abi_xinput@,4.0,; \ 329 s,@abi_xinput@,4.0,; \
328 s,@abi_extension@,2.0,; \ 330 s,@abi_extension@,2.0,; \
329 s,@abi_font@,0.6,; \ 331 s,@abi_font@,0.6,; \
330 s,@fchown_define@,-DHAS_FCHOWN,; \ 332 s,@fchown_define@,-DHAS_FCHOWN,; \
331 s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \ 333 s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
332 -e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 &%g' \ 334 -e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 &%g' \
333 < ${.IMPSRC} > ${.TARGET}.tmp && \ 335 < ${.IMPSRC} > ${.TARGET}.tmp && \
334 mv -f ${.TARGET}.tmp ${.TARGET} 336 mv -f ${.TARGET}.tmp ${.TARGET}
335 337
336CLEANFILES+= ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/} 338CLEANFILES+= ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/}