* Convert to USE_TOOLS+=itools instead of including nbitools/buildlink3.mk.

* Fully convert to the pkginstall framework by using it to manage
  directories required at install time.

* Rewrite the canna rc.d script to ensure that all needed directories
  are present before the daemon is started.

* Miscellaneous touch ups to the DESCR and MESSAGE files.

* Remove the need to explicitly set PREFIX.  These packages now install
  into ${LOCALBASE} and use symlinks and file copies to put the files
  into the ${IMDICTDIR}.

Bump the PKGREVISIONs for the canna* packages.

2 files changed, 65 insertions, 38 deletions

diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index 313452e7490..82bfb0d37d4 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,38 +1,66 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
-#
-.include "../../inputmethod/canna/Makefile.common"
+# $NetBSD: Makefile,v 1.10 2006/07/05 04:48:28 jlam Exp $
 
+PKGREVISION=	1
 CANNA_MODULE=	dict
 
-BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
+.include "../../inputmethod/canna/Makefile.common"
 
-NO_MTREE=	yes
-OWN_DIRS=	${PREFIX}/canna
+BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
 
 EVAL_PREFIX+=	CANNASERVERBINDIR=Canna-server
 .for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
-CANNA_CMD_SED_SCRIPT+=-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
+CANNA_CMD_SED_SCRIPT+=	\
+	-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
 .endfor
 
+CONFIGURE_DIRS=		${DICT_WRKSRC}
+DICT_WRKSRC=		${WRKSRC}/dic/ideo
+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|' \
+	@${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 \
-		${MV} $$file $$file.orig;	\
+		${MV} $$file $$file.orig;				\
 		${SED} ${CANNA_CMD_SED_SCRIPT} $$file.orig > $$file;	\
-	 done
-
-do-configure:
-	@cd ${WRKSRC}/dic/ideo; ${XMKMF}
-
-do-build:
-	@cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	done
 
 do-install:
-	@cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 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}
 
-.include "../../inputmethod/canna/Makefile.include"
+	${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
 
-# Need to set this here _after_ bsd.pkg.mk
-PREFIX=		${IMDICTDIR}
+.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna-dict/PLIST b/inputmethod/canna-dict/PLIST
index 71b879d3390..a1e4f635c4a 100644
--- a/inputmethod/canna-dict/PLIST
+++ b/inputmethod/canna-dict/PLIST
@@ -1,18 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/23 15:06:59 uebayasi Exp $
-canna/canna/bushu.cld
-canna/canna/chimei.ctd
-canna/canna/dics.dir
-canna/canna/fuzokugo.cbd
-canna/canna/hojomwd.ctd
-canna/canna/hojoswd.ctd
-canna/canna/iroha.cbd
-canna/canna/iroha.cld
-canna/canna/kanasmpl.ctd
-canna/canna/katakana.ctd
-canna/canna/keishiki.ctd
-canna/canna/necgaiji.ctd
-canna/canna/number.ctd
-canna/canna/software.ctd
-canna/canna/suffix.ctd
-@dirrm canna/canna
-@dirrm canna
+@comment $NetBSD: PLIST,v 1.3 2006/07/05 04:48:28 jlam Exp $
+libdata/canna/bushu.cld
+libdata/canna/chimei.ctd
+libdata/canna/dics.dir
+libdata/canna/fuzokugo.cbd
+libdata/canna/hojomwd.ctd
+libdata/canna/hojoswd.ctd
+libdata/canna/iroha.cbd
+libdata/canna/iroha.cld
+libdata/canna/kanasmpl.ctd
+libdata/canna/katakana.ctd
+libdata/canna/keishiki.ctd
+libdata/canna/necgaiji.ctd
+libdata/canna/number.ctd
+libdata/canna/software.ctd
+libdata/canna/suffix.ctd
+@dirrm libdata/canna