Flag a number of packages I use as supporting (user-)destdir.

apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".

6 files changed, 17 insertions, 14 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 33d1b0f2d7d..35e6c9530ed 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.52 2006/08/01 21:40:19 jlam Exp $
+# $NetBSD: Makefile.common,v 1.53 2006/10/09 12:52:35 joerg Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -21,6 +21,8 @@ MESA_VERSION=	6.4.2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/Mesa-${MESA_VERSION}
 BUILDING_MESA=	yes
 NO_CONFIGURE=	yes
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
index 4aeb06e573a..10ab059b885 100644
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.1 2006/08/01 21:40:19 jlam Exp $
+# $NetBSD: Makefile.lib,v 1.2 2006/10/09 12:52:35 joerg Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -48,5 +48,5 @@ Mesa-install-libs:
 	@for lib in "" ${INSTLIBS}; do					\
 		${TEST} -n "$$lib" || continue;				\
 		${LIBTOOL} --mode=install ${INSTALL_LIB}		\
-			$$lib ${PREFIX}/lib;				\
+			$$lib ${DESTDIR}${PREFIX}/lib;			\
 	done
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 881bc5baa32..c94f6475f81 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/08/01 21:40:19 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:35 joerg Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
 COMMENT=	OpenGL examples and Demos
@@ -21,7 +21,7 @@ pre-build:
 	cd ${WRKSRC} && ${RM} -fr src
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
 	cd ${WRKSRC}/progs && ${PAX}		\
 		-s ',^./.*Makefile.*,,'	\
 		-s ',^./CVS.*,,'		\
@@ -29,7 +29,7 @@ do-install:
 		-s ',^./\.libs.*,,'		\
 		-s ',^./\.deps.*,,'		\
 		-s ',^./.*\.orig$$,,'		\
-		-rw . ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-	${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME_NOREV}
+		-rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
+	${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index c04dbed36a3..02b26d828b8 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/08/01 21:40:20 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2006/10/09 12:52:35 joerg Exp $
 
 PKGNAME=	MesaLib-${MESA_VERSION}
 PKGREVISION=	2
@@ -29,12 +29,12 @@ pre-build:
 	cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
 		gl.h gl_mangle.h glext.h glx.h glxext.h glx_mangle.h	\
 		osmesa.h xmesa.h xmesa_x.h xmesa_xf86.h;		\
 	do								\
-		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
+		${INSTALL_DATA} $${hdr} ${DESTDIR}${PREFIX}/include/GL;	\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index c637ea4831a..77465234b36 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/31 23:56:28 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/09 12:52:35 joerg Exp $
 
 DISTNAME=	aalib-1.4rc5
 PKGNAME=	${DISTNAME:S/rc5/.0.5/}
@@ -11,6 +11,7 @@ HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
 COMMENT=	ASCII Art library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/aalib-1.4.0
 GNU_CONFIGURE=		YES
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 94264deebc6..7c3053a5c53 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/08/01 21:40:20 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/10/09 12:52:35 joerg Exp $
 
 PKGNAME=	glut-${MESA_VERSION}
 COMMENT=	GLUT Graphics library similar to SGI's OpenGL
@@ -20,11 +20,11 @@ pre-build:
 	cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
 	cd ${WRKSRC}/include/GL; for hdr in				\
 		glut.h glutf90.h;					\
 	do								\
-		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
+		${INSTALL_DATA} $${hdr} ${DESTDIR}${PREFIX}/include/GL;	\
 	done
 
 .include "../../mk/bsd.pkg.mk"