Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

33 files changed, 231 insertions, 148 deletions

diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 52fef56e17a..1caa4a12f11 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=	biew562
@@ -14,6 +14,8 @@ COMMENT=	Binary viewer/editor
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 MAKE_FILE=	makefile
 WRKSRC=		${WRKDIR}/biew-562
@@ -21,15 +23,15 @@ WRKSRC=		${WRKDIR}/biew-562
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/biew
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/biew
-	${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/assembly.skn ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/golded.skn ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/insight.skn ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/standard.skn ${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/doc/biew_en.txt ${PREFIX}/share/doc/biew
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/biew
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/biew
+	${INSTALL_PROGRAM} ${WRKSRC}/biew ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${DESTDIR}${PREFIX}/share/biew
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/assembly.skn ${DESTDIR}${PREFIX}/share/biew
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/golded.skn ${DESTDIR}${PREFIX}/share/biew
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/insight.skn ${DESTDIR}${PREFIX}/share/biew
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/standard.skn ${DESTDIR}${PREFIX}/share/biew
+	${INSTALL_DATA} ${WRKSRC}/doc/biew_en.txt ${DESTDIR}${PREFIX}/share/doc/biew
 
 .include "../../devel/libslang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index da25e771ed8..1075053756d 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=	ee-1.4.6.src
@@ -11,12 +11,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mahon.cwx.net/
 COMMENT=	Easy to use text editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ee ${PREFIX}/bin/easyedit
-	${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/${PKGMANDIR}/man1/easyedit.1
+	${INSTALL_PROGRAM} ${WRKSRC}/ee ${DESTDIR}${PREFIX}/bin/easyedit
+	${INSTALL_MAN} ${WRKSRC}/ee.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/easyedit.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index d36f5dfda1e..24e555aac47 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=		gice-0.6.2
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gice.sourceforge.net/
 COMMENT=		Powerful C text editor with advanced features
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/gice
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		YES
@@ -21,6 +23,6 @@ INSTALLATION_DIRS=	bin
 .include "../../x11/gtk2/buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gice ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gice ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/heme/Makefile b/editors/heme/Makefile
index 8dc39b88de0..dcb942a3fd4 100644
--- a/editors/heme/Makefile
+++ b/editors/heme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=		heme-0.4
@@ -11,6 +11,7 @@ HOMEPAGE=		http://sourceforge.net/projects/heme/
 COMMENT=		Fast and portable console hex editor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=		heme
 USE_NCURSES=		# mvwchgat
@@ -21,7 +22,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .include "../../devel/ncurses/buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/heme ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/heme.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/heme ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/heme.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 06f081c7ba8..bda2b45fe0b 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=	hnb-1.9.17
@@ -12,6 +12,8 @@ COMMENT=	Hierarchical data organizer
 
 INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-U]-*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 
 BUILD_DIRS=		${WRKSRC}/src
@@ -20,8 +22,8 @@ BUILD_TARGET=		hnb
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/jave/Makefile b/editors/jave/Makefile
index 21ff4d60c59..aeb9da51599 100644
--- a/editors/jave/Makefile
+++ b/editors/jave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/10 23:39:24 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/03 18:25:52 jlam Exp $
 
 DISTNAME=		jave_6.0_M7
 PKGNAME=		jave-6.0m7
@@ -12,6 +12,8 @@ MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.jave.de/
 COMMENT=		Java ASCII Versatile Editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk14 sun-jdk15
 
@@ -27,9 +29,9 @@ do-build:
 		< ${FILESDIR:Q}/jave > ${WRKDIR:Q}/jave
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${PREFIX:Q}/bin
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/jave
-	(cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${PREFIX:Q}/share/jave)
+	${INSTALL_SCRIPT} ${WRKDIR:Q}/jave ${DESTDIR}${PREFIX:Q}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/jave
+	(cd ${WRKDIR:Q}/.workdir && ${PAX} -rw * ${DESTDIR}${PREFIX:Q}/share/jave)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index 843bd2e76a6..e916af711b1 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/07/05 18:21:20 jnemeth Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=	jde-2.3.2
@@ -18,6 +18,8 @@ DEPENDS+=	${EMACS_PKGNAME_PREFIX}eieio>=0.17:../../lang/eieio
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}semantic>=1.4rc13:../../devel/semantic
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}elib>=1.0:../../devel/elib
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/lisp
 
 .include "../../mk/emacs.mk"
@@ -38,17 +40,19 @@ post-extract:
 	@${RMDIR} ${WRKDIR}/${DISTNAME}/java/classes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jde
-	${INSTALL_DATA_DIR} ${PREFIX}/share/jde
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/jde
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jde
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/jde
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/jde
 	cd ${WRKDIR}/${DISTNAME}/doc &&					\
 		${PAX} -s',^src.*,,' -s',.*\.nosearch.*,,'		\
-			-rw * ${PREFIX}/share/doc/jde
+			-rw * ${DESTDIR}${PREFIX}/share/doc/jde
 	cd ${WRKDIR}/${DISTNAME} &&					\
 		${PAX} -s',^java/classes.*,,' -s',^java/src.*,,'	\
-			-s',.*\.nosearch.*,,' -rw java ${PREFIX}/share/jde
+			-s',.*\.nosearch.*,,' -rw java			\
+			${DESTDIR}${PREFIX}/share/jde
 	cd ${WRKDIR}/${DISTNAME} &&					\
-		${PAX} -rw -s ',.*\.orig$$,,' lisp ${EMACS_LISPPREFIX}/jde
+		${PAX} -rw -s ',.*\.orig$$,,' lisp			\
+			${DESTDIR}${EMACS_LISPPREFIX}/jde
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index de6e884dd86..725dc39718a 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/03 18:25:52 jlam Exp $
 #
 
 DISTNAME=		matlab.el
@@ -15,6 +15,8 @@ MAINTAINER=		dmcmahill@NetBSD.org
 HOMEPAGE=		http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=104&objectType=file
 COMMENT=		Matlab mode for Emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${BASEPKGNAME}
 
@@ -35,7 +37,7 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mflteco/Makefile b/editors/mflteco/Makefile
index 757b5d8637a..44811d1ebab 100644
--- a/editors/mflteco/Makefile
+++ b/editors/mflteco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 18:25:52 jlam Exp $
 #
 
 PKGNAME=		mflteco-19920331
@@ -10,25 +10,26 @@ MAINTAINER=		is@NetBSD.org
 HOMEPAGE=		http://www.catb.org/~esr/retro/
 COMMENT=		MFL clone of Tape Editor and COrrector
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=		te
 
 DOCS=			${LOCALBASE}/share/doc/mflteco
 XMPL=			${LOCALBASE}/share/examples/mflteco
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/te ${LOCALBASE}/bin
-	${INSTALL_DATA_DIR} ${DOCS}
-	${INSTALL_DATA_DIR} ${XMPL}
-	${INSTALL_DATA} ${WRKSRC}/00README ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/teco.doc ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/teco.doc.1 ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/.tecorc ${XMPL}
-	${INSTALL_DATA} ${WRKSRC}/pi.tec ${XMPL}
-	${INSTALL_DATA} ${WRKSRC}/sample_tecorc.old ${XMPL}
-	${INSTALL_DATA} ${WRKSRC}/tecorc.mch ${XMPL}
-
-
 pre-patch:
 	cp ${WRKSRC}/Makefile.sun4 ${WRKSRC}/Makefile
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/te ${DESTDIR}${LOCALBASE}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCS}
+	${INSTALL_DATA_DIR} ${DESTDIR}${XMPL}
+	${INSTALL_DATA} ${WRKSRC}/00README ${DESTDIR}${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/teco.doc ${DESTDIR}${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/teco.doc.1 ${DESTDIR}${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/.tecorc ${DESTDIR}${XMPL}
+	${INSTALL_DATA} ${WRKSRC}/pi.tec ${DESTDIR}${XMPL}
+	${INSTALL_DATA} ${WRKSRC}/sample_tecorc.old ${DESTDIR}${XMPL}
+	${INSTALL_DATA} ${WRKSRC}/tecorc.mch ${DESTDIR}${XMPL}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mg2a/Makefile b/editors/mg2a/Makefile
index 9ca87d81407..63e5f9908f7 100644
--- a/editors/mg2a/Makefile
+++ b/editors/mg2a/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 00:41:29 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/03 18:25:52 jlam Exp $
 
 DISTNAME=	mg2a
 PKGNAME=	mg2a-1.11
@@ -9,6 +9,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tron@NetBSD.org
 COMMENT=	Small, fast, public domain EMACS style editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=		mg
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
@@ -20,8 +22,8 @@ pre-configure:
 	esac
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mg ${PREFIX}/bin/mg
-	${INSTALL_MAN} ${WRKSRC}/mg.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/mg.rc ${PREFIX}/bin/mg.rc
+	${INSTALL_PROGRAM} ${WRKSRC}/mg ${DESTDIR}${PREFIX}/bin/mg
+	${INSTALL_MAN} ${WRKSRC}/mg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/mg.rc ${DESTDIR}${PREFIX}/bin/mg.rc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 184414f26c8..a11478b728b 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/05/20 15:49:29 taca Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 18:25:52 jlam Exp $
 
 DISTNAME=	Mule-UCS-0.84
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 #HOMEPAGE=
 COMMENT=	Another encoding conversion mechanism for Emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 BUILDLINK_API_DEPENDS.emacs20+=	emacs>=20.7nb1
@@ -25,20 +27,20 @@ do-build:
 	${EMACS_BIN} -q --no-site-file -batch -l x0213-comp.el
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/mule-ucs
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs
 	cd ${WRKSRC}/lisp && \
 	for f in ChangeLog README* *.txt *.el *.elc *.txt; do \
-		${INSTALL_DATA} $$f ${EMACS_LISPPREFIX}/mule-ucs; \
+		${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs; \
 	done
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/mule-ucs/big5conv
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv
 	${INSTALL_DATA} ${WRKSRC}/lisp/big5conv/* \
-	    ${EMACS_LISPPREFIX}/mule-ucs/big5conv; \
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/mule-ucs/jisx0213
+	    ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv; \
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213
 	${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/* \
-	    ${EMACS_LISPPREFIX}/mule-ucs/jisx0213; \
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/mule-ucs/reldata
+	    ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213; \
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata
 	${INSTALL_DATA} ${WRKSRC}/lisp/reldata/* \
-	    ${EMACS_LISPPREFIX}/mule-ucs/reldata
+	    ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata
 
 .include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 624c5836f06..efa87d7dcdf 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	ne-1.31
 CATEGORIES=	editors
@@ -8,6 +8,8 @@ DISTFILES=	${DISTNAME}.tar.gz ne.manpage.1 NE.spec.ascii NE.changes.spec
 MAINTAINER=	bjh@mail.dotcom.fr
 COMMENT=	Re-write of Phoenix E.  A sensible light-weight editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}/src
 
@@ -18,10 +20,11 @@ BUILD_TARGET=	NetBSD ne
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nenewp ${PREFIX}/bin/ne
-	${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 ${PREFIX}/${PKGMANDIR}/man1/ne.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ne
+	${INSTALL_PROGRAM} ${WRKSRC}/nenewp ${DESTDIR}${PREFIX}/bin/ne
+	${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ne.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ne
 	${INSTALL_DATA} ${_DISTDIR}/NE.spec.ascii ${_DISTDIR}/NE.changes.spec \
-		${WRKSRC}/LICENCE ${PREFIX}/share/doc/ne
+		${WRKSRC}/LICENCE ${DESTDIR}${PREFIX}/share/doc/ne
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ng/Makefile b/editors/ng/Makefile
index 5052a18240d..6585a27ab1b 100644
--- a/editors/ng/Makefile
+++ b/editors/ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:26 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	ng-1.4.3
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	fk200329@fsinet.or.jp
 HOMEPAGE=	http://tt.sakura.ne.jp/~amura/ng/
 COMMENT=	Very light Emacs-clone with japanese support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/ng
 
 PKG_SUPPORTED_OPTIONS=	canna
@@ -30,17 +32,15 @@ post-patch:
 	@(cd ${WRKSRC}; ${LN} -s sys/bsd/Makefile . )
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/bin/
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ng
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.FAQ ${PREFIX}/share/doc/ng/Ng.FAQ.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.doc ${PREFIX}/share/doc/ng/Ng.doc.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.ref ${PREFIX}/share/doc/ng/Ng.ref.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.tut ${PREFIX}/share/doc/ng/Ng.tut.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/README.Ng ${PREFIX}/share/doc/ng/README.Ng.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/README.SKG ${PREFIX}/share/doc/ng/README.SKG.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.new ${PREFIX}/share/doc/ng/CHANGES.new.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.doc ${PREFIX}/share/doc/ng/CHANGES.doc.euc-jp
+	${INSTALL_PROGRAM} ${WRKSRC}/ng ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ng
+	${INSTALL_DATA} ${WRKSRC}/docs/Ng.FAQ ${DESTDIR}${PREFIX}/share/doc/ng/Ng.FAQ.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/Ng.doc ${DESTDIR}${PREFIX}/share/doc/ng/Ng.doc.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/Ng.ref ${DESTDIR}${PREFIX}/share/doc/ng/Ng.ref.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/Ng.tut ${DESTDIR}${PREFIX}/share/doc/ng/Ng.tut.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/README.Ng ${DESTDIR}${PREFIX}/share/doc/ng/README.Ng.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/README.SKG ${DESTDIR}${PREFIX}/share/doc/ng/README.SKG.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.new ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.new.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.doc ${DESTDIR}${PREFIX}/share/doc/ng/CHANGES.doc.euc-jp
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 622120781b5..a3db611764a 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2007/03/21 19:39:08 jwise Exp $
+# $NetBSD: Makefile,v 1.71 2008/03/03 18:25:53 jlam Exp $
 #
 # NOTE:
 # When updating, it is necessary to change the shlib version, located in
@@ -20,6 +20,8 @@ COMMENT=	Text editor (ships with Pine), and Pine's text editing lib
 
 LICENSE=	pine-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		yes
 
 .include "../../mk/bsd.prefs.mk"
@@ -65,13 +67,13 @@ do-build:
 
 do-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/pico/libpico.la ${PREFIX}/lib
+		${WRKSRC}/pico/libpico.la ${DESTDIR}${PREFIX}/lib
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/${PKGMANDIR}/man1
+		${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/include/pico
-	cd ${WRKSRC}/pico && ${INSTALL_DATA} *.h ${PREFIX}/include/pico
+	cd ${WRKSRC}/pico && ${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include/pico
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 17fb064fe95..0ee89ce4f2f 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/03 18:25:53 jlam Exp $
 #
 
 DISTNAME=	edit-2.0
@@ -14,6 +14,8 @@ COMMENT=	Simple text editor for ROX
 
 DEPENDS+=	rox-lib>=2.0.2nb2:../../devel/rox-lib
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/Edit
 DIST_SUBDIR=	rox
 
@@ -34,7 +36,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/.cvsignore
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/share/rox/Edit
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/rox/Edit
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index ccbe506a431..04b9c4ceaf4 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/07/05 18:21:20 jnemeth Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/03 18:25:53 jlam Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cedet.sourceforge.net/speedbar.shtml
 COMMENT=	Directory and code browser for emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/emacs.mk"
 
 PKGSRC_MAKE_ENV+=	EMACS=${EMACS}
@@ -31,13 +33,14 @@ IMAGES=	sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm 	\
 INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/speedbar
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/speedbar
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
-			${EMACS_LISPPREFIX}/speedbar
-	cd ${WRKSRC} && ${INSTALL_DATA} ${IMAGES} ${EMACS_LISPPREFIX}/speedbar
+			${DESTDIR}${EMACS_LISPPREFIX}/speedbar
+	cd ${WRKSRC} && ${INSTALL_DATA} ${IMAGES}			\
+			${DESTDIR}${EMACS_LISPPREFIX}/speedbar
 	cd ${WRKSRC}; for file in *.info *.info-[0-9]*; do		\
 		${TEST} ! -f "$$file" ||				\
-		${INSTALL_DATA} "$$file" ${EMACS_INFOPREFIX};		\
+		${INSTALL_DATA} "$$file" ${DESTDIR}${EMACS_INFOPREFIX};	\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index 2bede250f9e..2b6bbae363e 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:20 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_cs_CZ
 PKGNAME=	ted-cs-2.16
@@ -12,6 +12,8 @@ COMMENT=	Czech spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Czech.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Czech.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index 8ca3abeab5c..03db47864e0 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_da_DK
 PKGNAME=	ted-da-2.16
@@ -12,6 +12,8 @@ COMMENT=	Danish spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Danish.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Danish.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 5cb2405fc06..36be385e6ef 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_de_DE
 PKGNAME=	ted-de-2.16
@@ -12,6 +12,8 @@ COMMENT=	German spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/German.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/German.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index ddab181d475..0e837e887a3 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_en_GB
 PKGNAME=	ted-en-gb-2.16
@@ -12,6 +12,8 @@ COMMENT=	UK English spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/UK_English.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/UK_English.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index ecd1eaddb2e..a7eea661632 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-en-us-2.16
@@ -12,6 +12,8 @@ COMMENT=	US English spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/Ted-2.16
 USE_X11BASE=	YES
 NO_BUILD=	YES
@@ -23,6 +25,7 @@ post-extract:
 	@cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/US_English.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/US_English.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index c813b6bcb47..197f6c11ec5 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_es_ES
 PKGNAME=	ted-es-2.16
@@ -12,6 +12,8 @@ COMMENT=	Spanish spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Spanish.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Spanish.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 42fb8b3c48b..575d62677ca 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_fr_FR
 PKGNAME=	ted-fr-2.16
@@ -12,6 +12,8 @@ COMMENT=	French spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/French.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/French.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index c6a77457a30..a01d5fe0ee0 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_it_IT
 PKGNAME=	ted-it-2.16
@@ -12,6 +12,8 @@ COMMENT=	Italian spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Italian.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Italian.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index f27ffdc91f5..cfcb3925625 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_nl_NL
 PKGNAME=	ted-nl-2.16
@@ -12,6 +12,8 @@ COMMENT=	Dutch spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Dutch.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Dutch.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 699a266af8b..d24efc05ff3 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_no_NO
 PKGNAME=	ted-no-2.16
@@ -12,6 +12,8 @@ COMMENT=	Norwegian spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Norwegian.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Norwegian.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index 9a5d428bbf9..115e15dda34 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/06/08 18:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_pl_PL
 PKGNAME=	ted-pl-2.16
@@ -12,6 +12,8 @@ COMMENT=	Polish spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -30,8 +32,10 @@ post-patch:
 		>>${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Polish.ind ${PREFIX}/share/Ted/ind
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults/pl_PL
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted ${PREFIX}/lib/X11/app-defaults/pl_PL/
+	${INSTALL_DATA} ${WRKSRC}/ind/Polish.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/app-defaults/pl_PL
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted \
+		${DESTDIR}${PREFIX}/lib/X11/app-defaults/pl_PL/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index 2134311df51..72839cb27fc 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_pt_PT
 PKGNAME=	ted-pt-2.16
@@ -12,6 +12,8 @@ COMMENT=	Portuguese spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Portuguese.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Portuguese.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index 5091207cd1b..a582d19ad52 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/08 18:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	Ted_sv_SE
 PKGNAME=	ted-sv-2.16
@@ -12,6 +12,8 @@ COMMENT=	Swedish spelling dictionary for the Ted word processor
 
 DEPENDS+=	ted>=2.6:../../editors/ted
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	YES
 
@@ -21,6 +23,7 @@ NO_BUILD=	YES
 INSTALLATION_DIRS=	share/Ted/ind
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ind/Swedish.ind ${PREFIX}/share/Ted/ind
+	${INSTALL_DATA} ${WRKSRC}/ind/Swedish.ind \
+		${DESTDIR}${PREFIX}/share/Ted/ind
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index aa4024a1b9b..1cf81e7acb8 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/06/08 18:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-2.16
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.nllgg.nl/Ted/
 COMMENT=	X11 based WordPad-like word processor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gtar
 
@@ -56,8 +57,8 @@ post-patch:
 		Ted.ad.sample > Ted.ad
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${PREFIX}/bin/Ted
-	${INSTALL_DATA_DIR} ${AFMDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted
+	${INSTALL_DATA_DIR} ${DESTDIR}${AFMDIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/afm/Courier-Bold.afm \
 		${WRKSRC}/afm/Courier-BoldOblique.afm \
@@ -72,12 +73,13 @@ do-install:
 		${WRKSRC}/afm/Times-BoldItalic.afm \
 		${WRKSRC}/afm/Times-Italic.afm \
 		${WRKSRC}/afm/Times-Roman.afm \
-		${AFMDIR}
-	${INSTALL_DATA_DIR} ${INDDIR}
-	${INSTALL_DATA} ${FILESDIR}/README.ind ${INDDIR}
-	${INSTALL_DATA_DIR} ${INFODIR}
-	${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${INFODIR}
-	${INSTALL_DATA}	${WRKSRC}/Ted/Ted.ad ${PREFIX}/lib/X11/app-defaults/Ted
+		${DESTDIR}${AFMDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${INDDIR}
+	${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${INFODIR}
+	${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
+	${INSTALL_DATA}	${WRKSRC}/Ted/Ted.ad \
+		${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/editors/ve/Makefile b/editors/ve/Makefile
index 65122da6bc7..235b183951c 100644
--- a/editors/ve/Makefile
+++ b/editors/ve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	ve-1.0
 CATEGORIES=	editors
@@ -9,6 +9,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	rxg@NetBSD.org
 COMMENT=	NTHU-CS Maple BBS 2.36 BBS-like editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 post-patch:
@@ -16,8 +18,8 @@ post-patch:
 	${MV} ${WRKSRC}/edit.c.done ${WRKSRC}/edit.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ve ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ve
-	${INSTALL_DATA} ${WRKSRC}/ve.hlp ${PREFIX}/share/ve
+	${INSTALL_PROGRAM} ${WRKSRC}/ve ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/ve
+	${INSTALL_DATA} ${WRKSRC}/ve.hlp ${DESTDIR}${PREFIX}/share/ve
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 4fdbac702ee..1b226177d9d 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/30 23:06:18 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=		xcoral-3.2
 PKGREVISION=		1
@@ -8,6 +8,8 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=editors/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Multiwindow mouse-based text editor for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
@@ -22,13 +24,13 @@ LIBFILES=	DEPEND README cmd.sc color.sc comments.sc compare-win.sc \
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/xcoral
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcoral/HTML/icons
-	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/xcoral
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xcoral/HTML/icons
+	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${DESTDIR}${PREFIX}/bin
 .for FILE in ${LIBFILES}
-	${INSTALL_DATA} ${WRKSRC}/SmacLib/${FILE} ${PREFIX}/lib/xcoral
+	${INSTALL_DATA} ${WRKSRC}/SmacLib/${FILE} ${DESTDIR}${PREFIX}/lib/xcoral
 .endfor
-	${CP} -r ${WRKSRC}/Doc/* ${PREFIX}/share/doc/xcoral
+	${CP} -r ${WRKSRC}/Doc/* ${DESTDIR}${PREFIX}/share/doc/xcoral
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 4b2d1065448..0c0a30fb1a5 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/01/01 20:22:36 agc Exp $
+# $NetBSD: Makefile,v 1.54 2008/03/03 18:25:53 jlam Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.16
@@ -132,6 +132,8 @@ COMMENT=	Common elisp packages for xemacs 21
 
 DEPENDS+=	xemacs{,-nox11}>=21.1.14:../../editors/xemacs
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGBASE}
 EXTRACT_ONLY=	# empty
@@ -206,27 +208,29 @@ xemacs-update-package: xemacs-fetch-package-list xemacs-merge-package-list
 .endif	# PKG_DEVELOPER && OPSYS == "NetBSD"
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/xemacs/xemacs-packages
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 .for DISTFILE in ${DISTFILES}
 	@${ECHO_MSG} -n "Extracting ${DISTFILE} ... "
-	@${GTAR} xCzf ${PREFIX}/lib/xemacs/xemacs-packages \
+	@${GTAR} xCzf ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages \
 		${DISTDIR}/${DIST_SUBDIR}/${DISTFILE}
 	@${ECHO_MSG} "done"
 .endfor
 	@${ECHO_MSG} -n "Fixing file ownerships ... "
-	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/xemacs/xemacs-packages
+	@${CHOWN} -R ${BINOWN}:${BINGRP} \
+		${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 	@${ECHO_MSG} "done"
 .for PROG in ${REPLACEMENT_PROGS}
 	@${ECHO_MSG} "Fixing ${PROG} paths"
 	for f in ${REPLACEMENTS.${PROG}}; do 			\
-		cp $$f $$f.pre;					\
-		sed -e 's|#!.*${PROG}|${PREFIX}/bin/${PROG}|' $$f.pre > $$f;\
-		rm $$f.pre;					\
+		cp ${DESTDIR}$$f ${DESTDIR}$$f.pre;		\
+		sed -e 's|#!.*${PROG}|${PREFIX}/bin/${PROG}|'	\
+			${DESTDIR}$$f.pre > ${DESTDIR}$$f;	\
+		rm ${DESTDIR}$$f.pre;				\
 	done
 .endfor
 .if defined(MANZ)
 	@${ECHO_MSG} -n "Compressing \".el\" files ... "
-	@cd ${PREFIX} && \
+	@cd ${DESTDIR}${PREFIX} && \
 		${GREP} '\$${ELSUFX}$$' ${PLIST_SRC} | \
 		${SED} -e 's#\$${ELSUFX}$$##' | \
 		${XARGS} ${GZIP_CMD}