* add user-destdir support

* fix permission of dict directory for binary package
Bump PKGREVISION.

1 files changed, 43 insertions, 34 deletions

diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index 106de845e48..094d7bc1a26 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2009/01/10 03:06:34 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/02/20 11:44:53 obache Exp $
 
-PKGREVISION=	1
+PKGREVISION=	2
 CANNA_MODULE=	dict
 
 MAKE_JOBS_SAFE=	no
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../inputmethod/canna/Makefile.common"
 
 BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
@@ -22,47 +24,54 @@ CANNA_DICTDIR=		${PREFIX}/libdata/canna
 PKG_GROUPS=	${CANNA_GROUP}
 PKG_USERS=	${CANNA_USER}:${CANNA_GROUP}
 
-INSTALL_DICT_DIR=	\
-	${INSTALL} -d -o ${CANNA_USER} -g ${CANNA_GROUP} -m 0775
-INSTALL_DICT=		\
-	${INSTALL} ${COPY} -o ${CANNA_USER} -g ${CANNA_GROUP} -m 0664
-
 post-patch:
 	@${MV} ${WRKSRC}/Canna.conf ${WRKSRC}/Canna.conf.orig
 	@${SED} -e 's|\(DicDir.*=\).*|\1${IMDICTDIR}/canna|'		\
 		${WRKSRC}/Canna.conf.orig > ${WRKSRC}/Canna.conf
-	@for file in `${FIND} ${WRKSRC}/dic/ideo -name Imakefile -print`; do \
+	@for file in `${FIND} ${DICT_WRKSRC} -name Imakefile -print`; do \
 		${MV} $$file $$file.orig;				\
 		${SED} ${CANNA_CMD_SED_SCRIPT} $$file.orig > $$file;	\
 	done
 
+INSTALLATION_DIRS+=	${CANNA_DICTDIR}
+
 do-install:
-	${INSTALL_DICT_DIR} ${CANNA_DICTDIR}
-	${INSTALL_DICT} ${DICT_WRKSRC}/grammar/fuzokugo.cbd ${CANNA_DICTDIR}
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/bushu.cld ${CANNA_DICTDIR}
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/dics.dir ${CANNA_DICTDIR}
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/iroha.cbd ${CANNA_DICTDIR}
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/iroha.cld ${CANNA_DICTDIR}
+	${INSTALL_DATA} ${DICT_WRKSRC}/grammar/fuzokugo.cbd		\
+					${DESTDIR}${CANNA_DICTDIR}
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/bushu.cld			\
+					${DESTDIR}${CANNA_DICTDIR}
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/dics.dir			\
+					${DESTDIR}${CANNA_DICTDIR}
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/iroha.cbd			\
+					${DESTDIR}${CANNA_DICTDIR}
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/iroha.cld 			\
+					${DESTDIR}${CANNA_DICTDIR}
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/chimei.t			\
+					${DESTDIR}${CANNA_DICTDIR}/chimei.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/hojomwd.t			\
+					${DESTDIR}${CANNA_DICTDIR}/hojomwd.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/hojoswd.t			\
+					${DESTDIR}${CANNA_DICTDIR}/hojoswd.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/kanasmpl.t			\
+					${DESTDIR}${CANNA_DICTDIR}/kanasmpl.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/katakana.t			\
+					${DESTDIR}${CANNA_DICTDIR}/katakana.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/keishiki.t			\
+					${DESTDIR}${CANNA_DICTDIR}/keishiki.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/necgaiji.t			\
+					${DESTDIR}${CANNA_DICTDIR}/necgaiji.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/number.t			\
+					${DESTDIR}${CANNA_DICTDIR}/number.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/software.t			\
+					${DESTDIR}${CANNA_DICTDIR}/software.ctd
+	${INSTALL_DATA} ${DICT_WRKSRC}/words/suffix.t			\
+					${DESTDIR}${CANNA_DICTDIR}/suffix.ctd
 
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/chimei.t			\
-						${CANNA_DICTDIR}/chimei.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/hojomwd.t			\
-						${CANNA_DICTDIR}/hojomwd.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/hojoswd.t			\
-						${CANNA_DICTDIR}/hojoswd.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/kanasmpl.t			\
-						${CANNA_DICTDIR}/kanasmpl.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/katakana.t			\
-						${CANNA_DICTDIR}/katakana.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/keishiki.t			\
-						${CANNA_DICTDIR}/keishiki.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/necgaiji.t			\
-						${CANNA_DICTDIR}/necgaiji.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/number.t			\
-						${CANNA_DICTDIR}/number.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/software.t			\
-						${CANNA_DICTDIR}/software.ctd
-	${INSTALL_DICT} ${DICT_WRKSRC}/words/suffix.t			\
-						${CANNA_DICTDIR}/suffix.ctd
+REQD_DIRS_PERMS+=	${CANNA_DICTDIR} ${CANNA_USER} ${CANNA_GROUP} 0775
+.for d in fuzokugo.cbd bushu.cld dics.dir iroha.cbd iroha.cld \
+	chimei.ctd hojomwd.ctd hojoswd.ctd kanasmpl.ctd katakana.ctd \
+	keishiki.ctd necgaiji.ctd number.ctd software.ctd suffix.ctd
+SPECIAL_PERMS+=	${CANNA_DICTDIR}/${d} ${CANNA_USER} ${CANNA_GROUP} 0664
+.endfor
 
 .include "../../mk/bsd.pkg.mk"