[src/trunk]: src install dri.pc.

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

details:   https://anonhg.NetBSD.org/src/rev/f710f98b3e2b
branches:  trunk
changeset: 758972:f710f98b3e2b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Nov 22 21:05:27 2010 +0000

description:
install dri.pc.
put the Mesa version into it's own makefile, and share it.  there
are now 4 references to it.

diffstat:

 distrib/sets/lists/xcomp/mi             |  3 ++-
 external/mit/xorg/lib/dri/Makefile      |  8 +++++++-
 external/mit/xorg/lib/libGL/Makefile    |  5 +++--
 external/mit/xorg/lib/libGL/mesa-ver.mk |  3 +++
 external/mit/xorg/lib/libGLU/Makefile   |  5 +++--
 external/mit/xorg/lib/libglut/Makefile  |  5 +++--
 6 files changed, 21 insertions(+), 8 deletions(-)

diffs (101 lines):

diff -r 263becc2049a -r f710f98b3e2b distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Mon Nov 22 21:04:27 2010 +0000
+++ b/distrib/sets/lists/xcomp/mi       Mon Nov 22 21:05:27 2010 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.116 2010/11/21 20:45:02 mrg Exp $
+#       $NetBSD: mi,v 1.117 2010/11/22 21:05:27 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -6389,6 +6389,7 @@
 ./usr/X11R7/lib/pkgconfig/bigreqsproto.pc              -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/compositeproto.pc            -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/damageproto.pc               -unknown-       xorg
+./usr/X11R7/lib/pkgconfig/dri.pc                       -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/dri2proto.pc                 -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/evieproto.pc                 -unknown-       xorg
 ./usr/X11R7/lib/pkgconfig/fixesproto.pc                        -unknown-       xorg
diff -r 263becc2049a -r f710f98b3e2b external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile        Mon Nov 22 21:04:27 2010 +0000
+++ b/external/mit/xorg/lib/dri/Makefile        Mon Nov 22 21:05:27 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/11/18 08:41:54 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2010/11/22 21:05:30 mrg Exp $
 
 SUBDIR=                libmesa .WAIT
 
@@ -17,4 +17,10 @@
 
 SUBDIR+=       swrast
 
+PKGCONFIG=     dri
+PKGDIST.dri=   ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.dri= ${MESA_VER}
+
 .include <bsd.subdir.mk>
+.include <bsd.x11.mk>
diff -r 263becc2049a -r f710f98b3e2b external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Mon Nov 22 21:04:27 2010 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Mon Nov 22 21:05:27 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2010/07/19 05:34:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2010/11/22 21:05:29 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -106,7 +106,8 @@
 
 PKGCONFIG=     gl
 PKGDIST.gl=    ${X11SRCDIR.MesaLib}/src/mesa
-PKGCONFIG_VERSION.gl=  7.8.2
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.gl=  ${MESA_VER}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 263becc2049a -r f710f98b3e2b external/mit/xorg/lib/libGL/mesa-ver.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libGL/mesa-ver.mk   Mon Nov 22 21:05:27 2010 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: mesa-ver.mk,v 1.1 2010/11/22 21:05:29 mrg Exp $
+
+MESA_VER=      7.8.2
diff -r 263becc2049a -r f710f98b3e2b external/mit/xorg/lib/libGLU/Makefile
--- a/external/mit/xorg/lib/libGLU/Makefile     Mon Nov 22 21:04:27 2010 +0000
+++ b/external/mit/xorg/lib/libGLU/Makefile     Mon Nov 22 21:05:27 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2010/07/19 05:34:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2010/11/22 21:05:29 mrg Exp $
 
 NOLINT=                1       # XTODO: tess.ln SIGSEGVs lint :(
 
@@ -84,7 +84,8 @@
 
 PKGCONFIG=     glu
 PKGDIST.glu=   ${X11SRCDIR.MesaLib}/src/glu
-PKGCONFIG_VERSION.glu= 7.8.2
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.glu= ${MESA_VER}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 263becc2049a -r f710f98b3e2b external/mit/xorg/lib/libglut/Makefile
--- a/external/mit/xorg/lib/libglut/Makefile    Mon Nov 22 21:04:27 2010 +0000
+++ b/external/mit/xorg/lib/libglut/Makefile    Mon Nov 22 21:05:27 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2010/07/19 05:34:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2010/11/22 21:05:29 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -74,7 +74,8 @@
 
 PKGCONFIG=     glut
 PKGDIST.glut=  ${X11SRCDIR.MesaGLUT}/src/glut/glx
-PKGCONFIG_VERSION.glut=        7.8.2
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.glut=        ${MESA_VER}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>