pkg/41563: [PATCH] MesaLib s/$(INSTALL)/$(BSD_INSTALL_XXX)/ fixes

[fun%naobsd.org@localhost]

>Number:         41563
>Category:       pkg
>Synopsis:       [PATCH] MesaLib s/$(INSTALL)/$(BSD_INSTALL_XXX)/ fixes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 09 16:35:00 +0000 2009
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 5.0_STABLE
>Organization:
        FUKAUMI Naoki
>Environment:
System: NetBSD t105.naobsd.org 5.0_STABLE NetBSD 5.0_STABLE (T105) #0: Mon Jun 
8 17:25:14 JST 2009 
fun%t105.naobsd.org@localhost:/home/fun/src/sys/arch/amd64/compile/T105 amd64
Architecture: x86_64
Machine: amd64
>Description:
        while "make install", minstall is used with incorrect target
        directory in src/mesa/drivers/dri.

          :
        > ../../../../bin/minstall -d /GL/internal
        > ../../../../bin/minstall -m 0644 
../../../../include/GL/internal/dri_interface.h \
        >         /GL/internal
        > ../../../../bin/minstall -d /pkgconfig
        > ../../../../bin/minstall -m 0644 dri.pc /pkgconfig
          :
>How-To-Repeat:
        $ cd pkgsrc/graphics/MesaLib && make install
>Fix:
        patch attached.
        XXX *.pc files seem to be broken...

Index: Makefile
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/graphics/MesaLib/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- Makefile    5 Jun 2009 11:10:35 -0000       1.76
+++ Makefile    9 Jun 2009 16:04:04 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.76 2009/06/05 11:10:35 wiz Exp $
 
 PKGNAME=       MesaLib-${MESA_PKGVERSION}
+PKGREVISION=   1
 COMMENT=       Graphics library similar to SGI's OpenGL
 
 MESA_HEADERS=  gl.h gl_mangle.h glext.h glx.h glxext.h \
Index: PLIST
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/graphics/MesaLib/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- PLIST       5 Jun 2009 11:10:35 -0000       1.20
+++ PLIST       9 Jun 2009 16:02:06 -0000
@@ -29,6 +29,7 @@
 ${PLIST.dri}lib/dri/swrast_dri.la
 ${PLIST.dri}lib/dri/tdfx_dri.la
 ${PLIST.dri}lib/dri/unichrome_dri.la
+lib/pkgconfig/dri.pc
 lib/pkgconfig/gl.pc
 lib/pkgconfig/glw.pc
 ${PLIST.dri}@dirrm lib/dri
Index: distinfo
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/graphics/MesaLib/distinfo,v
retrieving revision 1.62
diff -u -r1.62 distinfo
--- distinfo    5 Jun 2009 11:10:35 -0000       1.62
+++ distinfo    9 Jun 2009 16:07:20 -0000
@@ -12,10 +12,11 @@
 SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
 SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e
 SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
-SHA1 (patch-ad) = 47da546b7cebd9d05a9122b606e71c0d83e98a05
+SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
 SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
 SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
 SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
+SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
 SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
 SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
 SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
Index: patches/patch-ad
===================================================================
RCS file: /home/fun/cvsroot/NetBSD/pkgsrc/graphics/MesaLib/patches/patch-ad,v
retrieving revision 1.14
diff -u -r1.14 patch-ad
--- patches/patch-ad    5 Jun 2009 11:10:35 -0000       1.14
+++ patches/patch-ad    9 Jun 2009 15:57:24 -0000
@@ -70,7 +70,7 @@
 -              $(DESTDIR)$(INSTALL_LIB_DIR)
 -      $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 +      $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+      $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
 +      @if [ -f "$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la)" ]; then \
 +              $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
 +                      $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \
@@ -85,7 +85,7 @@
 -              $(DESTDIR)$(INSTALL_LIB_DIR)
 -      $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 +      $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+      $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
 +      @if [ -f "$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la)" ]; then \
 +              $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
 +                      $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ah    9 Jun 2009 16:07:12 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- 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: