From 9c34198ee99c491e529991b08756e4bba1bd7c3c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 10 Jun 2009 17:28:06 +0000
Subject: Use correct macros for installation, from FUKAUMI Naoki in PR 41563.
 While here, fix .pc files (were missing -Wl,-R).

Bump PKGREVISION.
---
 graphics/MesaLib/patches/patch-ad |  6 +++---
 graphics/MesaLib/patches/patch-ah | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 graphics/MesaLib/patches/patch-ah

(limited to 'graphics/MesaLib/patches')

diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
index 651a0631cda..6a16eb872b7 100644
--- a/graphics/MesaLib/patches/patch-ad
+++ b/graphics/MesaLib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.14 2009/06/05 11:10:35 wiz Exp $
+$NetBSD: patch-ad,v 1.15 2009/06/10 17:28:07 wiz Exp $
 
 --- src/mesa/Makefile.orig	2009-03-13 05:28:49 +0200
 +++ src/mesa/Makefile	2009-05-17 16:29:41 +0300
@@ -70,7 +70,7 @@ $NetBSD: patch-ad,v 1.14 2009/06/05 11:10:35 wiz Exp $
 -		$(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 @@ $NetBSD: patch-ad,v 1.14 2009/06/05 11:10:35 wiz Exp $
 -		$(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) \
diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah
new file mode 100644
index 00000000000..dce42ada965
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-ah
@@ -0,0 +1,21 @@
+$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:
-- 
cgit v1.2.3