get rid of INSTALLATION_PREFIX. From joerg@

3 files changed, 51 insertions, 49 deletions

diff --git a/graphics/MesaLib7/Makefile b/graphics/MesaLib7/Makefile
index 331a94eec96..609afcf7f33 100644
--- a/graphics/MesaLib7/Makefile
+++ b/graphics/MesaLib7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/04/05 17:01:37 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2015/09/25 00:40:11 tnn Exp $
 
 DISTNAME?=	${MESA_DISTNAME}
 PKGNAME=	MesaLib7-${MESA_PKGVERSION}
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
 COMMENT=	Graphics library similar to SGI's OpenGL
 
-INSTALLATION_PREFIX=	${LOCALBASE}/MesaLib7
+GNU_CONFIGURE_PREFIX=	${LOCALBASE}/MesaLib7
 
 DISTFILES+=		MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
 MESA_DISTNAME= 		MesaLib-${MESA_VERSION}
diff --git a/graphics/MesaLib7/PLIST b/graphics/MesaLib7/PLIST
index 8888aad2c3b..27b9a2a823d 100644
--- a/graphics/MesaLib7/PLIST
+++ b/graphics/MesaLib7/PLIST
@@ -1,46 +1,46 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/05 17:01:37 tnn Exp $
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
-include/GL/gl.h
-include/GL/gl_mangle.h
-include/GL/glext.h
-include/GL/glfbdev.h
-include/GL/glx.h
-include/GL/glx_mangle.h
-include/GL/glxext.h
-${PLIST.dri}include/GL/internal/dri_interface.h
-include/GL/mesa_wgl.h
-include/GL/osmesa.h
-include/GL/vms_x_fix.h
-include/GL/wglext.h
-include/GL/wmesa.h
-lib/libGL.so
-lib/libGL.so.1
-lib/libGL.so.1.2
-lib/libGLw.so
-lib/libGLw.so.1
-lib/libGLw.so.1.0.0
-${PLIST.nodri}lib/libOSMesa.so
-${PLIST.nodri}lib/libOSMesa.so.7
-${PLIST.nodri}lib/libOSMesa.so.7.11.0
-${PLIST.dri}lib/dri/i810_dri.so
-${PLIST.dri}lib/dri/i915_dri.so
-${PLIST.dri}lib/dri/i965_dri.so
-${PLIST.dri}lib/dri/mach64_dri.so
-${PLIST.dri}lib/dri/mga_dri.so
-${PLIST.dri}lib/dri/r128_dri.so
-${PLIST.dri}lib/dri/r200_dri.so
-${PLIST.dri}lib/dri/r300_dri.so
-${PLIST.dri}lib/dri/r600_dri.so
-${PLIST.dri}lib/dri/radeon_dri.so
-${PLIST.dri}lib/dri/savage_dri.so
-${PLIST.dri}lib/dri/sis_dri.so
-${PLIST.dri}lib/dri/swrast_dri.so
-${PLIST.dri}lib/dri/tdfx_dri.so
-${PLIST.dri}lib/dri/unichrome_dri.so
-${PLIST.dri}lib/pkgconfig/dri.pc
-lib/pkgconfig/gl.pc
-lib/pkgconfig/glw.pc
-${PLIST.nodri}lib/pkgconfig/osmesa.pc
+@comment $NetBSD: PLIST,v 1.2 2015/09/25 00:40:11 tnn Exp $
+MesaLib7/include/GL/GLwDrawA.h
+MesaLib7/include/GL/GLwDrawAP.h
+MesaLib7/include/GL/GLwMDrawA.h
+MesaLib7/include/GL/GLwMDrawAP.h
+MesaLib7/include/GL/gl.h
+MesaLib7/include/GL/gl_mangle.h
+MesaLib7/include/GL/glext.h
+MesaLib7/include/GL/glfbdev.h
+MesaLib7/include/GL/glx.h
+MesaLib7/include/GL/glx_mangle.h
+MesaLib7/include/GL/glxext.h
+${PLIST.dri}MesaLib7/include/GL/internal/dri_interface.h
+MesaLib7/include/GL/mesa_wgl.h
+MesaLib7/include/GL/osmesa.h
+MesaLib7/include/GL/vms_x_fix.h
+MesaLib7/include/GL/wglext.h
+MesaLib7/include/GL/wmesa.h
+MesaLib7/lib/libGL.so
+MesaLib7/lib/libGL.so.1
+MesaLib7/lib/libGL.so.1.2
+MesaLib7/lib/libGLw.so
+MesaLib7/lib/libGLw.so.1
+MesaLib7/lib/libGLw.so.1.0.0
+${PLIST.nodri}MesaLib7/lib/libOSMesa.so
+${PLIST.nodri}MesaLib7/lib/libOSMesa.so.7
+${PLIST.nodri}MesaLib7/lib/libOSMesa.so.7.11.0
+${PLIST.dri}MesaLib7/lib/dri/i810_dri.so
+${PLIST.dri}MesaLib7/lib/dri/i915_dri.so
+${PLIST.dri}MesaLib7/lib/dri/i965_dri.so
+${PLIST.dri}MesaLib7/lib/dri/mach64_dri.so
+${PLIST.dri}MesaLib7/lib/dri/mga_dri.so
+${PLIST.dri}MesaLib7/lib/dri/r128_dri.so
+${PLIST.dri}MesaLib7/lib/dri/r200_dri.so
+${PLIST.dri}MesaLib7/lib/dri/r300_dri.so
+${PLIST.dri}MesaLib7/lib/dri/r600_dri.so
+${PLIST.dri}MesaLib7/lib/dri/radeon_dri.so
+${PLIST.dri}MesaLib7/lib/dri/savage_dri.so
+${PLIST.dri}MesaLib7/lib/dri/sis_dri.so
+${PLIST.dri}MesaLib7/lib/dri/swrast_dri.so
+${PLIST.dri}MesaLib7/lib/dri/tdfx_dri.so
+${PLIST.dri}MesaLib7/lib/dri/unichrome_dri.so
+${PLIST.dri}MesaLib7/lib/pkgconfig/dri.pc
+MesaLib7/lib/pkgconfig/gl.pc
+MesaLib7/lib/pkgconfig/glw.pc
+${PLIST.nodri}MesaLib7/lib/pkgconfig/osmesa.pc
diff --git a/graphics/MesaLib7/buildlink3.mk b/graphics/MesaLib7/buildlink3.mk
index 568d1bca0bd..032cded7cce 100644
--- a/graphics/MesaLib7/buildlink3.mk
+++ b/graphics/MesaLib7/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/09/25 00:40:11 tnn Exp $
 
 BUILDLINK_TREE+=	MesaLib7
 
@@ -7,6 +7,8 @@ MESALIB7_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.MesaLib7+=	MesaLib7>=7.11.2
 BUILDLINK_PKGSRCDIR.MesaLib7?=		../../graphics/MesaLib7
+BUILDLINK_FNAME_TRANSFORM.MesaLib7+=	-e 's|MesaLib7/||'
+BUILDLINK_RPATHDIRS+=	MesaLib7/lib
 
 .include "../../mk/bsd.fast.prefs.mk"