* 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.

3 files changed, 19 insertions, 35 deletions

diff --git a/inputmethod/canna-canuum/MESSAGE b/inputmethod/canna-canuum/MESSAGE
index fdb62555fe3..e2b9b564b21 100644
--- a/inputmethod/canna-canuum/MESSAGE
+++ b/inputmethod/canna-canuum/MESSAGE
@@ -1,8 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/09/23 15:06:58 uebayasi Exp $
+$NetBSD: MESSAGE,v 1.2 2006/07/05 04:48:28 jlam Exp $
+
+You at least should set up key functions in ~/.canna, e.g.:
+
+    (set-key 'alpha-mode "\C-i" 'japanese-mode)
+    (set-key 'empty-mode "\C-i" 'alpha-mode)
 
-You at least should set up key functions in "${HOME}/.canna".
-such as:
-(set-key 'alpha-mode "\C-i" 'japanese-mode)
-(set-key 'empty-mode "\C-i" 'alpha-mode)
 ===========================================================================
diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile
index 657d1561a6b..49ed75350fe 100644
--- a/inputmethod/canna-canuum/Makefile
+++ b/inputmethod/canna-canuum/Makefile
@@ -1,43 +1,25 @@
-# $NetBSD: Makefile,v 1.5 2006/01/12 01:57:31 joerg Exp $
-#
-.include "../../inputmethod/canna/Makefile.common"
+# $NetBSD: Makefile,v 1.6 2006/07/05 04:48:28 jlam Exp $
 
+PKGREVISION=	1
 CANNA_MODULE=	canuum
 
+.include "../../inputmethod/canna/Makefile.common"
+
 MAINTAINER=	oishi@ims.ac.jp
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
 INSTALLATION_DIRS=	man/ja_JP.EUC/man1
 
+CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/canuum
+BUILD_DIRS=	${WRKSRC}/canuum
+
+.include "../../inputmethod/canna-lib/buildlink3.mk"
+
 pre-configure:
 	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/canuum
 	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/canuum
+	${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
+	${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
-		${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \
-		${MAKE_PROGRAM} ${MAKE_ARGS} cannaconf.h
-	@cd ${WRKSRC}/canuum; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
-		${MAKE_PROGRAM} ${MAKE_ARGS} Makefile; \
-		${MAKE_PROGRAM} ${MAKE_ARGS} includes
-	@${LN} ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
-	@${LN} ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
-	@cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} depend
-
-do-build:
-	@cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} all
-
-pre-install:
-	@${MKDIR} ${WRKSRC}/canuum/misc
-
-do-install:
-	@cd ${WRKSRC}/canuum; ${MAKE_PROGRAM} ${MAKE_ARGS} install
-
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/canuum/canuum.jmn \
-		${PREFIX}/man/ja_JP.EUC/man1/canuum.1
-
-.include "../../devel/nbitools/buildlink3.mk"
-.include "../../inputmethod/canna-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna-canuum/PLIST b/inputmethod/canna-canuum/PLIST
index f72696e88b1..a7cc875aef9 100644
--- a/inputmethod/canna-canuum/PLIST
+++ b/inputmethod/canna-canuum/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2003/09/23 15:06:59 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/05 04:48:28 jlam Exp $
 bin/canuum
+man/man1/canuum.1
 man/ja_JP.EUC/man1/canuum.1