Mechanical changes to add full DESTDIR support to packages that install

their files via a custom do-install target.
jsonn · Mar 2, 2008 · 677eacb · 677eacb
1 parent 47a6f00
commit 677eacb
Show file tree

Hide file tree

Showing 83 changed files with 557 additions and 339 deletions.
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/10/14 13:20:46 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2008/03/02 06:10:30 jlam Exp $
 
 DISTNAME=	abcde_2.3.3.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -16,6 +16,8 @@ DEPENDS+=	id3v2-[0-9]*:../../audio/id3v2
 DEPENDS+=	cdparanoia>=3.0.9.7:../../audio/cdparanoia
 DEPENDS+=	wget>=1.7:../../net/wget
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
@@ -33,11 +35,13 @@ SUBST_FILES.abcde=	abcde abcde.1
 SUBST_SED.abcde=	-e "s,/etc/,${PKG_SYSCONFDIR}/,g"
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${EGDIR}
-	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR}
+	${INSTALL_MAN} ${WRKSRC}/abcde.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/12/19 13:48:20 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/02 06:10:30 jlam Exp $
 #
 
 DISTNAME=	abcMIDI-${ABCMIDIVER}
@@ -15,24 +15,33 @@ COMMENT=	Music utilities for abc
 
 ABCMIDIVER=	2006-04-22
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 \
 			share/doc/abcmidi/programming share/examples/abcmidi
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} abc2abc abc2midi mftext \
-		midi2abc midicopy yaps ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/demo.abc ${PREFIX}/share/examples/abcmidi/
+		midi2abc midicopy yaps ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/demo.abc \
+		${DESTDIR}${PREFIX}/share/examples/abcmidi
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS CHANGES \
 		abcguide.txt abcmatch.txt gpl.txt history.txt readme.txt \
-		yapshelp.txt ${PREFIX}/share/doc/abcmidi/
+		yapshelp.txt ${DESTDIR}${PREFIX}/share/doc/abcmidi
 	cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} abc2midi.txt \
 		coding.txt midi2abc.txt split.abc yaps.txt \
-		${PREFIX}/share/doc/abcmidi/programming/
-	${INSTALL_MAN} ${WRKSRC}/doc/abc2abc.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/abc2midi.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/mftext.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/midi2abc.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/midicopy.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/yaps.1 ${PREFIX}/${PKGMANDIR}/man1/
+		${DESTDIR}${PREFIX}/share/doc/abcmidi/programming
+	${INSTALL_MAN} ${WRKSRC}/doc/abc2abc.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/abc2midi.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/mftext.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/midi2abc.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/midicopy.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/yaps.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/amaroc/Makefile b/audio/amaroc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/20 19:08:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=		amaroc-0.3
@@ -12,12 +12,15 @@ COMMENT=		Command line interface to amarok
 
 DEPENDS+=		${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	bin share/doc/amaroc
+
 do-build:
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/amaroc.py ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaroc
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaroc
+	${INSTALL_SCRIPT} ${WRKSRC}/amaroc.py ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/amaroc
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/amaroc
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:46 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=	amp-0.7.6
@@ -16,13 +16,14 @@ NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 NOT_FOR_PLATFORM=	Interix-*-*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/amp ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/amp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/applerecords/Makefile b/audio/applerecords/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/04 11:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=		applerecords-0.5
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://web.archive.org/web/20060501054520/http://www.cdavies.org/applerecords.html
 COMMENT=		Java DAAP client
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=		yes
 WRKSRC=			${WRKDIR}
 USE_JAVA=		run
@@ -24,8 +26,9 @@ do-extract:
 	${SED} -e 's|@SH@|${SH}|g' -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/applerecords > ${WRKSRC}/applerecords
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/applerecords
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${PREFIX}/lib/applerecords/applerecords.jar
-	${INSTALL_SCRIPT} ${WRKSRC}/applerecords ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/applerecords
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \
+		${DESTDIR}${PREFIX}/lib/applerecords/applerecords.jar
+	${INSTALL_SCRIPT} ${WRKSRC}/applerecords ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/14 13:11:23 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/02 06:10:31 jlam Exp $
 
 DISTNAME=	cd-discid_0.9.orig
 PKGNAME=	cd-discid-0.9
@@ -8,17 +8,20 @@ MASTER_SITES=	http://lly.org/~rcw/cd-discid/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Read CD to obtain CDDB discid information
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
 NOT_FOR_PLATFORM=	Interix-*-*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cd-discid ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/cd-discid.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/cd-discid ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/cd-discid.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/11 10:07:58 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/02 06:10:31 jlam Exp $
 
 DISTNAME=	cdd-1.0nb3
 CATEGORIES=	audio
@@ -7,6 +7,8 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	thorpej@NetBSD.org
 COMMENT=	Program for reading CD audio from SCSI/ATAPI CD-ROM drives
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(CDDCPPFLAGS)
@@ -16,8 +18,8 @@ MAKE_ENV+=	CDDCPPFLAGS=${CDDCPPFLAGS:Q}
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cdd ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/stripzeros ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cdd ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/stripzeros ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/libscsi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=	cmp3-2.0pre6
@@ -14,6 +14,8 @@ COMMENT=	Curses based frontend to mpg123
 DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
 DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/cmp3-kenrevs
 USE_TOOLS+=		gmake
 INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
@@ -22,11 +24,13 @@ INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*-*
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cmp3
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
-	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
+	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cmp3
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/cmp3
+	${INSTALL_DATA} ${WRKSRC}/cmp3rc \
+		${DESTDIR}${PREFIX}/share/doc/cmp3/sample.cmp3rc
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound4-manual/Makefile b/audio/csound4-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/06/03 22:04:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=		manual-html-4.23
@@ -10,18 +10,21 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.csounds.com/
 COMMENT=		Csound4 Reference Manual
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=		yes
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	share/doc/csound4  share/examples
 
 do-install:
-	cd ${WRKSRC}/csound-4.23/manual \
-	&& ${PAX} -rw -s '|.*/CVS/.*||' -s ',.*/CVS$$,,' * ${PREFIX}/share/doc/csound4
+	cd ${WRKSRC}/csound-4.23/manual && \
+	${PAX} -rw -s '|.*/CVS/.*||' -s ',.*/CVS$$,,' * \
+		${DESTDIR}${PREFIX}/share/doc/csound4
 	cd ${FILESDIR} && ${INSTALL_DATA} rt-midi-input.* \
-		${PREFIX}/share/doc/csound4/examples
+		${DESTDIR}${PREFIX}/share/doc/csound4/examples
 	${LN} -s ../../share/doc/csound4/examples \
-		${PREFIX}/share/examples/csound4
+		${DESTDIR}${PREFIX}/share/examples/csound4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound5-manual/Makefile b/audio/csound5-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/12/15 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=		Csound${CSOUND_VERSION}_manual_html
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.csounds.com/
 COMMENT=		Csound5 Reference Manual
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CSOUND_VERSION=		5.01
 NO_BUILD=		yes
 WRKSRC=			${WRKDIR}/html
@@ -21,6 +23,6 @@ EXTRACT_OPTS_ZIP=	-aqo
 INSTALLATION_DIRS+=	share/doc/csound5
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw * ${PREFIX}/share/doc/csound5
+	cd ${WRKSRC} && ${PAX} -rw * ${DESTDIR}${PREFIX}/share/doc/csound5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/03/24 21:02:18 adam Exp $
+# $NetBSD: Makefile,v 1.34 2008/03/02 06:10:31 jlam Exp $
 
 DISTNAME=	dap-2.1.5
 CATEGORIES=	audio
@@ -9,15 +9,17 @@ MAINTAINER=	scw@NetBSD.org
 HOMEPAGE=	http://www.cee.hw.ac.uk/~richardk/
 COMMENT=	Digital audio recording and processing package
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 INSTALLATION_DIRS+=	share/doc/dap
 MAKE_FILE=		Makefile.netbsd
 MAKE_ENV+=		X11PREFIX=${X11PREFIX:Q}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/dap
+	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${DESTDIR}${PREFIX}/bin/dap
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/COPYING \
-		${WRKSRC}/FEATURES ${PREFIX}/share/doc/dap
+		${WRKSRC}/FEATURES ${DESTDIR}${PREFIX}/share/doc/dap
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"

diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/12/02 13:04:06 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/02 06:10:31 jlam Exp $
 #
 
 DISTNAME=	darkice-0.17.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://darkice.tyrell.hu/
 COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
@@ -29,14 +31,17 @@ CONF_FILES=	${EGDIR}/darkice.conf ${PKG_SYSCONFDIR}/darkice.conf
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/darkice.cfg ${EGDIR}/darkice.conf
-	${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/darkice.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/darkice.cfg \
+		${DESTDIR}${EGDIR}/darkice.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/darkice.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
-		${PREFIX}/${PKGMANDIR}/man5/darkice.conf.5
-	cd ${WRKSRC}/doc/doxygen/html && ${INSTALL_DATA} *.html ${HTMLDIR}
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/darkice.conf.5
+	cd ${WRKSRC}/doc/doxygen/html && ${INSTALL_DATA} *.html \
+		${DESTDIR}${HTMLDIR}
 
 .include "../../audio/faac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"