- Added support for installation to DESTDIR.

- Files named ".DS_Store" (from the MacOS GUI) do not belong to this
  package, so we filter them at installation time.

Changes approved by Jan Schaumann.

2 files changed, 20 insertions, 19 deletions

diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index b936e76abfc..ef6bb3cbfd1 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/15 14:58:22 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/05/28 20:35:38 heinz Exp $
 #
 
 DISTNAME=	rad3R6P1
@@ -13,6 +13,8 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://www.radiance-online.org/
 COMMENT=	Physically-based, image-generating, backward raytracer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/ray
 
 LICENSE=	radiance-license
@@ -52,6 +54,8 @@ MAKE_ENV+=	MV=${MV:Q} RM=${RM:Q} CP=${CP:Q}			\
 		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}			\
 		RANLIB=${RANLIB:Q} AR=${AR:Q}
 
+DESTDIRPREFIX=	${DESTDIR}${PREFIX}
+
 do-configure:
 .for patchee in ${PATCHEES}
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' 				\
@@ -69,18 +73,20 @@ do-build:
 	@${RM} -f ${WRKSRC}/radiance/bin/wish*
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/radiance
-	cd ${WRKSRC}/radiance && ${PAX} -rw . ${PREFIX}/radiance/
-	${INSTALL_DATA_DIR} ${PREFIX}/radiance/obj
-	cd ${WRKSRC}/obj && ${PAX} -rw . ${PREFIX}/radiance/obj/
-	${INSTALL_DATA_DIR} ${PREFIX}/radiance/lib
-	cd ${WRKSRC}/lib && ${PAX} -rw . ${PREFIX}/radiance/lib/
-	${INSTALL_DATA_DIR} ${PREFIX}/radiance/man
-	cd ${WRKSRC}/doc/man && ${PAX} -rw . ${PREFIX}/radiance/man/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiance
-	${INSTALL_DATA} ${WRKSRC}/doc/pdf/*.pdf ${PREFIX}/share/doc/radiance/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/radiance
-	${INSTALL_DATA} ${WRKSRC}/doc/ray.html ${PREFIX}/share/doc/radiance/index.html
+	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance
+	cd ${WRKSRC}/radiance && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/
+	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance/obj
+	cd ${WRKSRC}/obj && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/obj/
+	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance/lib
+	cd ${WRKSRC}/lib && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/lib/
+	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/radiance/man
+	cd ${WRKSRC}/doc/man && ${PAX} -rw -s '|.*/\.DS_Store||' . ${DESTDIRPREFIX:Q}/radiance/man/
+	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/share/doc/radiance
+	${INSTALL_DATA} ${WRKSRC}/doc/pdf/*.pdf \
+		${DESTDIRPREFIX:Q}/share/doc/radiance/
+	${INSTALL_DATA_DIR} ${DESTDIRPREFIX:Q}/share/doc/html/radiance
+	${INSTALL_DATA} ${WRKSRC}/doc/ray.html \
+		${DESTDIRPREFIX:Q}/share/doc/radiance/index.html
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/graphics/radiance/PLIST b/graphics/radiance/PLIST
index 2d7a8ce9418..8d9b55cb795 100644
--- a/graphics/radiance/PLIST
+++ b/graphics/radiance/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/18 03:51:07 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/05/28 20:35:38 heinz Exp $
 radiance/bin/arch2rad
 radiance/bin/bgraph
 radiance/bin/cnt
@@ -276,7 +276,6 @@ radiance/lib/tcl/trad.icon
 radiance/lib/tcl/util.tcl
 radiance/lib/tilt.cal
 radiance/lib/tmesh.cal
-radiance/man/cat1/.DS_Store
 radiance/man/cat1/arch2rad.1
 radiance/man/cat1/bgraph.1
 radiance/man/cat1/cnt.1
@@ -385,9 +384,7 @@ radiance/man/cat1/xform.1
 radiance/man/cat1/xglaresrc.1
 radiance/man/cat1/ximage.1
 radiance/man/cat1/xshowtrace.1
-radiance/man/cat3/.DS_Store
 radiance/man/cat3/meta.3
-radiance/man/cat5/.DS_Store
 radiance/man/cat5/metafile.5
 radiance/man/man1/arch2rad.1
 radiance/man/man1/bgraph.1
@@ -539,7 +536,6 @@ radiance/obj/alpha/Z.norm
 radiance/obj/alpha/alpha.pkg
 radiance/obj/alpha/conv2.c
 radiance/obj/alpha/convert.c
-radiance/obj/cabin/.DS_Store
 radiance/obj/cabin/Makefile
 radiance/obj/cabin/anim1/anim2.vf
 radiance/obj/cabin/anim1/errs
@@ -553,7 +549,6 @@ radiance/obj/cabin/anim1/script2
 radiance/obj/cabin/anim1/spline.cal
 radiance/obj/cabin/anim1/view.fmt
 radiance/obj/cabin/anim1/view2.fmt
-radiance/obj/cabin/animv1/.DS_Store
 radiance/obj/cabin/animv1/anim2.vf
 radiance/obj/cabin/animv1/ball1.xf
 radiance/obj/cabin/ball1.rad