Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

5 files changed, 32 insertions, 21 deletions

diff --git a/inputmethod/Chinput/Makefile b/inputmethod/Chinput/Makefile
index 90c32070468..331352a8aff 100644
--- a/inputmethod/Chinput/Makefile
+++ b/inputmethod/Chinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/15 14:38:28 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 15:55:13 jlam Exp $
 
 DISTNAME=	Chinput-3.0
 PKGREVISION=	3
@@ -9,6 +9,8 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.opencjk.org/~yumj/project-chinput.html
 COMMENT=	Chinese input server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 
 BUILD_TARGET=	chinput
@@ -26,12 +28,10 @@ post-patch:
 		${WRKSRC}/resource/Chinput.ad
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/chinput ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/resource/Chinput.ad ${PREFIX}/etc
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Chinput
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/Chinput
+	${INSTALL_PROGRAM} ${WRKSRC}/src/chinput ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/resource/Chinput.ad ${DESTDIR}${PREFIX}/etc
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/Chinput
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/Chinput
 
 .include "../../inputmethod/unicon-im/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile
index 0f2d55c9b41..8583b40c14c 100644
--- a/inputmethod/anthy-elisp/Makefile
+++ b/inputmethod/anthy-elisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/20 05:28:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/04 15:55:13 jlam Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 PKGNAME=	${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
@@ -10,6 +10,8 @@ COMMENT=	Emacs lisp files for inputmethod/anthy
 
 DEPENDS+=	anthy>=${ANTHY_VERSION}:../../inputmethod/anthy
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	EMACS=${EMACS_BIN:Q}
 EMACS_MODULES+=	base leim
@@ -20,8 +22,8 @@ do-build:
 	cd ${WRKSRC}/src-util && ${MAKE} elc-stamp
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/anthy
-	${INSTALL_DATA} ${WRKSRC}/src-util/*.el	 ${EMACS_LISPPREFIX}/anthy
-	${INSTALL_DATA} ${WRKSRC}/src-util/*.elc ${EMACS_LISPPREFIX}/anthy
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/anthy
+	${INSTALL_DATA} ${WRKSRC}/src-util/*.el	 ${DESTDIR}${EMACS_LISPPREFIX}/anthy
+	${INSTALL_DATA} ${WRKSRC}/src-util/*.elc ${DESTDIR}${EMACS_LISPPREFIX}/anthy
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/iiimecf/Makefile b/inputmethod/iiimecf/Makefile
index a73535fd640..65f06a76944 100644
--- a/inputmethod/iiimecf/Makefile
+++ b/inputmethod/iiimecf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/10/29 13:02:50 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/04 15:55:13 jlam Exp $
 #
 
 DISTNAME=	IIIMECF-0.6
@@ -11,14 +11,16 @@ MAINTAINER=	uebayasi@NetBSD.org
 #HOMEPAGE=
 COMMENT=	Emacs Lisp library for IIIM Protocol
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 do-build:
 	@cd ${WRKSRC} && \
 		${EMACS_BIN} -q --no-site-file -batch -l iiimcf-comp.el
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/iiimecf
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/iiimecf
 	@for f in ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc; do \
-		${INSTALL_DATA} $$f ${EMACS_LISPPREFIX}/iiimecf; \
+		${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/iiimecf; \
 	done
 
 .include "../../mk/emacs.mk"
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
index 3b9984e03b3..d5f4dc87805 100644
--- a/inputmethod/sj3-dict/Makefile
+++ b/inputmethod/sj3-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/05 04:55:23 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/04 15:55:14 jlam Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
@@ -17,6 +17,8 @@ FILESDIR=	${.CURDIR}/../sj3-lib/files
 DISTINFO_FILE=	${.CURDIR}/../sj3-lib/distinfo
 PATCHDIR=	${.CURDIR}/../sj3-lib/patches
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 USE_TOOLS+=	itools
@@ -41,6 +43,7 @@ pre-configure:
 			> ${WRKSRC}/dict/dict/Imakefile
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/dict/dict/sj3main.dic ${PREFIX}/libdata
+	${INSTALL_DATA} ${WRKSRC}/dict/dict/sj3main.dic \
+		${DESTDIR}${PREFIX}/libdata
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index 3dbade08e4b..c3e3f8cf093 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/09/07 22:12:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/04 15:55:14 jlam Exp $
 
 DISTNAME=	skkfep0.86c
 PKGNAME=	skkfep-0.86c
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/aito-soft.html
 COMMENT=	Terminal based SKK-like Kana-to-Kanji FrontEnd Processor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEFS+=	IPV6_READY
 
 WRKSRC=		${WRKDIR}/skkfep
@@ -21,9 +23,11 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 CONF_FILES+=	${PREFIX}/share/examples/skk/skk.conf ${PKG_SYSCONFDIR}/skk.conf
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep
-	${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/${PKGMANDIR}/man1/skkfep.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skk
-	${INSTALL_DATA} ${FILESDIR}/skk.conf ${PREFIX}/share/examples/skk/skk.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${DESTDIR}${PREFIX}/bin/skkfep
+	${INSTALL_MAN} ${WRKSRC}/skkfep.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/skkfep.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/skk
+	${INSTALL_DATA} ${FILESDIR}/skk.conf \
+		${DESTDIR}${PREFIX}/share/examples/skk/skk.conf
 
 .include "../../mk/bsd.pkg.mk"