Mechanical changes to add full DESTDIR support to packages that install

their files via a custom do-install target.

24 files changed, 145 insertions, 86 deletions

diff --git a/converters/2vcard/Makefile b/converters/2vcard/Makefile
index fd1436752f6..5605df39fc7 100644
--- a/converters/2vcard/Makefile
+++ b/converters/2vcard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 05:51:07 jlam Exp $
 #
 
 DISTNAME=	2vcard-0.5
@@ -10,6 +10,8 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://www.netmeister.org/apps/2vcard/
 COMMENT=	Convert an addressbook to the popular VCARD file format
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	src/2vcard
 
@@ -18,9 +20,11 @@ NO_BUILD=	yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/2vcard ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/2vcard
-	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/html/2vcard
+	${INSTALL_SCRIPT} ${WRKSRC}/src/2vcard ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/2vcard
+	${INSTALL_DATA} ${WRKSRC}/doc/html/* \
+		${DESTDIR}${PREFIX}/share/doc/html/2vcard
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ack/Makefile b/converters/ack/Makefile
index 81ee50fdea6..9dbb05349d4 100644
--- a/converters/ack/Makefile
+++ b/converters/ack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=	ack139
 PKGNAME=	ack-1.39
@@ -8,12 +8,14 @@ MASTER_SITES=	ftp://ftp.tohoku.ac.jp/pub/unix/ack/
 MAINTAINER=	kei_sun@ba2.so-net.ne.jp
 COMMENT=	Japanese code converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=     ack
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ack ${PREFIX}/bin/ack
-	${INSTALL_DATA} ${WRKSRC}/ack.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/ack.1
+	${INSTALL_PROGRAM} ${WRKSRC}/ack ${DESTDIR}${PREFIX}/bin/ack
+	${INSTALL_DATA} ${WRKSRC}/ack.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/ack.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index a8df93cba1e..651f92caf92 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/12/16 16:14:32 adam Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=	base64-1.5
 CATEGORIES=	converters
@@ -9,6 +9,7 @@ HOMEPAGE=	http://www.fourmilab.ch/webtools/base64/
 COMMENT=	Encode and decode base64 files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 BUILD_TARGET=		prog
@@ -16,7 +17,7 @@ BUILD_TARGET=		prog
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/base64.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/base64 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/base64.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/bbcim/Makefile b/converters/bbcim/Makefile
index 7e441f41d97..d90b83a8b82 100644
--- a/converters/bbcim/Makefile
+++ b/converters/bbcim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 05:51:07 jlam Exp $
 #
 
 DISTNAME=	bbcim095-5
@@ -11,6 +11,8 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	skrll@NetBSD.org
 COMMENT=	File and diskimage conversion utility for BBC Micro software
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/bbcim
 MAN_PAGE=	${FILESDIR}/bbcim.1
 
@@ -20,7 +22,7 @@ do-build:
 	(cd ${WRKSRC} && ${WRKSRC}/mkbbcim)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bbcim ${PREFIX}/bin/
-	${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/bbcim ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${MAN_PAGE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/bib2xml/Makefile b/converters/bib2xml/Makefile
index 85e48c32052..56eba70fe9b 100644
--- a/converters/bib2xml/Makefile
+++ b/converters/bib2xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 05:51:07 jlam Exp $
 #
 
 DISTNAME=	bib2xml-10062002
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www-plan.cs.colorado.edu/henkel/stuff/bib2xml/
 COMMENT=	BibTeX to XML converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/bib2xml
 GNU_CONFIGURE=	YES
 BUILD_DIRS=	${WRKSRC}/progs
@@ -18,7 +20,7 @@ BUILD_DIRS=	${WRKSRC}/progs
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_DIRS}/bib2xml ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${BUILD_DIRS}/bib2xml ${DESTDIR}${PREFIX}/bin
 
 .include "../../textproc/btparse/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/bibtex2html/Makefile b/converters/bibtex2html/Makefile
index ee8eb67ec18..d7358eb111a 100644
--- a/converters/bibtex2html/Makefile
+++ b/converters/bibtex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/01/10 18:15:29 tonio Exp $
+# $NetBSD: Makefile,v 1.25 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=	bibtex2html-1.89
 CATEGORIES=	converters
@@ -10,6 +10,8 @@ COMMENT=	Collection of tools for translating from BibTeX to HTML
 
 BUILD_DEPENDS+=	hevea-[0-9]*:../../textproc/hevea
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	perl:run
 TEX_ACCEPTED=	teTeX3
@@ -28,14 +30,19 @@ post-build:
 	cd ${WRKSRC}; ${MAKE} doc
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/aux2bib ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bibtex2html ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bib2bib ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/${PKGMANDIR}/man1/bib2bib.1
-	${INSTALL_MAN} ${WRKSRC}/aux2bib.1 ${PREFIX}/${PKGMANDIR}/man1/aux2bib.1
-	${INSTALL_DATA} ${WRKSRC}/manual.html ${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/manual.ps ${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_SCRIPT} ${WRKSRC}/aux2bib ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bibtex2html ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bib2bib ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bib2bib.1
+	${INSTALL_MAN} ${WRKSRC}/aux2bib.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/aux2bib.1
+	${INSTALL_DATA} ${WRKSRC}/manual.html \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/manual.ps \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/converters/cbmconvert/Makefile b/converters/cbmconvert/Makefile
index 8d2759417c3..09874905a1d 100644
--- a/converters/cbmconvert/Makefile
+++ b/converters/cbmconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 05:51:07 jlam Exp $
 
 DISTNAME=		cbmconvert-2.1.2
 CATEGORIES=		converters archivers
@@ -7,15 +7,18 @@ MASTER_SITES=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/converters/unix/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Converts files to and from various C64/C128/CBM formats
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FILE=		Makefile.unix
 MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/cbmconvert
 
 do-install:
 .for f in cbmconvert disk2zip zip2disk
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/cbmconvert.html ${PREFIX}/share/doc/cbmconvert/
+	${INSTALL_DATA} ${WRKSRC}/cbmconvert.html \
+		${DESTDIR}${PREFIX}/share/doc/cbmconvert
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/chef/Makefile b/converters/chef/Makefile
index 4f9bafaeffc..d23a29d514a 100644
--- a/converters/chef/Makefile
+++ b/converters/chef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/18 11:51:33 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	chef-19920415
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Convert from English to (mock) Swedish - Bork Bork Bork!
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	yes
 USE_TOOLS+=	lex
@@ -28,6 +29,6 @@ do-build:
 	${LINK.c} -o ${WRKSRC}/chef ${WRKSRC}/lex.yy.c -ll
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/chef ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/chef ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/code2html/Makefile b/converters/code2html/Makefile
index 5010648e03c..7e442fa033c 100644
--- a/converters/code2html/Makefile
+++ b/converters/code2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	code2html-0.9.1
@@ -9,6 +9,8 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://www.palfrader.org/code2html/
 COMMENT=	Convert a program source code to syntax highlighted HTML
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 REPLACE_PERL=	code2html
 USE_TOOLS+=	perl:run
@@ -16,7 +18,8 @@ USE_TOOLS+=	perl:run
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/code2html ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/code2html.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_SCRIPT} ${WRKSRC}/code2html ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/code2html.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/doc2html/Makefile b/converters/doc2html/Makefile
index a80ae076d9f..d29ddf1591e 100644
--- a/converters/doc2html/Makefile
+++ b/converters/doc2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	doc2html
@@ -16,6 +16,8 @@ DEPENDS+=	rtf2html-[0-9]*:../../converters/rtf2html
 DEPENDS+=	xpdf-[0-9]*:../../print/xpdf
 DEPENDS+=	catdoc-[0-9]*:../../textproc/catdoc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gs:run perl:run
 
 INSTALLATION_DIRS=	bin
@@ -30,7 +32,7 @@ do-build:
 .endfor
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${PREFIX}/bin/doc2html
-	${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${PREFIX}/bin/pdf2html
+	${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${DESTDIR}${PREFIX}/bin/doc2html
+	${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${DESTDIR}${PREFIX}/bin/pdf2html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index 2130e35d066..0b90fc7d281 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/12/12 20:42:30 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	dvi2tty
@@ -12,6 +12,8 @@ COMMENT=	Program for previewing DVI files
 
 LICENSE=	no-commercial-use
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:M*:Q}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -25,7 +27,7 @@ pre-patch:
 
 do-install:
 	${INSTALL_PROGRAM} \
-		${WRKSRC}/disdvi ${WRKSRC}/dvi2tty ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${PREFIX}/${PKGMANDIR}/man1
+		${WRKSRC}/disdvi ${WRKSRC}/dvi2tty ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/enriched2html/Makefile b/converters/enriched2html/Makefile
index a24e917d6a7..08cba016a44 100644
--- a/converters/enriched2html/Makefile
+++ b/converters/enriched2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	enriched2html-1.0
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# none
 COMMENT=	Converts from text/enriched to HTML
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 INSTALLATION_DIRS=	bin
@@ -21,6 +23,6 @@ do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} enriched2html.c -o enriched2html
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} enriched2html ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} enriched2html ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/hztty/Makefile b/converters/hztty/Makefile
index e6645286d88..0d5533d8c8b 100644
--- a/converters/hztty/Makefile
+++ b/converters/hztty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/12/02 11:54:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	hztty-2.0
 CATEGORIES=	converters
@@ -9,6 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 COMMENT=	Turns a tty session between Big5/GB/HZ/Unicode
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,7 +22,7 @@ BUILD_TARGET=	bsd
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hztty ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/hztty.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/hztty ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/hztty.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ja-dvi2tty/Makefile b/converters/ja-dvi2tty/Makefile
index daac2c6a8fc..b769585dec6 100644
--- a/converters/ja-dvi2tty/Makefile
+++ b/converters/ja-dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	dvi2tty5.0
 PKGNAME=	ja-dvi2tty-5.0
@@ -17,6 +17,8 @@ COMMENT=	Program for previewing DVI files (ASCII Japanese TeX)
 
 DEPENDS+=	ja-less>=358:../../misc/ja-less
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	ja-dvi2tty
 
 LICENSE=	no-commercial-use
@@ -26,8 +28,9 @@ MAKE_FLAGS+=	CFLAGS="${CFLAGS} -DDEFPAGER='\"${PREFIX}/bin/jless\"'"
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jdvi2tty ${PREFIX}/bin/jdvi2tty
-	${INSTALL_PROGRAM} ${WRKSRC}/disdvi ${PREFIX}/bin/jdisdvi
-	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${PREFIX}/${PKGMANDIR}/man1/jdvi2tty.1
+	${INSTALL_PROGRAM} ${WRKSRC}/jdvi2tty ${DESTDIR}${PREFIX}/bin/jdvi2tty
+	${INSTALL_PROGRAM} ${WRKSRC}/disdvi ${DESTDIR}${PREFIX}/bin/jdisdvi
+	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/jdvi2tty.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/jcode-perl/Makefile b/converters/jcode-perl/Makefile
index 24512701a97..02c653f8290 100644
--- a/converters/jcode-perl/Makefile
+++ b/converters/jcode-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/30 05:50:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	jcode.pl-2.13
 PKGNAME=	${DISTNAME:S/jcode.pl/jcode-perl/}
@@ -14,6 +14,8 @@ COMMENT=	Perl library for Japanese character code conversion
 
 CONFLICTS+=	p5-jcode-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 
 NO_BUILD=		yes
@@ -21,8 +23,9 @@ NO_CONFIGURE=		yes
 PERL5_CONFIGURE=	NO
 
 do-install:
-	${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${PERL5_INSTALLVENDORLIB}/jcode.pl
+	${INSTALL_DATA_DIR} ${DESTDIR}${PERL5_INSTALLVENDORLIB}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} \
+		${DESTDIR}${PERL5_INSTALLVENDORLIB}/jcode.pl
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index 1127a97869b..b23f8be395c 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/10 23:22:48 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	macfork-1.0
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cs.cmu.edu/afs/cs/user/ajw/www/software/
 COMMENT=	Tool for extracting data from Macintosh resource forks
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/macfork
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
@@ -18,8 +20,8 @@ DOCDIR=		${PREFIX}/share/doc/macfork
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/macfork ${PREFIX:Q}/bin
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC:Q}/README ${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/macfork ${DESTDIR}${PREFIX:Q}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC:Q}/README ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/p5-chkjis/Makefile b/converters/p5-chkjis/Makefile
index f7a43212f46..6e2263a368e 100644
--- a/converters/p5-chkjis/Makefile
+++ b/converters/p5-chkjis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	chkjis
@@ -12,6 +12,8 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www2d.biglobe.ne.jp/~msyk/software/chkjis.html
 COMMENT=	Filter library substituting vendor's own characters
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 VERSION=	0.18
@@ -24,8 +26,9 @@ NO_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 
 do-install:
-	${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
-	${INSTALL_SCRIPT} ${WRKSRC}/chkjis.pl ${PERL5_INSTALLVENDORLIB}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PERL5_INSTALLVENDORLIB}
+	${INSTALL_SCRIPT} ${WRKSRC}/chkjis.pl \
+		${DESTDIR}${PERL5_INSTALLVENDORLIB}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/qkc/Makefile b/converters/qkc/Makefile
index 21474f398d4..3d756f4cc90 100644
--- a/converters/qkc/Makefile
+++ b/converters/qkc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/23 03:10:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	qkcc100
 PKGNAME=	qkc-1.0
@@ -12,6 +12,7 @@ HOMEPAGE=	http://hp.vector.co.jp/authors/VA000501/
 COMMENT=	Quick Kanji code Converter
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
@@ -19,7 +20,8 @@ WRKSRC=		${WRKDIR}
 BUILD_TARGET=	qkc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qkc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/qkc.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/qkc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/qkc.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/rtf2html/Makefile b/converters/rtf2html/Makefile
index 19c006a08e1..690e15f9b35 100644
--- a/converters/rtf2html/Makefile
+++ b/converters/rtf2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	rtf2html
@@ -10,12 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.45.free.net/~vitus/ice/catdoc/
 COMMENT=	Rich Text to HTML file converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=	rtf2html
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:M*:Q}
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rtf2html ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtf2html ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ruby-romkan/Makefile b/converters/ruby-romkan/Makefile
index 5322e7b6431..26f5581571e 100644
--- a/converters/ruby-romkan/Makefile
+++ b/converters/ruby-romkan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	ruby-romkan-0.4
 PKGNAME=	${RUBY_PKGPREFIX}-romkan-0.4
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://0xcc.net/ruby-romkan/
 COMMENT=	Romaji <-> Kana conversion library for Ruby
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 
 do-build:
@@ -17,13 +19,13 @@ do-build:
 	cd ${WRKSRC}; ${RUBY_RD} romkan.ja.rd > romkan.html.ja
 
 do-install:
-	${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/romkan.rb ${RUBY_SITELIBDIR}
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/romkan
-	${INSTALL_DATA} ${WRKSRC}/romkan.html ${RUBY_DOCDIR}/romkan
-	${INSTALL_DATA} ${WRKSRC}/romkan.html.ja ${RUBY_DOCDIR}/romkan
-	${INSTALL_DATA} ${WRKSRC}/romkan.en.rd ${RUBY_DOCDIR}/romkan/romkan.rd
-	${INSTALL_DATA} ${WRKSRC}/romkan.ja.rd ${RUBY_DOCDIR}/romkan
+	${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/romkan.rb ${DESTDIR}${RUBY_SITELIBDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/romkan
+	${INSTALL_DATA} ${WRKSRC}/romkan.html ${DESTDIR}${RUBY_DOCDIR}/romkan
+	${INSTALL_DATA} ${WRKSRC}/romkan.html.ja ${DESTDIR}${RUBY_DOCDIR}/romkan
+	${INSTALL_DATA} ${WRKSRC}/romkan.en.rd ${DESTDIR}${RUBY_DOCDIR}/romkan/romkan.rd
+	${INSTALL_DATA} ${WRKSRC}/romkan.ja.rd ${DESTDIR}${RUBY_DOCDIR}/romkan
 
 .include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-rdtool/buildlink3.mk"
diff --git a/converters/smbchartool/Makefile b/converters/smbchartool/Makefile
index 6307e106f0f..f994c17f6f3 100644
--- a/converters/smbchartool/Makefile
+++ b/converters/smbchartool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/05/29 01:07:49 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	smbchartool-2.3a
@@ -17,6 +17,8 @@ COMMENT=	File name conversion tool for Samba
 DEPENDS+=	jcode-perl>=2.13:../../converters/jcode-perl
 DEPENDS+=	p5-Text-Iconv>=1.4:../../converters/p5-Text-Iconv
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/smbchartool
@@ -24,11 +26,11 @@ REPLACE_PERL=	capecho hexecho smbfnconv
 
 do-install:
 .for f in ${REPLACE_PERL}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smbchartool
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/smbchartool
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/smbchartool
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/smbchartool
 	${INSTALL_DATA} ${WRKSRC}/dot.bashrc.example \
-		${PREFIX}/share/doc/smbchartool/dot.profile
+		${DESTDIR}${PREFIX}/share/doc/smbchartool/dot.profile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile
index 15608a94948..fea76c62a48 100644
--- a/converters/tex2rtf/Makefile
+++ b/converters/tex2rtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=		tex2rtf-2.01-source
 PKGNAME=		tex2rtf-2.01
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.wxwidgets.org/tex2rtf/index.htm
 COMMENT=		LaTex-to-RTF translator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 MAKE_FILE=		makefile.unx
 USE_LANGUAGES=		c++
@@ -20,7 +22,7 @@ post-patch:
 	${CP} ${FILESDIR}/stringmatch.* ${WRKSRC}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tex2rtf ${PREFIX}/bin/tex2rtf
+	${INSTALL_PROGRAM} ${WRKSRC}/tex2rtf ${DESTDIR}${PREFIX}/bin/tex2rtf
 
 .include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index 14755cc8c21..8b1b0c98c56 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/12/02 11:56:49 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/03 05:51:08 jlam Exp $
 
 DISTNAME=	unix2dos-1.3
 CATEGORIES=	converters
@@ -7,14 +7,18 @@ MASTER_SITES=	ftp://ftp.guug.org/pub/
 MAINTAINER=	zuntum@NetBSD.org
 COMMENT=	Translate ASCII files to/from DOS (cr/lf) and UNIX (lf)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${PREFIX}/bin/unix2dos
-	${LN} -f ${PREFIX}/bin/unix2dos ${PREFIX}/bin/dos2unix
-	${INSTALL_MAN} ${WRKSRC}/man1/unix2dos.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/man1/dos2unix.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${DESTDIR}${PREFIX}/bin/unix2dos
+	${LN} -f ${PREFIX}/bin/unix2dos ${DESTDIR}${PREFIX}/bin/dos2unix
+	${INSTALL_MAN} ${WRKSRC}/man1/unix2dos.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/dos2unix.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/xlreader/Makefile b/converters/xlreader/Makefile
index c71da6f093f..823b56760b3 100644
--- a/converters/xlreader/Makefile
+++ b/converters/xlreader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 05:51:08 jlam Exp $
 #
 
 DISTNAME=	xlreader-0.9.0
@@ -11,9 +11,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.giffin.org/xlreader.php
 COMMENT=	Converts the cells in a MS Excel file to text
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xlreader ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xlreader ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"