Flesh out COMMENTS/DESCRS,

split server/libs (not quite finished), fix packing lists enough to have a functional install.
2000-04-22 13:01:11 +00:00 · 2000-04-22 13:01:11 +00:00 · fa3f11324a
commit fa3f11324a
parent 7528c6d5de
10 changed files with 122 additions and 83 deletions
--- a/japanese/canna/Makefile
+++ b/japanese/canna/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/04/22 11:50:30 espie Exp $
+# $OpenBSD: Makefile,v 1.2 2000/04/22 13:01:11 espie Exp $

 DISTNAME=	Canna35b2
 PKGNAME=	cannalib-3.5b2
@ -18,11 +18,13 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	No Fee
 PERMIT_DISTFILES_CDROM=	No Fee

-MULTI_PACKAGES=-dict
+MULTI_PACKAGES=-dict -server
 SUBPACKAGE?=
 .if ${SUBPACKAGE}=="-dict"
 PKGNAME=	cannadict-3.5b2
 PREFIX=		/var/dict
+.elif ${SUBPACKAGE}=="-server"
+PKGNAME=	cannaserver-3.5b2
 .endif

 USE_IMAKE=	Yes
--- a/japanese/canna/pkg/COMMENT
+++ b/japanese/canna/pkg/COMMENT
@ -1 +1 @@
-canna
+canna (kana-kanji converter) libraries
--- a/japanese/canna/pkg/COMMENT-dict
+++ b/japanese/canna/pkg/COMMENT-dict
@ -1 +1 @@
-canna dicts
+canna (kana-kanji converter) dictionnaries
--- a/japanese/canna/pkg/COMMENT-server
+++ b/japanese/canna/pkg/COMMENT-server
@ -0,0 +1 @@
+canna (kana-kanji converter) server
--- a/japanese/canna/pkg/DESCR
+++ b/japanese/canna/pkg/DESCR
@ -0,0 +1,18 @@
+Canna is a Kana-Kanji conversion engine.
+This package holds the Canna libraries.
+For a fully functional system, you need access to a server,
+or to install the cannaserver and cannadict packages as well.
+
+Kana-kanji conversion is usually started with '^o'.
+
+In theory, canna supports Mule (Multi-lingual emacs) and kinput2.
+
+From NetBSD:
+  To use from Mule (CANNA version), in .emacs file:
+
+     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
+        (progn
+         (load-library "canna")
+         (canna) ))
+
+The nvi-m17n-*-canna package supports canna.
--- a/japanese/canna/pkg/DESCR-dict
+++ b/japanese/canna/pkg/DESCR-dict
@ -0,0 +1,4 @@
+Canna is a Kana-Kanji conversion engine.
+This package holds the basic Canna conversion dictionaries.
+
+Those dictionaries install under /var/dict/canna.
--- a/japanese/canna/pkg/DESCR-server
+++ b/japanese/canna/pkg/DESCR-server
@ -0,0 +1,7 @@
+Canna is a Kana-Kanji conversion engine.
+This package holds the server and related utility.
+
+Update /etc/services to get the canna service recognized.
+
+cannaserver is started as daemon. This package needs
+the Canna dictionaries (cannadict package) to be functional.
--- a/japanese/canna/pkg/PLIST
+++ b/japanese/canna/pkg/PLIST
@ -1,34 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2000/04/22 11:50:38 espie Exp $
-bin/addwords
-bin/canlisp
-bin/cannacheck
-bin/cannakill
-bin/cannastat
-bin/catdic
-bin/cpdic
-bin/crfreq
-bin/crxdic
-bin/crxgram
-bin/cshost
-bin/ctow
-bin/delwords
-bin/dicar
-bin/dpbindic
-bin/dpromdic
-bin/dpxdic
-bin/forcpp
-bin/forsort
-bin/kpdic
-bin/lsdic
-bin/mergeword
-bin/mkbindic
-bin/mkdic
-bin/mkromdic
-bin/mvdic
-bin/rmdic
-bin/splitword
-bin/syncdic
-bin/wtoc
+@comment $OpenBSD: PLIST,v 1.2 2000/04/22 13:01:12 espie Exp $
 include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
@ -88,27 +58,6 @@ lib/sample/tut.canna
 lib/sample/unix.canna
 lib/sample/vje.canna
 lib/sample/wx2+.canna
-man/cat1/addwords.0
-man/cat1/cannacheck.0
-man/cat1/cannakill.0
-man/cat1/cannaserver.0
-man/cat1/cannastat.0
-man/cat1/catdic.0
-man/cat1/cpdic.0
-man/cat1/cshost.0
-man/cat1/ctow.0
-man/cat1/delwords.0
-man/cat1/dicar.0
-man/cat1/dpbindic.0
-man/cat1/dpromdic.0
-man/cat1/lsdic.0
-man/cat1/mkbindic.0
-man/cat1/mkdic.0
-man/cat1/mkromdic.0
-man/cat1/mvdic.0
-man/cat1/rmdic.0
-man/cat1/splitword.0
-man/cat1/wtoc.0
 man/cat3/RkCloseRoma.0
 man/cat3/RkCvtEuc.0
 man/cat3/RkCvtHan.0
@ -151,27 +100,6 @@ man/cat3/cannalib.0
 man/cat3/jrKanjiControl.0
 man/cat3/jrKanjiString.0
 man/cat3/uilib.0
-man/ja_JP.EUC/cat1/addwords.0
-man/ja_JP.EUC/cat1/cannacheck.0
-man/ja_JP.EUC/cat1/cannakill.0
-man/ja_JP.EUC/cat1/cannaserver.0
-man/ja_JP.EUC/cat1/cannastat.0
-man/ja_JP.EUC/cat1/catdic.0
-man/ja_JP.EUC/cat1/cpdic.0
-man/ja_JP.EUC/cat1/cshost.0
-man/ja_JP.EUC/cat1/ctow.0
-man/ja_JP.EUC/cat1/delwords.0
-man/ja_JP.EUC/cat1/dicar.0
-man/ja_JP.EUC/cat1/dpbindic.0
-man/ja_JP.EUC/cat1/dpromdic.0
-man/ja_JP.EUC/cat1/lsdic.0
-man/ja_JP.EUC/cat1/mkbindic.0
-man/ja_JP.EUC/cat1/mkdic.0
-man/ja_JP.EUC/cat1/mkromdic.0
-man/ja_JP.EUC/cat1/mvdic.0
-man/ja_JP.EUC/cat1/rmdic.0
-man/ja_JP.EUC/cat1/splitword.0
-man/ja_JP.EUC/cat1/wtoc.0
 man/ja_JP.EUC/cat3/RkCloseRoma.0
 man/ja_JP.EUC/cat3/RkCvtEuc.0
 man/ja_JP.EUC/cat3/RkCvtHan.0
@ -214,10 +142,6 @@ man/ja_JP.EUC/cat3/cannalib.0
 man/ja_JP.EUC/cat3/jrKanjiControl.0
 man/ja_JP.EUC/cat3/jrKanjiString.0
 man/ja_JP.EUC/cat3/uilib.0
-@owner daemon
-@group daemon
-@mode u+s,g+s
-bin/cannaserver
@dirrm lib/sample/src
@dirrm lib/sample
@dirrm lib/dic
--- a/japanese/canna/pkg/PLIST-dict
+++ b/japanese/canna/pkg/PLIST-dict
@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST-dict,v 1.1.1.1 2000/04/22 11:50:38 espie Exp $
+@comment $OpenBSD: PLIST-dict,v 1.2 2000/04/22 13:01:12 espie Exp $
@group daemon
+@exec install -d -m 0755 -o daemon %D/canna
 canna/canna/chimei.ctd
 canna/canna/dics.dir
 canna/canna/hojomwd.ctd
@ -19,4 +20,7 @@ canna/canna/iroha.cbd
 canna/canna/iroha.cld
 canna/canna/bushu.cld
@dirrm canna/canna
-@dirrm canna
+@unexec rmdir %D/canna/group || true
+@unexec rmdir %D/canna/user || true
+@unexec rmdir %D/canna || echo "Finish removing %D/canna manually"
+@unexec echo "Remove /var/spool/canna manually"
--- a/japanese/canna/pkg/PLIST-server
+++ b/japanese/canna/pkg/PLIST-server
@ -0,0 +1,79 @@
+@comment $OpenBSD: PLIST-server,v 1.1 2000/04/22 13:01:12 espie Exp $
+bin/addwords
+bin/canlisp
+bin/cannacheck
+bin/cannakill
+bin/cannastat
+bin/catdic
+bin/cpdic
+bin/crfreq
+bin/crxdic
+bin/crxgram
+bin/cshost
+bin/ctow
+bin/delwords
+bin/dicar
+bin/dpbindic
+bin/dpromdic
+bin/dpxdic
+bin/forcpp
+bin/forsort
+bin/kpdic
+bin/lsdic
+bin/mergeword
+bin/mkbindic
+bin/mkdic
+bin/mkromdic
+bin/mvdic
+bin/rmdic
+bin/splitword
+bin/syncdic
+bin/wtoc
+man/cat1/addwords.0
+man/cat1/cannacheck.0
+man/cat1/cannakill.0
+man/cat1/cannaserver.0
+man/cat1/cannastat.0
+man/cat1/catdic.0
+man/cat1/cpdic.0
+man/cat1/cshost.0
+man/cat1/ctow.0
+man/cat1/delwords.0
+man/cat1/dicar.0
+man/cat1/dpbindic.0
+man/cat1/dpromdic.0
+man/cat1/lsdic.0
+man/cat1/mkbindic.0
+man/cat1/mkdic.0
+man/cat1/mkromdic.0
+man/cat1/mvdic.0
+man/cat1/rmdic.0
+man/cat1/splitword.0
+man/cat1/wtoc.0
+man/ja_JP.EUC/cat1/addwords.0
+man/ja_JP.EUC/cat1/cannacheck.0
+man/ja_JP.EUC/cat1/cannakill.0
+man/ja_JP.EUC/cat1/cannaserver.0
+man/ja_JP.EUC/cat1/cannastat.0
+man/ja_JP.EUC/cat1/catdic.0
+man/ja_JP.EUC/cat1/cpdic.0
+man/ja_JP.EUC/cat1/cshost.0
+man/ja_JP.EUC/cat1/ctow.0
+man/ja_JP.EUC/cat1/delwords.0
+man/ja_JP.EUC/cat1/dicar.0
+man/ja_JP.EUC/cat1/dpbindic.0
+man/ja_JP.EUC/cat1/dpromdic.0
+man/ja_JP.EUC/cat1/lsdic.0
+man/ja_JP.EUC/cat1/mkbindic.0
+man/ja_JP.EUC/cat1/mkdic.0
+man/ja_JP.EUC/cat1/mkromdic.0
+man/ja_JP.EUC/cat1/mvdic.0
+man/ja_JP.EUC/cat1/rmdic.0
+man/ja_JP.EUC/cat1/splitword.0
+man/ja_JP.EUC/cat1/wtoc.0
+@owner daemon
+@group daemon
+@mode u+s,g+s
+bin/cannaserver
+@exec install -d -m 0775 -o daemon -g daemon /var/spool/canna
+@unexec echo "Remove /var/spool/canna manually"