Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.
jsonn · Mar 4, 2008 · d66d55c · d66d55c
1 parent 536b630
commit d66d55c
Show file tree

Hide file tree

Showing 46 changed files with 360 additions and 239 deletions.
diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/01/18 05:06:37 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 15:39:09 jlam Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../graphics/3DKit/Makefile.common"
 PKGREVISION=	13
 
@@ -13,8 +15,9 @@ NO_BUILD=	YES
 WRKSRC=		${WRKDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/3DKit
-	${INSTALL_DATA} ${WRKSRC}/${DISTFILES} ${PREFIX}/share/doc/3DKit
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/3DKit
+	${INSTALL_DATA} ${WRKSRC}/${DISTFILES} \
+		${DESTDIR}${PREFIX}/share/doc/3DKit
 
 .include "../../graphics/GlutKit/buildlink3.mk"
 .include "../../graphics/GLXKit/buildlink3.mk"

diff --git a/graphics/CRWInfo/Makefile b/graphics/CRWInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	CRWInfo-0.2
@@ -9,13 +9,15 @@ MAINTAINER=	kirtai@users.sourceforge.net
 HOMEPAGE=	http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/
 COMMENT=	Extracts exposure information and thumbnails from Canon RAW files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/crwinfo ${PREFIX}/bin/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/crwinfo/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/crwinfo/
+	${INSTALL_PROGRAM} ${WRKSRC}/crwinfo ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/crwinfo/
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/crwinfo/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/19 09:16:24 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		openrm-devel-1.5.2
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.openrm.org/
 COMMENT=		The OpenRM Scene Graph API
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/rm152
 CFLAGS+=		-I${X11BASE}/include
 BUILD_TARGET=		libtool docs
@@ -28,18 +30,18 @@ do-install:
 	# install libraries
 	for name in rm rmaux rmi rmv; do				\
 		${LIBTOOL} --mode=install ${INSTALL_LIB}		\
-			${WRKSRC}/$$name/lib$$name.la ${PREFIX}/lib;	\
+		 ${WRKSRC}/$$name/lib$$name.la ${DESTDIR}${PREFIX}/lib;	\
 	done
 	# install includes
-	${INSTALL_DATA_DIR} ${PREFIX}/include/rm
-	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${PREFIX}/include/rm
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DOCDIR}/images
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/rm
+	${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${DESTDIR}${PREFIX}/include/rm
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DESTDIR}${DOCDIR}/images
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/07/29 05:19:27 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=		PanoTools
@@ -14,6 +14,8 @@ COMMENT=		View, create, edit, and remap panoramic images
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base jpeg png tiff
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/PTLinux
 BUILD_DIRS=		# empty
 USE_JAVA=		run
@@ -24,44 +26,47 @@ PLIST_SUBST+=		JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
 INSTALLATION_DIRS=	bin lib
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libpano12.so ${EMULDIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/libpano12.so ${DESTDIR}${EMULDIR}/lib
+	${INSTALL_LIB_DIR} ${DESTDIR}${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}
 	${LN} -s ${EMULDIR}/lib/libpano12.so				\
-		${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}/libpano12.lib.so
-	${INSTALL_DATA_DIR} ${PREFIX}/share/PanoTools
+		${DESTDIR}${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}/libpano12.lib.so
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/PanoTools
 .for jar in ptcrypt pteditor ptpicker
-	${INSTALL_DATA} ${WRKSRC}/${jar}.jar ${PREFIX}/share/PanoTools
+	${INSTALL_DATA} ${WRKSRC}/${jar}.jar				\
+		${DESTDIR}${PREFIX}/share/PanoTools
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/PanoTools
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/PanoTools
 .for doc in Readme.html Readme.txt Copyright/COPYRIGHT_TIFF		\
 	Copyright/Copying.html Copyright/README_JPEG			\
 	Scripts/Optimizer_Script.txt Scripts/Stitcher_Script.txt
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/PanoTools
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/share/doc/PanoTools
 .endfor
 .for bin in ptcrypt pteditor ptpicker
 	${SED} < ${FILESDIR}/ptfile.sh > ${WRKDIR}/${bin}		\
 		-e 's|@@prefix@@|${PREFIX}|g'				\
 		-e 's|@@javahome@@|${PKG_JAVA_HOME}|g'			\
 		-e 's|@@ptfile@@|${bin}|g'
-	${INSTALL_SCRIPT} ${WRKDIR}/${bin} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${bin} ${DESTDIR}${PREFIX}/bin
 .endfor
 	${SED} < ${FILESDIR}/mkpthelpers.sh > ${WRKDIR}/mkpthelpers	\
 		-e 's|@@prefix@@|${PREFIX}|g'				\
 		-e 's|@@javahome@@|${PKG_JAVA_HOME}|g'			\
 		-e 's|@@ptfile@@|${bin}|g'
-	${INSTALL_SCRIPT} ${WRKDIR}/mkpthelpers ${PREFIX}/bin
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/PanoTools
+	${INSTALL_SCRIPT} ${WRKDIR}/mkpthelpers ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/PanoTools
 .for bin in PTAverage PTInterpolate PTMorpher PTOptimizer PTStereo	\
 	PTStitcher PTStripe
-	${INSTALL_SCRIPT} ${WRKSRC}/Helpers/${bin} ${PREFIX}/libexec/PanoTools
+	${INSTALL_SCRIPT} ${WRKSRC}/Helpers/${bin}			\
+		${DESTDIR}${PREFIX}/libexec/PanoTools
 	[ ! -f ${WRKSRC}/Helpers/${bin}.txt ] ||			\
 	${INSTALL_DATA} ${WRKSRC}/Helpers/${bin}.txt			\
-		${PREFIX}/share/doc/PanoTools
+		${DESTDIR}${PREFIX}/share/doc/PanoTools
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/PanoTools/Templates
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/PanoTools/Templates
 .for hlp in 3DMF_HEADER 3DMF_TRIMESH INDEXED_FACE_FMT LP_ivr		\
 	LPjava_html LPjava_ivr VRML_HEADER vrml_wrl
 	${INSTALL_DATA} ${WRKSRC}/Helpers/Templates/${hlp}		\
-		${PREFIX}/share/PanoTools/Templates
+		${DESTDIR}${PREFIX}/share/PanoTools/Templates
 .endfor
 
 .include "../../mk/java-vm.mk"

diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/12 21:02:35 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	BlenderManual.html
 PKGNAME=	blender-doc-20030922
@@ -12,14 +12,17 @@ COMMENT=	Documentation for Blender
 
 CONFLICTS=	blender<=2.31
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/doc
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/blender
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/blender
 	cd ${WRKDIR}/html && ${PAX} -s,.*/CVS.*,, -s,.*/.xvpics.*,, \
-		-rw . ${PREFIX}/share/doc/blender
-	cd ${PREFIX}/share/doc/blender && ${LN} -s book1.html index.html
+		-rw . ${DESTDIR}${PREFIX}/share/doc/blender
+	cd ${DESTDIR}${PREFIX}/share/doc/blender && \
+		${LN} -s book1.html index.html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/03/02 09:48:42 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	dcraw-8.82
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cybercom.net/~dcoffin/dcraw/
 COMMENT=	Raw digital camera decoder
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 WRKSRC=			${WRKDIR}/${PKGBASE}
 USE_TOOLS+=		msgfmt
@@ -51,13 +53,15 @@ do-build:
 	done;
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .for l in ${DCRAW_MANS}
-	${INSTALL_MAN} ${WRKSRC}/dcraw_${l}.1 ${PREFIX}/${PKGMANDIR}/${l}/man1/dcraw.1
+	${INSTALL_MAN} ${WRKSRC}/dcraw_${l}.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/${l}/man1/dcraw.1
 .endfor
 .for l in ${DCRAW_LOCALES}
-	${INSTALL_DATA} ${WRKSRC}/dcraw_${l}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${l}/LC_MESSAGES/dcraw.mo
+	${INSTALL_DATA} ${WRKSRC}/dcraw_${l}.mo \
+		${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/${l}/LC_MESSAGES/dcraw.mo
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"

diff --git a/graphics/ewipe/Makefile b/graphics/ewipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/01/31 15:47:58 reed Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	ewipe-1.2.0
@@ -9,6 +9,8 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.jnet-jp.to/~sekisita/ewipe/index-e.html
 COMMENT=	Presentation editor and viewer based on Tcl/Tk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 USE_LANGUAGES=	# none
@@ -24,15 +26,16 @@ SUBST_SED.wish+=	-e 's,PATH \.,PATH ${PREFIX}/share/ewipe,'
 INSTALLATION_DIRS=	bin share/ewipe share/doc/ewipe share/examples/ewipe
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${DESTDIR}${PREFIX}/bin
 .for i in definefont.tcl edittable.tcl setpointer.tcl viewer.tcl tclIndex
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/ewipe/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/ewipe/
 .endfor
 .for i in README dot.ewipe Changes.jp README.jp
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/ewipe/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/ewipe/
 .endfor
 .for i in a1.gif a2.gif a3.gif a4.gif blue1.gif sample.ewp test.ewp tutorial-e.ewp tutorial.ewp
-	${INSTALL_DATA} ${WRKSRC}/sample/${i} ${PREFIX}/share/examples/ewipe/
+	${INSTALL_DATA} ${WRKSRC}/sample/${i} \
+		${DESTDIR}${PREFIX}/share/examples/ewipe/
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/f4l/Makefile b/graphics/f4l/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/05/22 19:06:28 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	f4l-0.2.1
 CATEGORIES=	graphics
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://f4l.sourceforge.net/
 COMMENT=	Development environment for Macromedia Flash
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c++
 USE_LIBTOOL=		yes
@@ -17,7 +19,7 @@ USE_TOOLS+=		gmake
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/f4l ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/f4l ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"

diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/15 20:32:57 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/03/04 15:39:09 jlam Exp $
 
 DISTNAME=	fly-1.6.5
 PKGREVISION=	8
@@ -11,6 +11,8 @@ COMMENT=	Command-file interface for creating and modifying PNG images
 
 BUILD_DEPENDS+=	gif2png>=2.4.2:../../graphics/gif2png
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	examples/cgi-perl-example.pl \
 		examples/fly-tester.pl \
@@ -27,13 +29,15 @@ pre-configure:
 		${WRKSRC}/examples/cgi-perl-example.pl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fly
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fly
+	${INSTALL_PROGRAM} ${WRKSRC}/fly ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fly
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fly
 	cd ${WRKSRC}/doc; ${LOCALBASE}/bin/gif2png *.gif
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png ${PREFIX}/share/doc/fly
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png \
+		${DESTDIR}${PREFIX}/share/doc/fly
 	${RM} -f ${WRKSRC}/examples/*.orig
-	cd ${WRKSRC}/examples; ${INSTALL_DATA} * ${PREFIX}/share/examples/fly
+	cd ${WRKSRC}/examples; ${INSTALL_DATA} * \
+		${DESTDIR}${PREFIX}/share/examples/fly
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"

diff --git a/graphics/fotox/Makefile b/graphics/fotox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/01/11 13:14:39 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/04 15:39:09 jlam Exp $
 #
 
 DISTNAME=	fotox.34
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kornelix.squarespace.com/fotox/
 COMMENT=	Simple image manipulation program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/fotox
 USE_LANGUAGES=	c++
 USE_TOOLS+=	pkg-config
@@ -21,17 +23,20 @@ SUBST_STAGE.data=	pre-build
 SUBST_FILES.data=	zfuncs.cpp
 SUBST_VARS.data=	FDATA
 
+INSTALLATION_DIRS=	bin share/applications
+
 do-build:
 	(cd ${WRKSRC} && ${SH} build ${PREFIX} y)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fotox ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/parameters.txt ${FDATA}
-	${CP} -r ${WRKSRC}/icons ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/fotox-guide.pdf ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/*.xtext ${FDATA}
-	${INSTALL_DATA} ${WRKSRC}/fotox.desktop ${PREFIX}/share/applications
+	${INSTALL_PROGRAM} ${WRKSRC}/fotox ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/parameters.txt ${DESTDIR}${FDATA}
+	${CP} -r ${WRKSRC}/icons ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/fotox-guide.pdf ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/*.xtext ${DESTDIR}${FDATA}
+	${INSTALL_DATA} ${WRKSRC}/fotox.desktop \
+		${DESTDIR}${PREFIX}/share/applications
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"