From 93da8714c36decac2f91167d5510d069789597e2 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 3 Mar 2008 20:17:11 +0000
Subject: Mechanical changes to add DESTDIR support to packages that install
 their files via a custom do-install target.

---
 fonts/acroread-font-share/Makefile.common  |  6 ++-
 fonts/acroread5-font-share/Makefile.common |  6 ++-
 fonts/acroread7-font-share/Makefile.common |  8 +++-
 fonts/adobe-cidfonts/Makefile              |  8 ++--
 fonts/adobe-cmaps/Makefile                 | 28 +++++------
 fonts/arphic-ttf/Makefile                  | 13 ++++--
 fonts/artwiz-fonts/Makefile                |  8 +++-
 fonts/baekmuk-ttf/Makefile                 | 12 +++--
 fonts/bakoma-fonts/Makefile                | 11 +++--
 fonts/biznet-iso8859_2/Makefile            | 10 ++--
 fonts/chkfontpath/Makefile                 |  8 ++--
 fonts/cyberbit-ttf/Makefile.common         | 12 +++--
 fonts/cyr-rfx-share/Makefile.common        |  8 +++-
 fonts/dbz-ttf/Makefile                     | 12 +++--
 fonts/dejavu-ttf/Makefile                  |  9 ++--
 fonts/efont-unicode/Makefile               |  8 ++--
 fonts/freefont-ttf/Makefile                | 15 ++++--
 fonts/freefonts/Makefile                   | 11 +++--
 fonts/geoslab703-ttf/Makefile              |  8 ++--
 fonts/ja-elisat/Makefile                   | 12 +++--
 fonts/ja-elisau/Makefile                   | 12 +++--
 fonts/ja-kaname/Makefile                   | 14 +++---
 fonts/ja-kappa20/Makefile                  | 11 +++--
 fonts/ja-naga10/Makefile                   |  8 ++--
 fonts/ja-sazanami-ttf/Makefile             | 12 +++--
 fonts/jisx0212fonts/Makefile               |  8 ++--
 fonts/jisx0213fonts/Makefile               |  8 ++--
 fonts/kochi-ttf/Makefile                   | 10 ++--
 fonts/liberation-ttf/Makefile              |  9 ++--
 fonts/linux-libertine-ttf/Makefile         | 14 +++---
 fonts/mftrace/Makefile                     | 18 +++----
 fonts/mkfontalias/Makefile                 |  7 ++-
 fonts/pcf2bdf/Makefile                     |  9 ++--
 fonts/profont/Makefile                     |  8 +++-
 fonts/tex-uhc-fonts-base/Makefile.common   | 10 ++--
 fonts/tex-unttf/Makefile                   | 75 ++++++++++++++++--------------
 fonts/thaixfonts/Makefile                  | 10 ++--
 fonts/ttf2pk/Makefile                      | 22 +++++----
 fonts/type1inst/Makefile                   | 15 +++---
 fonts/un-core-ttf/Makefile                 |  8 ++--
 fonts/un-extra-ttf/Makefile                |  8 ++--
 fonts/vfontcap-kochi/Makefile              |  8 ++--
 fonts/watanabe_vfont/Makefile              | 13 ++++--
 fonts/xmbdfed/Makefile                     |  9 ++--
 44 files changed, 325 insertions(+), 214 deletions(-)

diff --git a/fonts/acroread-font-share/Makefile.common b/fonts/acroread-font-share/Makefile.common
index b7c735fee53..31212c3634f 100644
--- a/fonts/acroread-font-share/Makefile.common
+++ b/fonts/acroread-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2006/10/22 16:06:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/03/03 20:17:11 jlam Exp $
 #
 
 PKGNAME=	acroread-${DISTNAME}-4.0
@@ -14,6 +14,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -21,6 +23,6 @@ USE_TOOLS+=		gtar
 INSTALLATION_DIRS=	Acrobat4/Resource
 
 do-install:
-	${GTAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat4/Resource
+	${GTAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat4/Resource
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/acroread5-font-share/Makefile.common b/fonts/acroread5-font-share/Makefile.common
index 17d1156c81f..95d68cd6f34 100644
--- a/fonts/acroread5-font-share/Makefile.common
+++ b/fonts/acroread5-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/10/04 21:39:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2008/03/03 20:17:11 jlam Exp $
 #
 
 PKGNAME=	acroread5-${DISTNAME}-5.0
@@ -17,6 +17,8 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -24,6 +26,6 @@ USE_TOOLS+=		gtar
 INSTALLATION_DIRS=	Acrobat5/Resource/Font
 
 do-install:
-	@${GTAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat5/Resource/Font
+	@${GTAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat5/Resource/Font
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/acroread7-font-share/Makefile.common b/fonts/acroread7-font-share/Makefile.common
index d92255ebc3f..a231e3709fb 100644
--- a/fonts/acroread7-font-share/Makefile.common
+++ b/fonts/acroread7-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/10/04 21:39:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/03/03 20:17:11 jlam Exp $
 #
 
 PKGNAME=	acroread7-${DISTNAME}-7.0
@@ -17,12 +17,16 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 USE_TOOLS+=	tar
 
+INSTALLATION_DIRS=	Acrobat7/Resource
+
 do-install:
-	@${TAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat7/Resource
+	@${TAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat7/Resource
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/adobe-cidfonts/Makefile b/fonts/adobe-cidfonts/Makefile
index 9671cc49d3f..8e03e70f339 100644
--- a/fonts/adobe-cidfonts/Makefile
+++ b/fonts/adobe-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/10/25 21:04:21 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=	adobe-cidfonts-20000901
 CATEGORIES=	fonts
@@ -26,6 +26,8 @@ DISTFILES+=	WadaMin-Bold WadaMin-Bold.afm
 DISTFILES+=	WadaMin-Regular WadaMin-Regular.afm
 DISTFILES+=	WadaMin-RegularH WadaMin-RegularH.afm
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -41,10 +43,10 @@ GENERATE_PLIST=								\
 	${ECHO} "@unexec ${RMDIR} -p %D/${RESOURCESUBDIR} 2>/dev/null || ${TRUE}";
 
 do-install:
-	${INSTALL_DATA_DIR} ${RESOURCEDIR}/CIDFont
+	${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CIDFont
 	for file in ${DISTFILES}; do					\
 		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file}	\
-			${RESOURCEDIR}/CIDFont;				\
+			${DESTDIR}${RESOURCEDIR}/CIDFont;		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/adobe-cmaps/Makefile b/fonts/adobe-cmaps/Makefile
index 6ccde6ddae4..4af401b84d7 100644
--- a/fonts/adobe-cmaps/Makefile
+++ b/fonts/adobe-cmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/15 22:04:15 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=	adobe-cmaps-20060615
 CATEGORIES=	fonts print
@@ -24,6 +24,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://partners.adobe.com/public/developer/opentype/
 COMMENT=	Adobe CMap files for CJK
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -32,39 +34,39 @@ USE_TOOLS+=	unzip
 RESOURCEDIR=	${PREFIX}/share/Adobe/Resource
 
 do-install:
-	${INSTALL_DATA_DIR} ${RESOURCEDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}
 	set -e; \
 	for file in ${CMAP_DISTFILES}; do				\
 		extract_file="${_DISTDIR}/$${file}"; export extract_file; \
-		cd ${RESOURCEDIR}; ${EXTRACT_CMD};			\
+		cd ${DESTDIR}${RESOURCEDIR}; ${EXTRACT_CMD};		\
 	done
 	set -e; \
 	for file in ${PDFCORE}; do					\
-		${MKDIR} ${RESOURCEDIR}/pdfcorefonts/$${file};		\
-		cd ${RESOURCEDIR}/pdfcorefonts/$${file};		\
+		${MKDIR} ${DESTDIR}${RESOURCEDIR}/pdfcorefonts/$${file}; \
+		cd ${DESTDIR}${RESOURCEDIR}/pdfcorefonts/$${file};	\
 		${UNZIP_CMD} -aaoq ${_DISTDIR}/$${file}.zip;		\
 	done
-	${INSTALL_DATA_DIR} ${RESOURCEDIR}/CMap
+	${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CMap
 	set -e; \
-	cd ${RESOURCEDIR}; for dir in ${CMAP_FILES}; do			\
+	cd ${DESTDIR}${RESOURCEDIR}; for dir in ${CMAP_FILES}; do	\
 		for file in $${dir}/CMap/*; do				\
-			${LN} -sf ../$${file} ${RESOURCEDIR}/CMap;	\
+			${LN} -sf ../$${file} ${DESTDIR}${RESOURCEDIR}/CMap; \
 		done;							\
 	done
 	set -e; \
-	cd ${RESOURCEDIR}; for dir in ${RKSJ_FILES}; do			\
+	cd ${DESTDIR}${RESOURCEDIR}; for dir in ${RKSJ_FILES}; do	\
 		for file in $${dir}/*; do				\
-			${LN} -sf ../$${file} ${RESOURCEDIR}/CMap;	\
+			${LN} -sf ../$${file} ${DESTDIR}${RESOURCEDIR}/CMap; \
 		done;							\
 	done
 	set -e; \
-	cd ${RESOURCEDIR}; for dir in ${PDFCORE}; do			\
+	cd ${DESTDIR}${RESOURCEDIR}; for dir in ${PDFCORE}; do		\
 		for file in pdfcorefonts/$${dir}/*; do			\
 			case $${file} in				\
 			*.pdf)	;;					\
 			*)						\
-				${RM} -f ${RESOURCEDIR}/CMap/`${BASENAME} $${file}`; \
-				${LN} -sf ../$${file} ${RESOURCEDIR}/CMap; \
+				${RM} -f ${DESTDIR}${RESOURCEDIR}/CMap/`${BASENAME} $${file}`; \
+				${LN} -sf ../$${file} ${DESTDIR}${RESOURCEDIR}/CMap; \
 				;;					\
 			esac;						\
 		done;							\
diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 6777a65b175..9c29b4f1717 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/10/09 11:40:30 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
@@ -15,6 +15,8 @@ CONFLICTS=	arphicttf-[0-9]*
 FONT_FILES=	bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf
 MISC_FILES=	ARPHICPL.TXT logo.gif release.txt
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	arphic-ttf
 WRKSRC=		${WRKDIR}
 
@@ -26,9 +28,10 @@ FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/arphic-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${FONT_FILES} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${MISC_FILES} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${FONT_FILES} \
+		${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${MISC_FILES} ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index 51bc2782696..19d9983d970 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=	artwiz-aleczapka-1.3
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.vastwaters.com/
 COMMENT=	Set of free fonts for X11 desktops
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/artwiz-aleczapka
 USE_X11BASE=	yes
 
@@ -22,6 +24,8 @@ FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/artwiz
 REQD_DIRS=	${PREFIX}/lib/X11/fonts/artwiz
 
 do-install:
-	for i in ${WRKSRC}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_DIRS.x11}; done
+	for i in ${WRKSRC}/*.pcf; do \
+		${INSTALL_DATA} $$i ${DESTDIR}${FONTS_DIRS.x11}; \
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index 9d9f2f6fa5c..450d25a4bb8 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=	baekmuk-ttf-2.2
 PKGREVISION=	2
@@ -9,6 +9,8 @@ MAINTAINER=	yui@yui.pe.kr
 HOMEPAGE=	http://kldp.net/projects/baekmuk/
 COMMENT=	Baekmuk family Korean TrueType fonts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
@@ -17,9 +19,9 @@ FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/baekmuk-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTS_DIRS.ttf}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT* ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT* ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/bakoma-fonts/Makefile b/fonts/bakoma-fonts/Makefile
index aa14420aaad..86633a567b8 100644
--- a/fonts/bakoma-fonts/Makefile
+++ b/fonts/bakoma-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=	bakoma-20010719
@@ -15,6 +15,9 @@ COMMENT=	BaKoMa Fonts for TeX
 LICENSE+=		no-commercial-use
 NO_SRC_ON_CDROM=	#defined
 NO_BIN_ON_CDROM=	#defined
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BAKOMA_DIR=		${PREFIX}/share/tex-contrib/BaKoMa
 WRKSRC=			${WRKDIR}/bakoma
 
@@ -25,11 +28,11 @@ do-build:
 
 do-install:
 .for d in afm etc pfb pfm tfm ttf
-	${INSTALL_DATA_DIR} ${BAKOMA_DIR}/${d}
-	${INSTALL_DATA} ${WRKSRC}/${d}/* ${BAKOMA_DIR}/${d}
+	${INSTALL_DATA_DIR} ${DESTDIR}${BAKOMA_DIR}/${d}
+	${INSTALL_DATA} ${WRKSRC}/${d}/* ${DESTDIR}${BAKOMA_DIR}/${d}
 .endfor
 .for f in fontmap.map BaKoMa-AMS.Fonts BaKoMa-CM.Fonts README.news
-	${INSTALL_DATA} ${WRKSRC}/${f} ${BAKOMA_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${BAKOMA_DIR}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile
index 217f4b87f9c..2cb8c74321c 100644
--- a/fonts/biznet-iso8859_2/Makefile
+++ b/fonts/biznet-iso8859_2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/03/04 11:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=	ISO8859-2-pcf
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://web.archive.org/web/20041204153923/http://www.biz.net.pl/english/x-fonts/index.html
 COMMENT=	Full set of ISO 8859-2 fonts for X Window System
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
@@ -23,12 +25,12 @@ FONTS_DIRS.x11=	${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
 
 do-install:
 	@for d in 75dpi 100dpi misc; do \
-		${INSTALL_DATA_DIR} ${FONTDIR}/$${d}; \
+		${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}/$${d}; \
 		cd ${WRKDIR}/$${d}; \
-		${INSTALL_DATA} fonts.alias ${FONTDIR}/$${d}/; \
+		${INSTALL_DATA} fonts.alias ${DESTDIR}${FONTDIR}/$${d}/; \
 		for f in *.pcf; do \
 			${ECHO} "Compressing $${f}"; \
-			${GZIP_CMD} -c $${f} > ${FONTDIR}/$${d}/$${f}.gz; \
+			${GZIP_CMD} -c $${f} > ${DESTDIR}${FONTDIR}/$${d}/$${f}.gz; \
 		done; \
 	done
 
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index 311b7e85456..294db362926 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -12,6 +12,8 @@ COMMENT=	Command line tool to manage X server's font path
 
 BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_ENV+=	VERSION=${PKGVERSION:Q}
 USE_TOOLS+=	gmake gtar
 
@@ -25,8 +27,8 @@ do-extract:
 		${GTAR} zxf ${DISTNAME}.tar.gz
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${PREFIX}/${PKGMANDIR}/man8
+		${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${DESTDIR}${PREFIX}/bin
+		${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index b08fa7af5a6..7f304537d69 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2008/01/22 13:27:40 obache Exp $
+# $NetBSD: Makefile.common,v 1.20 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=	# empty
@@ -18,6 +18,8 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	cyberbit-ttf
 
 EXTRACT_ONLY=		${FONT_FILE}
@@ -31,7 +33,7 @@ FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/html/cyberbit-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_DIRS.ttf}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKDIR}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm ${DESTDIR}${DOCDIR}
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index 91fb9b2377d..67f700ae610 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2008/01/22 13:33:35 obache Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=	cyr-rfx-${CYR_RFX_ENCODING}-1.1
 CATEGORIES=	fonts x11
@@ -12,6 +12,8 @@ HOMEPAGE=	http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/00index.en.html
 COMMENT=	Cyrillic X11 fonts in ${CYR_RFX_ENCODING} encoding
 DIST_SUBDIR=	cyr-rfx
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 
 NO_CONFIGURE=	yes
@@ -26,6 +28,8 @@ REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/75dpi
 REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/misc
 
 do-install:
-	@cd ${PREFIX}/lib/X11/fonts/local && ${GTAR} xzf ${_DISTDIR}/${DISTFILES} ${CYR_RFX_ENCODING}/misc ${CYR_RFX_ENCODING}/75dpi
+	cd ${DESTDIR}${PREFIX}/lib/X11/fonts/local && \
+	${GTAR} xzf ${_DISTDIR}/${DISTFILES} \
+		${CYR_RFX_ENCODING}/misc ${CYR_RFX_ENCODING}/75dpi
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index c7cc7d41b95..bb2d277f7a0 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	dbz
@@ -19,6 +19,8 @@ RESTRICTED=	Resale prohibited.
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11=	YES
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
@@ -27,9 +29,9 @@ FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/dbz-ttf
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_DIRS.ttf}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/readme.txt ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKDIR}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/readme.txt ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/dejavu-ttf/Makefile b/fonts/dejavu-ttf/Makefile
index bda3d20c065..31cb3469f1e 100644
--- a/fonts/dejavu-ttf/Makefile
+++ b/fonts/dejavu-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/11/29 22:51:06 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	dejavu-ttf-2.21
@@ -10,6 +10,8 @@ MAINTAINER=	jakllsch@kollasch.net
 HOMEPAGE=	http://dejavu.sourceforge.net/
 COMMENT=	DejaVu family of TrueType fonts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -19,8 +21,9 @@ FONTS_DIRS.ttf+=	${PREFIX}/lib/X11/fonts/TTF
 INSTALLATION_DIRS=	lib/X11/fonts/TTF share/doc/dejavu-ttf
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pm *.ttf ${PREFIX}/lib/X11/fonts/TTF/
+	cd ${WRKSRC} && ${PAX} -rw -pm *.ttf \
+		${DESTDIR}${PREFIX}/lib/X11/fonts/TTF/
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS LICENSE NEWS README \
-		${PREFIX}/share/doc/dejavu-ttf
+		${DESTDIR}${PREFIX}/share/doc/dejavu-ttf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index 3440ba5bcb6..b2bfd66c512 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	efont-unicode-bdf-0.4.2
 PKGNAME=	${DISTNAME:S/-bdf//}
@@ -11,6 +11,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/efont/unicode/
 COMMENT=	Free unicode BDF font
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	YES
 USE_TOOLS+=	bdftopcf gzip
 
@@ -41,11 +43,11 @@ do-build:
 	done
 
 do-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/${FONTDIR}
+	@${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${FONTDIR}
 	@for FONT in ${FONTS}; do				\
 	  ${ECHO} -n "Installing font $${FONT} ... ";		\
 	  ${INSTALL_DATA} ${WRKSRC}/$${FONT}.pcf.gz 		\
-	    ${PREFIX}/${FONTDIR};				\
+	    ${DESTDIR}${PREFIX}/${FONTDIR};			\
 	  ${ECHO} "done";					\
 	done
 
diff --git a/fonts/freefont-ttf/Makefile b/fonts/freefont-ttf/Makefile
index 6b468923e3a..b5ebed52d0a 100644
--- a/fonts/freefont-ttf/Makefile
+++ b/fonts/freefont-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:14 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=		freefont-ttf
@@ -12,6 +12,8 @@ COMMENT=		Free UCS Outline Fonts: FreeMono, FreeSans, and FreeSerif
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
@@ -19,10 +21,13 @@ USE_LANGUAGES=		# empty
 INSTALLATION_DIRS=	share/fonts/freefont share/doc/freefont
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/freefont/
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/freefont/
-	${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/freefont/
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/freefont/
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS \
+		${DESTDIR}${PREFIX}/share/doc/freefont/
+	${INSTALL_DATA} ${WRKSRC}/CREDITS \
+		${DESTDIR}${PREFIX}/share/doc/freefont/
 	cd ${WRKSRC}/sfd && \
-		${PAX} -rw Free*.ttf ${PREFIX}/share/fonts/freefont/
+		${PAX} -rw Free*.ttf ${DESTDIR}${PREFIX}/share/fonts/freefont/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile
index dbe056aa877..986baa575b4 100644
--- a/fonts/freefonts/Makefile
+++ b/fonts/freefonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	freefonts-0.10
@@ -10,6 +10,8 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=X11/fonts/} \
 MAINTAINER=	reed@reedmedia.net
 COMMENT=	Collection of 79 freely available fonts
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -20,9 +22,10 @@ FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/freefont
 REQD_DIRS=	${PREFIX}/lib/X11/fonts/freefont
 
 do-install:
-	${GTAR} Cxzf ${PREFIX}/lib/X11/fonts \
+	${GTAR} Cxzf ${DESTDIR}${PREFIX}/lib/X11/fonts \
 		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/X11/fonts/freefont/*
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/X11/fonts/freefont/*
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/X11/fonts/freefont/*
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} \
+		${DESTDIR}${PREFIX}/lib/X11/fonts/freefont/*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index f3c1cb348c0..8005ce2b332 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:39 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	geoslab703-ttf-20010522
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.will-harris.com/fonts/freefonts.htm
 COMMENT=	Free TrueType fonts from Bitstream, useful for web viewing
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	geoslab703-ttf
 EXTRACT_ONLY=	# empty
 
@@ -21,7 +23,7 @@ NO_BUILD=	YES
 FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA} ${_DISTDIR}/*.ttf ${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${_DISTDIR}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index 6f4c96a7fcf..e3be99caa63 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
@@ -10,6 +10,8 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		${MASTER_SITES}/elisat10.html
 COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
@@ -28,9 +30,9 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${WRKSRC}/*.html ${DOCDIR}; \
-	${INSTALL_DATA_DIR} ${FONTDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.doc ${WRKSRC}/*.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index de05b78d90d..37aa442d94f 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/27 18:48:02 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -18,6 +18,8 @@ SITES.elisau10${EXTRACT_SUFX}=	\
 			http://hp.vector.co.jp/authors/VA004814/freesoft/
 SITES.clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 USE_TOOLS+=		bdftopcf gzip patch
 USE_X11BASE=		YES
@@ -42,9 +44,9 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${WRKSRC}/*.txt ${DOCDIR}; \
-	${INSTALL_DATA_DIR} ${FONTDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.doc ${WRKSRC}/*.txt ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index c802efcf34b..06709a35b5d 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
@@ -9,6 +9,8 @@ MASTER_SITES=		${MASTER_SITE_LOCAL} # original site was closed.
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 USE_TOOLS+=		bdftopcf gzip
@@ -27,10 +29,10 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${DOCDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/doc.orig/* ${DOCDIR}; \
-	${INSTALL_DATA_DIR} ${FONTDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc.orig/* ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile
index b4f3a95abd0..17321932a10 100644
--- a/fonts/ja-kappa20/Makefile
+++ b/fonts/ja-kappa20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=		Kappa20-0.394
 PKGNAME=		ja-kappa20-0.394
@@ -11,6 +11,8 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://kappa.allnet.ne.jp/20dot.fonts/
 COMMENT=		20x20 dots X11 bitmap font for Japanese with several extra fonts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		YES
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 ALIAS_KAPPA=		${PREFIX}/share/examples/fonts.alias.Kappa20
@@ -26,8 +28,9 @@ BUILD_TARGET=		default
 INSTALLATION_DIRS=	lib/X11/fonts/local share/doc share/examples
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.Kappa20; \
-	${INSTALL_DATA} ${WRKSRC}/pcf/fonts.alias ${ALIAS_KAPPA}; \
-	${INSTALL_DATA} ${WRKSRC}/pcf/*.pcf.* ${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/README.Kappa20
+	${INSTALL_DATA} ${WRKSRC}/pcf/fonts.alias ${DESTDIR}${ALIAS_KAPPA}
+	${INSTALL_DATA} ${WRKSRC}/pcf/*.pcf.* ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile
index 0bf83e45f50..2f2f2c0f1a7 100644
--- a/fonts/ja-naga10/Makefile
+++ b/fonts/ja-naga10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:23 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=		knj10-1.1
 PKGNAME=		ja-naga10-1.1
@@ -12,6 +12,8 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://hp.vector.co.jp/authors/VA013391/fonts/#naga10
 COMMENT=		10x10 dots X11 bitmap font for JIS X 0208
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		YES
 USE_TOOLS+=		bdftopcf gzip patch
 DOCDIR=			${PREFIX}/share/doc
@@ -40,7 +42,7 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/README.* ${DOCDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.* ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-sazanami-ttf/Makefile b/fonts/ja-sazanami-ttf/Makefile
index be240080194..83e22d4d146 100644
--- a/fonts/ja-sazanami-ttf/Makefile
+++ b/fonts/ja-sazanami-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=		sazanami-${SAZANAMI_VERS}
 PKGNAME=		ja-sazanami-ttf-${SAZANAMI_VERS}
@@ -11,6 +11,8 @@ MAINTAINER=		yamajun@ofug.net
 HOMEPAGE=		http://wiki.fdiary.net/font/?sazanami
 COMMENT=		Truly free Japanese TrueType font
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 SAZANAMI_VERS=		20040629
 FONTS_DIRS.ttf=		${PREFIX}/lib/X11/fonts/TTF
 
@@ -18,8 +20,10 @@ NO_BUILD=		YES
 NO_CONFIGURE=		YES
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA}	${WRKSRC}/sazanami-gothic.ttf ${FONTS_DIRS.ttf}
-	${INSTALL_DATA}	${WRKSRC}/sazanami-mincho.ttf ${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA}	${WRKSRC}/sazanami-gothic.ttf \
+		${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA}	${WRKSRC}/sazanami-mincho.ttf \
+		${DESTDIR}${FONTS_DIRS.ttf}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index c109bbda103..2740d34bde4 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/11/12 00:10:09 uebayasi Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	jisx0212fonts-0.0
 PKGREVISION=	2
@@ -11,6 +11,8 @@ DISTFILES=	jisksp14.bdf.gz jisksp16-1990.bdf.Z min-1-24.bdf.gz \
 MAINTAINER=	uebayasi@NetBSD.org
 COMMENT=	X11 bitmap fonts for JIS X 0212
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 
 WRKSRC=		${WRKDIR}
@@ -37,10 +39,10 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}
 	set -e; \
 	for f in ${FONTS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${DESTDIR}${FONTDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile
index 8d6eee5d050..c311618218f 100644
--- a/fonts/jisx0213fonts/Makefile
+++ b/fonts/jisx0213fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/11/12 00:10:09 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	jisx0213fonts-0.0
@@ -11,6 +11,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/
 COMMENT=	X11 bitmap fonts for JIS X 0213
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 USE_TOOLS+=	gzip
 
@@ -33,9 +35,9 @@ do-build:
 	done
 
 do-install:
-	@${INSTALL_DATA_DIR} ${FONTDIR}
+	@${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}
 	@for f in ${FONTS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${DESTDIR}${FONTDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index a064685f78b..967a40abbf4 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:09:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	kochi-substitute-${KOCHI_VERSION}
 PKGNAME=	kochi-ttf-${KOCHI_VERSION}
@@ -13,15 +13,17 @@ COMMENT=	Free Japanese TrueType font by Yasuyuki Furukawa
 
 KOCHI_VERSION=	20030809
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 
 FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
 	${INSTALL_DATA} ${WRKSRC}/kochi-gothic-subst.ttf \
-	    ${PREFIX}/lib/X11/fonts/TTF/kochi-gothic.ttf
+	    ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF/kochi-gothic.ttf
 	${INSTALL_DATA} ${WRKSRC}/kochi-mincho-subst.ttf \
-	    ${PREFIX}/lib/X11/fonts/TTF/kochi-mincho.ttf
+	    ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF/kochi-mincho.ttf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/liberation-ttf/Makefile b/fonts/liberation-ttf/Makefile
index 1387fc22f63..ac80a529d69 100644
--- a/fonts/liberation-ttf/Makefile
+++ b/fonts/liberation-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/16 15:40:05 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	liberation-fonts-ttf-3
@@ -10,6 +10,8 @@ MAINTAINER=	bartosz.kuzma@gmail.com
 HOMEPAGE=	http://www.redhat.com/promo/fonts/
 COMMENT=	TrueType fonts from RedHat
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
@@ -23,9 +25,10 @@ INSTALLATION_DIRS=	${DOCDIR} ${FONTDIR}
 
 do-install:
 	cd ${WRKSRC} && for f in *.ttf ; do \
-		${INSTALL_DATA} $$f ${FONTDIR}/$$f ; \
+		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f ; \
 	done
 
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/License.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/License.txt \
+		${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/linux-libertine-ttf/Makefile b/fonts/linux-libertine-ttf/Makefile
index 9a3934d97cf..2b3433a87fd 100644
--- a/fonts/linux-libertine-ttf/Makefile
+++ b/fonts/linux-libertine-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/06 14:32:18 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	LinLibertineTTF-2.1.0
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://linuxlibertine.sourceforge.net/
 COMMENT=	Free TrueType font family
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/LinLibertineTTF
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -20,12 +22,12 @@ DOCDIR=		${PREFIX}/share/doc/linux-libertine-ttf
 FONTS_DIRS.ttf=	${FONTDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	cd ${WRKSRC} && for f in *.ttf ; do \
-		${INSTALL_DATA} $$f ${FONTDIR}/$$f; \
+		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/Readme ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/gpl.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/Readme ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/gpl.txt ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile
index 393a5da4dd9..5345b88fb88 100644
--- a/fonts/mftrace/Makefile
+++ b/fonts/mftrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/02/24 18:03:03 darcy Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	mftrace-1.2.14
 CATEGORIES=	fonts
@@ -13,6 +13,8 @@ DEPENDS+=	potrace>=1.5:../../graphics/potrace
 DEPENDS+=	fontforge>=20041115:../../fonts/fontforge
 DEPENDS+=	t1utils>=1.27:../../fonts/t1utils
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
@@ -28,13 +30,13 @@ post-build:
 	cd ${WRKSRC} && ${PYTHONBIN} ${PREFIX}/${PYLIB}/py_compile.py tfm.py
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gf2pbm ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/mftrace ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mftrace.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/afm.py ${PREFIX}/${PYSITELIB}
-	${INSTALL_DATA} ${WRKSRC}/afm.pyc ${PREFIX}/${PYSITELIB}
-	${INSTALL_DATA} ${WRKSRC}/tfm.py ${PREFIX}/${PYSITELIB}
-	${INSTALL_DATA} ${WRKSRC}/tfm.pyc ${PREFIX}/${PYSITELIB}
+	${INSTALL_PROGRAM} ${WRKSRC}/gf2pbm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mftrace ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mftrace.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/afm.py ${DESTDIR}${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA} ${WRKSRC}/afm.pyc ${DESTDIR}${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA} ${WRKSRC}/tfm.py ${DESTDIR}${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA} ${WRKSRC}/tfm.pyc ${DESTDIR}${PREFIX}/${PYSITELIB}
 
 .include "../../lang/python/application.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile
index 8a93b08cee2..ceb54c5c7ac 100644
--- a/fonts/mkfontalias/Makefile
+++ b/fonts/mkfontalias/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:10 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	mkfontalias.py
@@ -12,6 +12,8 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://home.c2i.net/dark/linux.html#fuzzy
 COMMENT=	Creates a fonts.alias from the fonts.dir for TrueType fonts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
@@ -23,7 +25,8 @@ do-extract:
 	${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mkfontalias.py ${PREFIX}/bin/mkfontalias
+	${INSTALL_SCRIPT} ${WRKSRC}/mkfontalias.py \
+		${DESTDIR}${PREFIX}/bin/mkfontalias
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index e158484e02c..a7b3f1be0c0 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	pcf2bdf-1.04
@@ -11,6 +11,8 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 COMMENT=	Convert X font from PCF to BDF
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
@@ -19,7 +21,8 @@ MAKE_FILE=	Makefile.gcc
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pcf2bdf ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man ${PREFIX}/${PKGMANDIR}/man1/pcf2bdf.1
+	${INSTALL_PROGRAM} ${WRKSRC}/pcf2bdf ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pcf2bdf.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/profont/Makefile b/fonts/profont/Makefile
index bbc755405c7..deb6732f859 100644
--- a/fonts/profont/Makefile
+++ b/fonts/profont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	profontlinux
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tobias-jung.de/seekingprofont/
 COMMENT=	Monospaced bitmap font readable in very small sizes
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
 USE_X11BASE=		yes
@@ -20,6 +22,8 @@ FONTS_DIRS.x11=		${PREFIX}/lib/X11/fonts/misc
 INSTALLATION_DIRS=	lib/X11/fonts/misc
 
 do-install:
-	for i in ${WRKDIR}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_DIRS.x11}; done
+	for i in ${WRKDIR}/*.pcf; do \
+		${INSTALL_DATA} $$i ${DESTDIR}${FONTS_DIRS.x11}; \
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-uhc-fonts-base/Makefile.common b/fonts/tex-uhc-fonts-base/Makefile.common
index d11bd7db2b9..491b9d178a4 100644
--- a/fonts/tex-uhc-fonts-base/Makefile.common
+++ b/fonts/tex-uhc-fonts-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2006/04/07 04:47:20 minskim Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	uhc-fonts-1.0
 CATEGORIES=	fonts
@@ -12,6 +12,8 @@ TEX_ACCEPTED=	teTeX3
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 USE_DIRS+=	texmf-1.0
@@ -19,12 +21,12 @@ USE_DIRS+=	texmf-1.0
 .include "../../print/teTeX/module.mk"
 
 do-install:
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/fonts/map/hlatex
+	${INSTALL_DATA_DIR} ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/map/hlatex
 	${INSTALL_DATA} ${WRKSRC}/${TEX_FONTMAPS} \
-		${PKG_LOCALTEXMFPREFIX}/fonts/map/hlatex/
+		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/map/hlatex/
 .for f in ${UHC_FONTS}
 	extract_file=${_DISTDIR:Q}/${f}; \
-	cd ${PKG_LOCALTEXMFPREFIX}/fonts; ${EXTRACT_CMD}
+	cd ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts; ${EXTRACT_CMD}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-unttf/Makefile b/fonts/tex-unttf/Makefile
index 3be9b6b2c03..de68f10de82 100644
--- a/fonts/tex-unttf/Makefile
+++ b/fonts/tex-unttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/06/06 22:30:34 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	fonts-unttf-20070507
@@ -14,6 +14,8 @@ DEPENDS+=	ttf2pk>=1.5:../../fonts/ttf2pk
 DEPENDS+=	un-core-ttf>=1.0:../../fonts/un-core-ttf
 DEPENDS+=	un-extra-ttf>=1.0.1:../../fonts/un-extra-ttf
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/fonts-unttf
 USE_DIRS+=	texmf-1.0
 NO_CONFIGURE=	yes
@@ -31,40 +33,41 @@ do-build:
 	${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
 
 do-install:
-	cd ${WRKSRC}/fonts; ${PAX} -rw . ${PKG_LOCALTEXMFPREFIX}/fonts/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unbt
-	${LN} -sf ${SYSTTFDIR}/UnBatang.ttf ${TEXTTFDIR}/unbt/
-	${LN} -sf ${SYSTTFDIR}/UnBatangBold.ttf ${TEXTTFDIR}/unbt/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/ungt
-	${LN} -sf ${SYSTTFDIR}/UnDotum.ttf ${TEXTTFDIR}/ungt/
-	${LN} -sf ${SYSTTFDIR}/UnDotumBold.ttf ${TEXTTFDIR}/ungt/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/ungr
-	${LN} -sf ${SYSTTFDIR}/UnGraphic.ttf ${TEXTTFDIR}/ungr/
-	${LN} -sf ${SYSTTFDIR}/UnGraphicBold.ttf ${TEXTTFDIR}/ungr/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/ungs
-	${LN} -sf ${SYSTTFDIR}/UnGungseo.ttf ${TEXTTFDIR}/ungs/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unbm
-	${LN} -sf ${SYSTTFDIR}/UnBom.ttf ${TEXTTFDIR}/unbm/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unpn
-	${LN} -sf ${SYSTTFDIR}/UnPen.ttf ${TEXTTFDIR}/unpn/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unph
-	${LN} -sf ${SYSTTFDIR}/UnPenheulim.ttf ${TEXTTFDIR}/unph/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unpg
-	${LN} -sf ${SYSTTFDIR}/UnPilgi.ttf ${TEXTTFDIR}/unpg/
-	${LN} -sf ${SYSTTFDIR}/UnPilgiBold.ttf ${TEXTTFDIR}/unpg/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unsh
-	${LN} -sf ${SYSTTFDIR}/UnShinmun.ttf ${TEXTTFDIR}/unsh/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/untz
-	${LN} -sf ${SYSTTFDIR}/UnTaza.ttf ${TEXTTFDIR}/untz/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unyt
-	${LN} -sf ${SYSTTFDIR}/UnYetgul.ttf ${TEXTTFDIR}/unyt/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unjbt
-	${LN} -sf ${SYSTTFDIR}/UnJamoBatang.ttf ${TEXTTFDIR}/unjbt/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unjgt
-	${LN} -sf ${SYSTTFDIR}/UnJamoDotum.ttf ${TEXTTFDIR}/unjgt/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unjnv
-	${LN} -sf ${SYSTTFDIR}/UnJamoNovel.ttf ${TEXTTFDIR}/unjnv/
-	${INSTALL_DATA_DIR} ${TEXTTFDIR}/unjsr
-	${LN} -sf ${SYSTTFDIR}/UnJamoSora.ttf ${TEXTTFDIR}/unjsr/
+	${INSTALL_DATA_DIR} ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/
+	cd ${WRKSRC}/fonts; ${PAX} -rw . ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unbt
+	${LN} -sf ${SYSTTFDIR}/UnBatang.ttf ${DESTDIR}${TEXTTFDIR}/unbt/
+	${LN} -sf ${SYSTTFDIR}/UnBatangBold.ttf ${DESTDIR}${TEXTTFDIR}/unbt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/ungt
+	${LN} -sf ${SYSTTFDIR}/UnDotum.ttf ${DESTDIR}${TEXTTFDIR}/ungt/
+	${LN} -sf ${SYSTTFDIR}/UnDotumBold.ttf ${DESTDIR}${TEXTTFDIR}/ungt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/ungr
+	${LN} -sf ${SYSTTFDIR}/UnGraphic.ttf ${DESTDIR}${TEXTTFDIR}/ungr/
+	${LN} -sf ${SYSTTFDIR}/UnGraphicBold.ttf ${DESTDIR}${TEXTTFDIR}/ungr/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/ungs
+	${LN} -sf ${SYSTTFDIR}/UnGungseo.ttf ${DESTDIR}${TEXTTFDIR}/ungs/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unbm
+	${LN} -sf ${SYSTTFDIR}/UnBom.ttf ${DESTDIR}${TEXTTFDIR}/unbm/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unpn
+	${LN} -sf ${SYSTTFDIR}/UnPen.ttf ${DESTDIR}${TEXTTFDIR}/unpn/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unph
+	${LN} -sf ${SYSTTFDIR}/UnPenheulim.ttf ${DESTDIR}${TEXTTFDIR}/unph/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unpg
+	${LN} -sf ${SYSTTFDIR}/UnPilgi.ttf ${DESTDIR}${TEXTTFDIR}/unpg/
+	${LN} -sf ${SYSTTFDIR}/UnPilgiBold.ttf ${DESTDIR}${TEXTTFDIR}/unpg/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unsh
+	${LN} -sf ${SYSTTFDIR}/UnShinmun.ttf ${DESTDIR}${TEXTTFDIR}/unsh/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/untz
+	${LN} -sf ${SYSTTFDIR}/UnTaza.ttf ${DESTDIR}${TEXTTFDIR}/untz/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unyt
+	${LN} -sf ${SYSTTFDIR}/UnYetgul.ttf ${DESTDIR}${TEXTTFDIR}/unyt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unjbt
+	${LN} -sf ${SYSTTFDIR}/UnJamoBatang.ttf ${DESTDIR}${TEXTTFDIR}/unjbt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unjgt
+	${LN} -sf ${SYSTTFDIR}/UnJamoDotum.ttf ${DESTDIR}${TEXTTFDIR}/unjgt/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unjnv
+	${LN} -sf ${SYSTTFDIR}/UnJamoNovel.ttf ${DESTDIR}${TEXTTFDIR}/unjnv/
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unjsr
+	${LN} -sf ${SYSTTFDIR}/UnJamoSora.ttf ${DESTDIR}${TEXTTFDIR}/unjsr/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/thaixfonts/Makefile b/fonts/thaixfonts/Makefile
index fb3aa7c66f2..f133f153b24 100644
--- a/fonts/thaixfonts/Makefile
+++ b/fonts/thaixfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/03 15:33:12 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=	thaixfonts-1.1-3.noarch
@@ -13,6 +13,8 @@ COMMENT=	Various X11 Thai fonts in tis-620 encoding
 
 BUILD_DEPENDS+=	rpm-[0-9]*:../../misc/rpm
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 
 MAKE_ENV+=	FONTDIR=${FONTDIR}
@@ -28,10 +30,8 @@ do-extract:
 	cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | \
 		cpio -i --make-directories \*
 
-pre-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
-
 do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} *.gz fonts.* ${FONTDIR}
+	${INSTALL_DATA_DIR} ${FONTDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.gz fonts.* ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile
index ff4dd2d036b..bd6d50c9ff2 100644
--- a/fonts/ttf2pk/Makefile
+++ b/fonts/ttf2pk/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/03 20:17:12 jlam Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../graphics/freetype-lib/Makefile.common"
 
 PKGNAME=		ttf2pk-${FT_VERS}
@@ -32,25 +34,25 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 do-install:
 	${INSTALL_PROGRAM}	${T2PSRC}/ttf2pk \
 				${T2PSRC}/ttf2tfm \
-				${PREFIX}/bin
+				${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA}		${T2PSRC}/ttf2pk.1 \
 				${T2PSRC}/ttf2tfm.1 \
-				${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR}	${PKG_LOCALTEXMFPREFIX}/doc/ttf2pk
+				${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR}	${DESTDIR}${PKG_LOCALTEXMFPREFIX}/doc/ttf2pk
 	${INSTALL_DATA}		${T2PSRC}/BUGS \
 				${T2PSRC}/README \
 				${T2PSRC}/TODO \
 				${T2PSRC}/ttf2pk.doc \
 				${T2PSRC}/data/ttfonts.map \
-				${PKG_LOCALTEXMFPREFIX}/doc/ttf2pk
-	${INSTALL_DATA_DIR}	${PKG_LOCALTEXMFPREFIX}/ttf2tfm
+				${DESTDIR}${PKG_LOCALTEXMFPREFIX}/doc/ttf2pk
+	${INSTALL_DATA_DIR}	${DESTDIR}${PKG_LOCALTEXMFPREFIX}/ttf2tfm
 	${LN} -fs		ttf2tfm \
-				${PKG_LOCALTEXMFPREFIX}/ttf2pk
-	${INSTALL_DATA_DIR}	${PKG_LOCALTEXMFPREFIX}/ttf2tfm/base
+				${DESTDIR}${PKG_LOCALTEXMFPREFIX}/ttf2pk
+	${INSTALL_DATA_DIR}	${DESTDIR}${PKG_LOCALTEXMFPREFIX}/ttf2tfm/base
 	${INSTALL_DATA}		${T2PSRC}/data/*.enc \
 				${T2PSRC}/data/*.rpl \
 				${T2PSRC}/data/*.sfd \
-				${PKG_LOCALTEXMFPREFIX}/ttf2tfm/base
-	${TOUCH}		${PKG_LOCALTEXMFPREFIX}/ttf2tfm/base/ttfonts.map
+				${DESTDIR}${PKG_LOCALTEXMFPREFIX}/ttf2tfm/base
+	${TOUCH}		${DESTDIR}${PKG_LOCALTEXMFPREFIX}/ttf2tfm/base/ttfonts.map
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile
index 28b08e476df..59094868eae 100644
--- a/fonts/type1inst/Makefile
+++ b/fonts/type1inst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:12 jlam Exp $
 #
 
 DISTNAME=		type1inst-0.6.1
@@ -9,6 +9,8 @@ MASTER_SITES=		${MASTER_SITE_SUNSITE:=X11/xutils/}
 MAINTAINER=		groo@NetBSD.org
 COMMENT=		Automatically generate fonts.scale/fonts.dir for Type1 fonts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		yes
 USE_TOOLS+=		perl:run
 REPLACE_PERL=		t1embed type1inst
@@ -17,10 +19,11 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/${PKGMANDIR}/man1/type1inst.1
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/type1inst
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/type1inst
+	${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/type1inst.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/type1inst.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/type1inst
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/type1inst
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/un-core-ttf/Makefile b/fonts/un-core-ttf/Makefile
index 446de17f0e4..74e89c2f6ad 100644
--- a/fonts/un-core-ttf/Makefile
+++ b/fonts/un-core-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:11 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	un-fonts-core-${UN_CORE_VER}
 PKGNAME=	un-core-ttf-${UN_CORE_VER}
@@ -14,6 +14,8 @@ CONFLICTS+=	un-ttf-[0-9]*
 
 UN_CORE_VER=	1.0
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/un-fonts
 USE_X11BASE=	yes
 NO_CONFIGURE=	yes
@@ -22,7 +24,7 @@ NO_BUILD=	yes
 FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/un-extra-ttf/Makefile b/fonts/un-extra-ttf/Makefile
index f8895deed15..792f48a0684 100644
--- a/fonts/un-extra-ttf/Makefile
+++ b/fonts/un-extra-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:11 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 20:17:12 jlam Exp $
 
 DISTNAME=	un-fonts-extra-${UN_EXTRA_VER}
 PKGNAME=	un-extra-ttf-${UN_EXTRA_VER}
@@ -14,6 +14,8 @@ CONFLICTS+=	un-ttf-[0-9]*
 
 UN_EXTRA_VER=	1.0.1
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/un-fonts
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
@@ -22,7 +24,7 @@ NO_BUILD=	YES
 FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTS_DIRS.ttf}
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index f0b936c2dcd..46d5aa87c3d 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/06/20 15:50:46 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 20:17:13 jlam Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
 PKGREVISION=		3
@@ -12,6 +12,8 @@ COMMENT=		Configuration file for VFlib to use kochi-ttf
 DEPENDS+=		ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
 DEPENDS+=		kochi-ttf-[0-9]*:../../fonts/kochi-ttf
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		yes
@@ -24,7 +26,7 @@ FILES_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
 MESSAGE_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
 PLIST_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
 
-INSTALLATION_DIRS=	share/VFlib/2.24.2
+INSTALLATION_DIRS=	${VFONTCAPDIR}
 
 do-configure:
 	${SED}	-e "s,@KOCHI_TTF_PREFIX@,${KOCHI_TTF_PREFIX},g"		\
@@ -32,6 +34,6 @@ do-configure:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/vfontcap				\
-		${PREFIX}/${VFONTCAPDIR}/vfontcap.kochi-ttf
+		${DESTDIR}${PREFIX}/${VFONTCAPDIR}/vfontcap.kochi-ttf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/watanabe_vfont/Makefile b/fonts/watanabe_vfont/Makefile
index f2e18e8c55c..18f1b2641b2 100644
--- a/fonts/watanabe_vfont/Makefile
+++ b/fonts/watanabe_vfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/09/10 12:19:04 obache Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 20:17:13 jlam Exp $
 #
 
 DISTNAME=	watanabe-vf
@@ -9,6 +9,8 @@ MASTER_SITES=	ftp://ftp.kuis.kyoto-u.ac.jp/TeX/watanabe-jfonts/
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Watanabe-vector Japanese font
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -16,10 +18,11 @@ NO_BUILD=	yes
 USE_TOOLS+=	tar
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/watanabe_font
-	cd ${PREFIX}/share/fonts/watanabe_font \
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/fonts/watanabe_font
+	cd ${DESTDIR}${PREFIX}/share/fonts/watanabe_font \
 		&& ${TAR} xzf ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-	${CHMOD} ${SHAREMODE} ${PREFIX}/share/fonts/watanabe_font/*
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/fonts/watanabe_font/*
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/share/fonts/watanabe_font/*
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} \
+		${DESTDIR}${PREFIX}/share/fonts/watanabe_font/*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile
index 4975a43222a..fe086839d63 100644
--- a/fonts/xmbdfed/Makefile
+++ b/fonts/xmbdfed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/03 20:17:13 jlam Exp $
 
 DISTNAME=	xmbdfed-4.5
 PKGREVISION=	2
@@ -9,13 +9,16 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://crl.nmsu.edu/~mleisher/xmbdfed.html
 COMMENT=	Motif-based BDF font editor with lots of features
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	YES
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xmbdfed.man ${PREFIX}/${PKGMANDIR}/man1/xmbdfed.1
+	${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xmbdfed.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xmbdfed.1
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
-- 
cgit v1.2.3