Wed Jun 10 17:28:07 2009 UTC ()
Use correct macros for installation, from FUKAUMI Naoki in PR 41563.
While here, fix .pc files (were missing -Wl,-R).

Bump PKGREVISION.


(wiz)
diff -r1.77 -r1.78 pkgsrc/graphics/MesaLib/Makefile
diff -r1.20 -r1.21 pkgsrc/graphics/MesaLib/PLIST
diff -r1.63 -r1.64 pkgsrc/graphics/MesaLib/distinfo
diff -r1.14 -r1.15 pkgsrc/graphics/MesaLib/patches/patch-ad
diff -r0 -r1.10 pkgsrc/graphics/MesaLib/patches/patch-ah
cvs diff -r1.77 -r1.78 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2009/06/10 10:47:22 1.77
+++ pkgsrc/graphics/MesaLib/Makefile 2009/06/10 17:28:06 1.78
@@ -1,30 +1,36 @@ @@ -1,30 +1,36 @@
1# $NetBSD: Makefile,v 1.77 2009/06/10 10:47:22 hasso Exp $ 1# $NetBSD: Makefile,v 1.78 2009/06/10 17:28:06 wiz Exp $
2 2
3PKGNAME= MesaLib-${MESA_PKGVERSION} 3PKGNAME= MesaLib-${MESA_PKGVERSION}
 4PKGREVISION= 2
4COMMENT= Graphics library similar to SGI's OpenGL 5COMMENT= Graphics library similar to SGI's OpenGL
5PKGREVISION= 1 
6 6
7MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ 7MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
8 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \ 8 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \
9 xmesa_xf86.h 9 xmesa_xf86.h
10 10
11MESA_HEADERS+= internal/dri_interface.h internal/sarea.h 11MESA_HEADERS+= internal/dri_interface.h internal/sarea.h
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15BUILD_DEFS+= MESA_HZ 15BUILD_DEFS+= MESA_HZ
16PLIST_VARS= dri nodri 16PLIST_VARS= dri nodri
17 17
 18PKGCONFIG_OVERRIDE+= src/mesa/drivers/dri/dri.pc.in
 19PKGCONFIG_OVERRIDE+= src/mesa/gl.pc.in
 20PKGCONFIG_OVERRIDE+= src/glw/glw.pc.in
 21# no configure stage
 22PKGCONFIG_OVERRIDE_STAGE= pre-build
 23
18.include "glx-config.mk" 24.include "glx-config.mk"
19.include "../../graphics/Mesa/Makefile.lib" 25.include "../../graphics/Mesa/Makefile.lib"
20.include "options.mk" 26.include "options.mk"
21 27
22.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) 28.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
23## 29##
24## NetBSD 2.x and earlier require pthread stubs 30## NetBSD 2.x and earlier require pthread stubs
25## 31##
26. include "../../devel/pthread-stublib/buildlink3.mk" 32. include "../../devel/pthread-stublib/buildlink3.mk"
27PTHREAD_STUBLIB= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub 33PTHREAD_STUBLIB= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub
28.elif !empty(MACHINE_PLATFORM:MNetBSD-*) 34.elif !empty(MACHINE_PLATFORM:MNetBSD-*)
29## 35##
30## NetBSD 3.x and later have pthread stubs in libc 36## NetBSD 3.x and later have pthread stubs in libc
@@ -53,14 +59,16 @@ post-extract: @@ -53,14 +59,16 @@ post-extract:
53 ${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86 59 ${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86
54 ${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86 60 ${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86
55 ${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh 61 ${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh
56 for fn in ${RM_PATCH_BACKUP_DIRS}; do \ 62 for fn in ${RM_PATCH_BACKUP_DIRS}; do \
57 ${RM} -f ${WRKSRC}/$${fn}/*.orig; \ 63 ${RM} -f ${WRKSRC}/$${fn}/*.orig; \
58 done 64 done
59 65
60pre-install: 66pre-install:
61 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL/internal 67 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL/internal
62 68
63pre-build: 69pre-build:
64 cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs 70 cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
65 71
 72# no configure phase
 73.include "../../mk/configure/pkg-config-override.mk"
66.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/graphics/MesaLib/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/PLIST 2009/06/05 11:10:35 1.20
+++ pkgsrc/graphics/MesaLib/PLIST 2009/06/10 17:28:06 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2009/06/05 11:10:35 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.21 2009/06/10 17:28:06 wiz Exp $
2include/GL/GLwDrawA.h 2include/GL/GLwDrawA.h
3include/GL/GLwDrawAP.h 3include/GL/GLwDrawAP.h
4include/GL/GLwMDrawA.h 4include/GL/GLwMDrawA.h
5include/GL/GLwMDrawAP.h 5include/GL/GLwMDrawAP.h
6include/GL/gl.h 6include/GL/gl.h
7include/GL/gl_mangle.h 7include/GL/gl_mangle.h
8include/GL/glext.h 8include/GL/glext.h
9include/GL/glx.h 9include/GL/glx.h
10include/GL/glx_mangle.h 10include/GL/glx_mangle.h
11include/GL/glxext.h 11include/GL/glxext.h
12include/GL/internal/dri_interface.h 12include/GL/internal/dri_interface.h
13include/GL/internal/sarea.h 13include/GL/internal/sarea.h
14include/GL/osmesa.h 14include/GL/osmesa.h
@@ -19,18 +19,19 @@ ${PLIST.dri}lib/dri/i810_dri.la @@ -19,18 +19,19 @@ ${PLIST.dri}lib/dri/i810_dri.la
19${PLIST.dri}lib/dri/i915_dri.la 19${PLIST.dri}lib/dri/i915_dri.la
20${PLIST.dri}lib/dri/i965_dri.la 20${PLIST.dri}lib/dri/i965_dri.la
21${PLIST.dri}lib/dri/mach64_dri.la 21${PLIST.dri}lib/dri/mach64_dri.la
22${PLIST.dri}lib/dri/mga_dri.la 22${PLIST.dri}lib/dri/mga_dri.la
23${PLIST.dri}lib/dri/r128_dri.la 23${PLIST.dri}lib/dri/r128_dri.la
24${PLIST.dri}lib/dri/r200_dri.la 24${PLIST.dri}lib/dri/r200_dri.la
25${PLIST.dri}lib/dri/r300_dri.la 25${PLIST.dri}lib/dri/r300_dri.la
26${PLIST.dri}lib/dri/radeon_dri.la 26${PLIST.dri}lib/dri/radeon_dri.la
27${PLIST.dri}lib/dri/savage_dri.la 27${PLIST.dri}lib/dri/savage_dri.la
28${PLIST.dri}lib/dri/sis_dri.la 28${PLIST.dri}lib/dri/sis_dri.la
29${PLIST.dri}lib/dri/swrast_dri.la 29${PLIST.dri}lib/dri/swrast_dri.la
30${PLIST.dri}lib/dri/tdfx_dri.la 30${PLIST.dri}lib/dri/tdfx_dri.la
31${PLIST.dri}lib/dri/unichrome_dri.la 31${PLIST.dri}lib/dri/unichrome_dri.la
 32lib/pkgconfig/dri.pc
32lib/pkgconfig/gl.pc 33lib/pkgconfig/gl.pc
33lib/pkgconfig/glw.pc 34lib/pkgconfig/glw.pc
34${PLIST.dri}@dirrm lib/dri 35${PLIST.dri}@dirrm lib/dri
35@unexec ${RMDIR} %D/include/GL/internal 2>/dev/null || ${TRUE} 36@unexec ${RMDIR} %D/include/GL/internal 2>/dev/null || ${TRUE}
36@unexec ${RMDIR} %D/include/GL 2>/dev/null || ${TRUE} 37@unexec ${RMDIR} %D/include/GL 2>/dev/null || ${TRUE}
cvs diff -r1.63 -r1.64 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2009/06/10 10:47:22 1.63
+++ pkgsrc/graphics/MesaLib/distinfo 2009/06/10 17:28:07 1.64
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1$NetBSD: distinfo,v 1.63 2009/06/10 10:47:22 hasso Exp $ 1$NetBSD: distinfo,v 1.64 2009/06/10 17:28:07 wiz Exp $
2 2
3SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa 3SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa
4RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5 4RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5
5Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes 5Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes
6SHA1 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 85f357345d71dfe60b785f0cbb03d1e070841c2d 6SHA1 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 85f357345d71dfe60b785f0cbb03d1e070841c2d
7RMD160 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = caa69b7f2aa7136377cda2f690699415396c64ab 7RMD160 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = caa69b7f2aa7136377cda2f690699415396c64ab
8Size (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 328646 bytes 8Size (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 328646 bytes
9SHA1 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = fe70945ccf2c08d18ae4e83000018f0400352065 9SHA1 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = fe70945ccf2c08d18ae4e83000018f0400352065
10RMD160 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = e70b8fd203325e676d90485632bf266e39d46a7e 10RMD160 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = e70b8fd203325e676d90485632bf266e39d46a7e
11Size (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = 3371577 bytes 11Size (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = 3371577 bytes
12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e 13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
15SHA1 (patch-ad) = 47da546b7cebd9d05a9122b606e71c0d83e98a05 15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab 16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04 17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7 18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
 19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
19SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87 20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
20SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
21SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 22SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
22SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 23SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
23SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905 24SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
24SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907 25SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
25SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7 26SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
26SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32 27SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
27SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3 28SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
28SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a 29SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
29SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f 30SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
30SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac 31SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
31SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a 32SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a
cvs diff -r1.14 -r1.15 pkgsrc/graphics/MesaLib/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-ad 2009/06/05 11:10:35 1.14
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-ad 2009/06/10 17:28:07 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ad,v 1.14 2009/06/05 11:10:35 wiz Exp $ 1$NetBSD: patch-ad,v 1.15 2009/06/10 17:28:07 wiz Exp $
2 2
3--- src/mesa/Makefile.orig 2009-03-13 05:28:49 +0200 3--- src/mesa/Makefile.orig 2009-03-13 05:28:49 +0200
4+++ src/mesa/Makefile 2009-05-17 16:29:41 +0300 4+++ src/mesa/Makefile 2009-05-17 16:29:41 +0300
5@@ -9,19 +9,22 @@ include sources 5@@ -9,19 +9,22 @@ include sources
6 .SUFFIXES : .cpp 6 .SUFFIXES : .cpp
7  7
8 .c.o: 8 .c.o:
9- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ 9- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
10+ $(LIBTOOL) --mode=compile --tag=CC \ 10+ $(LIBTOOL) --mode=compile --tag=CC \
11+ $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(COPTS) $< -o $(@:.o=.lo) 11+ $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(COPTS) $< -o $(@:.o=.lo)
12  12
13 .cpp.o: 13 .cpp.o:
14- $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@ 14- $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
@@ -60,42 +60,42 @@ $NetBSD: patch-ad,v 1.14 2009/06/05 11:1 @@ -60,42 +60,42 @@ $NetBSD: patch-ad,v 1.14 2009/06/05 11:1
60 install-headers: 60 install-headers:
61- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL 61- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
62- $(INSTALL) -m 644 $(TOP)/include/GL/*.h \ 62- $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
63- $(DESTDIR)$(INSTALL_INC_DIR)/GL 63- $(DESTDIR)$(INSTALL_INC_DIR)/GL
64+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL 64+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL
65  65
66 install-libgl: default gl.pc install-headers 66 install-libgl: default gl.pc install-headers
67- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) 67- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
68- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig 68- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
69- $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ 69- $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
70- $(DESTDIR)$(INSTALL_LIB_DIR) 70- $(DESTDIR)$(INSTALL_LIB_DIR)
71- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig 71- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
72+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib 72+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
73+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig 73+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
74+ @if [ -f "$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la)" ]; then \ 74+ @if [ -f "$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la)" ]; then \
75+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \ 75+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
76+ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \ 76+ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \
77+ $(DESTDIR)$(INSTALL_DIR)/lib; \ 77+ $(DESTDIR)$(INSTALL_DIR)/lib; \
78+ fi 78+ fi
79+ $(BSD_INSTALL_DATA) gl.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig 79+ $(BSD_INSTALL_DATA) gl.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
80  80
81 install-osmesa: default osmesa.pc 81 install-osmesa: default osmesa.pc
82- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) 82- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
83- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig 83- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
84- $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ 84- $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
85- $(DESTDIR)$(INSTALL_LIB_DIR) 85- $(DESTDIR)$(INSTALL_LIB_DIR)
86- $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig 86- $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
87+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib 87+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
88+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig 88+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
89+ @if [ -f "$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la)" ]; then \ 89+ @if [ -f "$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la)" ]; then \
90+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \ 90+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
91+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \ 91+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
92+ $(DESTDIR)$(INSTALL_DIR)/lib; \ 92+ $(DESTDIR)$(INSTALL_DIR)/lib; \
93+ fi 93+ fi
94+ $(BSD_INSTALL_DATA) osmesa.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig 94+ $(BSD_INSTALL_DATA) osmesa.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
95  95
96 install-dri: default 96 install-dri: default
97 cd drivers/dri && $(MAKE) install 97 cd drivers/dri && $(MAKE) install
98@@ -144,7 +153,7 @@ tags: 98@@ -144,7 +153,7 @@ tags:
99 clean: 99 clean:
100 -rm -f */*.o 100 -rm -f */*.o
101 -rm -f */*/*.o 101 -rm -f */*/*.o
File Added: pkgsrc/graphics/MesaLib/patches/Attic/patch-ah
$NetBSD: patch-ah,v 1.10 2009/06/10 17:28:07 wiz Exp $

--- src/mesa/drivers/dri/Makefile.orig	2009-03-13 03:28:49.000000000 +0000
+++ src/mesa/drivers/dri/Makefile
@@ -38,11 +38,11 @@ install: dri.pc
 			(cd $$dir && $(MAKE) install) || exit 1 ; \
 		fi \
 	done
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
-	  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-	$(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
+	$(BSD_INSTALL_DATA) $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
+	$(BSD_INSTALL_DATA) dri.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
 
 
 clean: