bump PKGREVISION.

add buildlink.mk.
use devel/nbitools instead of ${X11BASE}/xmkmf.
purge /var/dict/canna.

12 files changed, 95 insertions, 105 deletions

diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 02699a43b1f..85e00a752d2 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/10 09:47:26 sakamoto Exp $
 #
 
 DISTNAME=	Canna35b2
 PKGNAME=	Canna-lib-3.5.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
 
@@ -18,9 +18,6 @@ COMMENT=	Kana-Kanji conversion system (library)
 
 INSTALL_TARGET=	install install.man
 
-# XXX USE_IMAKE can't pass MAKE_FLAGS to XMKMF.
-#USE_IMAKE=	# defined
-USE_X11BASE=	# defined
 BUILD_DEFS+=	USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
@@ -31,18 +28,11 @@ INET6=		# empty
 .endif
 CANNAOWNER?=    daemon
 CANNAGROUP?=    daemon
-DICT_DIR?=	${DESTDIR}/var/dict
 MAKE_ENV+=      CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
-		DICT_DIR=${DICT_DIR} INET6=${INET6}
-PLIST_SUBST=	CANNAOWNER=${CANNAOWNER}	\
-		CANNAGROUP=${CANNAGROUP}	\
-		DICT_DIR=${DICT_DIR}		\
-		PREFIX=${PREFIX}
+		INET6=${INET6}
 
 # (1) Change SUBDIRS.
 # (2) Don't install `forcpp', `kpdic'.
-# (3) Include ${FILESDIR}/LinkFileList.rules just after including Canna.conf
-#     in Imakefiles.
 post-patch:
 	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
 	@${SED}	-e 's|\(SUBDIRS = lib canna\).*\( misc\)|\1 cmd/forcpp cmd/kpdic dic/phono\2|' \
@@ -53,25 +43,14 @@ post-patch:
 	@${SED} -e '/InstallProgram/d' ${WRKSRC}/cmd/${f}/Imakefile.orig \
 		> ${WRKSRC}/cmd/${f}/Imakefile
 .endfor
-	@${FIND} ${WRKSRC} -name Imakefile -print | \
-	while read f; do \
-		${CP} $$f $${f}.orig; \
-		( \
-			${ECHO} '/#include ".*\/Canna.conf"$$/a\'; \
-			${ECHO} '#include "${FILESDIR}/LinkFileList.rules"'; \
-		) | ${SED} -f /dev/stdin $${f}.orig >$$f; \
-	done
 
 # We need to pass ${MAKE_ENV} to ${XMKMF}
 do-configure:
 	@cd ${WRKSRC} && \
-	    ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${MAKE_ENV} ${XMKMF}
+	    ${SETENV} ${SCRIPTS_ENV} ${MAKE_ENV} ${XMKMF}
 
 post-configure:
 	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
-post-install:
-	@${LN} -s ${DICT_DIR}/canna ${PREFIX}/share/canna/dic
-	@${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${DICT_DIR}/canna
-
+.include "../../devel/nbitools/nbitools.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna-lib/PLIST b/inputmethod/canna-lib/PLIST
index c77b1b0cdeb..a0be7b6b249 100644
--- a/inputmethod/canna-lib/PLIST
+++ b/inputmethod/canna-lib/PLIST
@@ -1,40 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
-@cwd ${DICT_DIR}
-@cwd ${DICT_DIR}
-canna/default.cbp
-canna/english.cbp
-canna/jdaemon.cbp
-canna/just.cbp
-canna/kaisoku.cbp
-canna/kana.cbp
-canna/lan5.cbp
-canna/matsu.cbp
-canna/newjis.cbp
-canna/romaji.cbp
-canna/sokuon.cbp
-canna/tut.cbp
-canna/vje.cbp
-canna/wx2+.cbp
-@cwd ${PREFIX}
+@comment $NetBSD: PLIST,v 1.2 2002/06/10 09:47:26 sakamoto Exp $
 include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
 lib/libRKC.a
-lib/libRKC.so
-lib/libRKC.so.1
 lib/libRKC.so.1.0
 lib/libRKC16.a
-lib/libRKC16.so
-lib/libRKC16.so.1
 lib/libRKC16.so.1.0
 lib/libcanna.a
-lib/libcanna.so
-lib/libcanna.so.1
 lib/libcanna.so.1.0
 lib/libcanna16.a
-lib/libcanna16.so
-lib/libcanna16.so.1
 lib/libcanna16.so.1.0
 man/ja_JP.EUC/man3/RkCloseRoma.3
 man/ja_JP.EUC/man3/RkCvtEuc.3
@@ -79,6 +54,34 @@ man/ja_JP.EUC/man3/jrKanjiControl.3
 man/ja_JP.EUC/man3/jrKanjiString.3
 man/ja_JP.EUC/man3/uilib.3
 share/canna/default.canna
+share/canna/dic/default.cbp
+share/canna/dic/english.cbp
+share/canna/dic/jdaemon.cbp
+share/canna/dic/just.cbp
+share/canna/dic/kaisoku.cbp
+share/canna/dic/kana.cbp
+share/canna/dic/lan5.cbp
+share/canna/dic/matsu.cbp
+share/canna/dic/newjis.cbp
+share/canna/dic/romaji.cbp
+share/canna/dic/sample/src/default.ctd
+share/canna/dic/sample/src/english.ctd
+share/canna/dic/sample/src/jdaemon.ctd
+share/canna/dic/sample/src/just.ctd
+share/canna/dic/sample/src/kaisoku.ctd
+share/canna/dic/sample/src/kana.ctd
+share/canna/dic/sample/src/lan5.ctd
+share/canna/dic/sample/src/matsu.ctd
+share/canna/dic/sample/src/newjis.ctd
+share/canna/dic/sample/src/romaji.ctd
+share/canna/dic/sample/src/sokuon.ctd
+share/canna/dic/sample/src/tut.ctd
+share/canna/dic/sample/src/vje.ctd
+share/canna/dic/sample/src/wx2+.ctd
+share/canna/dic/sokuon.cbp
+share/canna/dic/tut.cbp
+share/canna/dic/vje.cbp
+share/canna/dic/wx2+.cbp
 share/canna/engine.cf
 share/canna/sample/1.1.canna
 share/canna/sample/1.2.canna
@@ -93,29 +96,14 @@ share/canna/sample/sample.canna
 share/canna/sample/skk.canna
 share/canna/sample/src/Makefile
 share/canna/sample/src/is.c
-share/canna/sample/src/default.ctd
-share/canna/sample/src/english.ctd
-share/canna/sample/src/jdaemon.ctd
-share/canna/sample/src/just.ctd
-share/canna/sample/src/kaisoku.ctd
-share/canna/sample/src/kana.ctd
-share/canna/sample/src/lan5.ctd
-share/canna/sample/src/matsu.ctd
-share/canna/sample/src/newjis.ctd
-share/canna/sample/src/romaji.ctd
-share/canna/sample/src/sokuon.ctd
-share/canna/sample/src/tut.ctd
-share/canna/sample/src/vje.ctd
-share/canna/sample/src/wx2+.ctd
 share/canna/sample/tut.canna
 share/canna/sample/unix.canna
 share/canna/sample/vje.canna
 share/canna/sample/wx2+.canna
-@exec ln -s ${DICT_DIR}/canna ${PREFIX}/share/canna/dic
-@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${DICT_DIR}/canna
-@unexec ${RM} ${PREFIX}/share/canna/dic
 @dirrm share/canna/sample/src
 @dirrm share/canna/sample
+@dirrm share/canna/dic/sample/src
+@dirrm share/canna/dic/sample
+@dirrm share/canna/dic
 @dirrm share/canna
 @dirrm include/canna
-@unexec ${RMDIR} ${DICT_DIR}/canna
diff --git a/inputmethod/canna-lib/buildlink.mk b/inputmethod/canna-lib/buildlink.mk
new file mode 100644
index 00000000000..af39a4ddfb2
--- /dev/null
+++ b/inputmethod/canna-lib/buildlink.mk
@@ -0,0 +1,40 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/06/10 09:47:26 sakamoto Exp $
+#
+# This Makefile fragment is included by packages that use Canna.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.canna to the dependency pattern
+#     for the version of Canna desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(CANNA_BUILDLINK_MK)
+CANNA_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.canna?=	Canna-lib>=3.5.2
+DEPENDS+=	${BUILDLINK_DEPENDS.canna}:../../inputmethod/canna-lib
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.canna=canna-lib
+BUILDLINK_PREFIX.canna_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.canna=		include/canna/RK.h
+BUILDLINK_FILES.canna+=		include/canna/jrkanji.h
+BUILDLINK_FILES.canna+=		include/canna/keydef.h
+BUILDLINK_FILES.canna+=		include/canna/mfdef.h
+BUILDLINK_FILES.canna+=		lib/libRKC.*
+BUILDLINK_FILES.canna+=		lib/libRKC16.*
+BUILDLINK_FILES.canna+=		lib/libcanna.*
+BUILDLINK_FILES.canna+=		lib/libcanna16.*
+
+BUILDLINK_TARGETS.canna=	canna-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.canna}
+
+pre-configure: ${BUILDLINK_TARGETS.canna}
+canna-buildlink: _BUILDLINK_USE
+
+.endif	# CANNA_BUILDLINK_MK
diff --git a/inputmethod/canna-lib/distinfo b/inputmethod/canna-lib/distinfo
index 134390099c8..5ca3994463d 100644
--- a/inputmethod/canna-lib/distinfo
+++ b/inputmethod/canna-lib/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/06/10 09:47:26 sakamoto Exp $
 
+SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
+Size (Uum4.109.tar.gz) = 43738 bytes
 SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
 Size (Canna35b2.tar.gz) = 1333329 bytes
 SHA1 (Canna35b2-unoff1.patch.gz) = 19579591190f7ace7d3ec5f61a7d01ca3bc576c1
@@ -8,9 +10,9 @@ SHA1 (Canna35b2-unoff2.patch.gz) = 16d578ed0558a632832194fffad8fcf24c9181fb
 Size (Canna35b2-unoff2.patch.gz) = 11375 bytes
 SHA1 (Canna35b2-hack1.patch.gz) = 24ab2baf104ef9748f92bd5315d4100a7ee961ab
 Size (Canna35b2-hack1.patch.gz) = 8384 bytes
-SHA1 (patch-aa) = d74119cb2c37a3db1c5d5417c1e35362b1eac655
+SHA1 (patch-aa) = 45cdfd8107ee0beeae878c9940273fc6bca0385a
 SHA1 (patch-ab) = 38f3ad4e022299a4dfd8d9391b1742b0d0f02a71
-SHA1 (patch-ac) = 8f910e59d71ef09434a40abde698d730ed7fc1c5
+SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919
 SHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96
 SHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02
 SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
diff --git a/inputmethod/canna-lib/files/LinkFileList.rules b/inputmethod/canna-lib/files/LinkFileList.rules
deleted file mode 100644
index 87ca9c2504e..00000000000
--- a/inputmethod/canna-lib/files/LinkFileList.rules
+++ /dev/null
@@ -1,20 +0,0 @@
-XCOMM $NetBSD: LinkFileList.rules,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
-
-/*
- * Old LinkFileList definition necessary to compile Canna on XFree86 4.2.
- */
-
-#ifdef LinkFileList
-#undef LinkFileList
-#endif
-
-/*
- * LinkFileList - link a list of files from one place to another
- */
-#ifndef LinkFileList
-#define LinkFileList(step,list,dir,sub)					@@\
-step:: list								@@\
-	@MakeFlagsToShellFlags(i,set +e); \				@@\
-	echo "  cd" dir; cd dir && \					@@\
-	for i in list; do (set -x; RemoveFile($$i); $(LN) sub/$$i .); done
-#endif
diff --git a/inputmethod/canna-lib/files/canna b/inputmethod/canna-lib/files/canna
index f317968f649..3e4d0fc472f 100644
--- a/inputmethod/canna-lib/files/canna
+++ b/inputmethod/canna-lib/files/canna
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: canna,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+# $NetBSD: canna,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 #
 # PROVIDE: canna
 # REQUIRE: DAEMON
diff --git a/inputmethod/canna-lib/patches/patch-aa b/inputmethod/canna-lib/patches/patch-aa
index c216c06668e..dfa2a82db89 100644
--- a/inputmethod/canna-lib/patches/patch-aa
+++ b/inputmethod/canna-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 
 --- Canna.conf-	Fri Dec  1 00:31:14 2000
 +++ Canna.conf	Fri Dec  1 00:31:36 2000
@@ -46,8 +46,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
 -#define UseInstalledLibCanna NO
 +#define UseInstalledLibCanna YES
  
--DicDir   = $(cannaLibDir)/dic
-+DicDir   = ${DICT_DIR}/canna
+ DicDir   = $(cannaLibDir)/dic
  
 @@ -241,14 +244,14 @@
  # endif
diff --git a/inputmethod/canna-lib/patches/patch-ab b/inputmethod/canna-lib/patches/patch-ab
index 70ba6166530..c1d037928cd 100644
--- a/inputmethod/canna-lib/patches/patch-ab
+++ b/inputmethod/canna-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 
 --- ./Imakefile.orig	Wed Nov 27 16:01:34 1996
 +++ ./Imakefile	Fri Jul 30 19:17:44 1999
diff --git a/inputmethod/canna-lib/patches/patch-ac b/inputmethod/canna-lib/patches/patch-ac
index 817c5ed7980..b2f546f1675 100644
--- a/inputmethod/canna-lib/patches/patch-ac
+++ b/inputmethod/canna-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: patch-ac,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 
 --- dic/phono/Imakefile.orig	Wed Nov 27 16:15:14 1996
 +++ dic/phono/Imakefile	Fri Jul 30 19:57:02 1999
@@ -7,7 +7,9 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
         ROMAJI_DIC_DEF = -DSHIFT
  
 -               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
 +               DICDIR = $(DicDir)
-             SAMPLEDIR = $(cannaLibDir)/sample
-          SAMPLESRCDIR = $(cannaLibDir)/sample/src
- 
++            SAMPLEDIR = $(DicDir)/sample
++         SAMPLESRCDIR = $(DicDir)/sample/src
+
diff --git a/inputmethod/canna-lib/patches/patch-ad b/inputmethod/canna-lib/patches/patch-ad
index 136d833a1ab..bff1761c507 100644
--- a/inputmethod/canna-lib/patches/patch-ad
+++ b/inputmethod/canna-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: patch-ad,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 --- server/misc.c~	Fri Jul 29 12:03:54 1994
 +++ server/misc.c	Fri Jun 30 10:16:39 2000
 @@ -788,12 +788,19 @@
diff --git a/inputmethod/canna-lib/patches/patch-ae b/inputmethod/canna-lib/patches/patch-ae
index e787d4ad509..edb2e80708e 100644
--- a/inputmethod/canna-lib/patches/patch-ae
+++ b/inputmethod/canna-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 
 PATCH_SITES+=	http://apps.v6.linux.or.jp/pub/Linux/IPv6-2/canna/
 PATCHFILES+=	Canna35b2-v6-20000602.diff.gz
diff --git a/inputmethod/canna-lib/patches/patch-af b/inputmethod/canna-lib/patches/patch-af
index c2b81ddab6e..e2aa18a8be7 100644
--- a/inputmethod/canna-lib/patches/patch-af
+++ b/inputmethod/canna-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:58 seb Exp $
+$NetBSD: patch-af,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
 
 --- lib/RKC/convert.c.orig	Wed May 22 22:02:57 1996
 +++ lib/RKC/convert.c