- Separate the server part and the library part from japanese/Canna, and

  remove japanese/Canna.
- Take maintainership.

7 files changed, 119 insertions, 177 deletions

diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 461d32e52ed8..35b55cc4d957 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,72 +1,56 @@
-# New ports collection makefile for:	Canna
-# Date created:		3 November 1995
-# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#			NIIMI Satoshi <sa2c@and.or.jp>
+# New ports collection makefile for:	canna-server
+# Date created:		7 September 2008
+# Whom:			hrs
 #
 # $FreeBSD$
 #
 
-PORTNAME=	Canna
+PORTNAME=	canna
 PORTVERSION=	3.7p3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	canna/9565/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+PKGNAMESUFFIX=	-server
+DISTNAME=	Canna${PORTVERSION:S/.//g}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Kana-Kanji conversion system
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	A Kana-to-Kanji conversion system, binary part
 
-USE_RC_SUBR=	yes
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib
+
+USE_RC_SUBR=	canna.sh
 USE_BZIP2=	yes
 USE_IMAKE=	yes
 ALL_TARGET=	canna
-USE_LDCONFIG=	yes
+INSTALL_TARGET=	instserver instclient
 
-MANLANG="" ja
-MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
-	catdic.1 chmoddic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
-	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
-	mvdic.1 rmdic.1 splitword.1 wtoc.1
-MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
-	RkCvtRoma.3 RkCvtZen.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
-	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 RkGetLex.3 \
-	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
-	RkMapPhonogram.3 RkMapRoma.3 RkMountDic.3 RkNext.3 RkNfer.3 \
-	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkBgnBun.3 RkRight.3 \
-	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
-MLINKS=		uilib.3 XKanjiControl.3  uilib.3 XLookupKanjiString.3 \
-		uilib.3 jrKanjiControl.3  uilib.3 jrKanjiString.3
-MANCOMPRESSED=	no
-XFREE86_HTML_MAN=	no
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	canna.bib canna.sty Imakefile README.jp Makefile \
 		intern lisp man
-.endif
 
-post-build:
-	@${SED} -e "s,@PREFIX@,${PREFIX},g; s,@RC_SUBR@,${RC_SUBR},g; \
-		s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \
-		s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \
-		> ${WRKDIR}/canna.sh
+MANLANG=	"" ja
+MANCOMPRESSED=	no
+MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1	\
+	catdic.1 chmoddic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1	\
+	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1	\
+	mvdic.1 rmdic.1 splitword.1 wtoc.1
+MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3	\
+	RkCvtRoma.3 RkCvtZen.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3	\
+	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3		\
+	RkGetLex.3 RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3	\
+	RkIntro.3 RkLeft.3 RkMapPhonogram.3 RkMapRoma.3 RkMountDic.3	\
+	RkNext.3 RkNfer.3 RkOpenRoma.3 RkPrev.3 RkRemountDic.3		\
+	RkResize.3 RkBgnBun.3 RkRight.3 RkShorten.3 RkStoreYomi.3	\
+	RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
+MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 uilib.3	\
+	jrKanjiControl.3 uilib.3 jrKanjiString.3
 
 post-install:
-.for f in user user/user group
-	@${MKDIR} ${PREFIX}/lib/canna/dic/$f
-	@${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f
-	@${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f
-.endfor
-	@${ECHO} "Installing a startup script as ${PREFIX}/etc/rc.d/canna.sh."
-	@${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${PREFIX}/etc/rc.d/canna.sh
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${CP} -R ${WRKSRC}/doc/$f ${DOCSDIR}
-.endfor
-	@${CHOWN} -R root:wheel ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${CP} -R ${PORTDOCS} ${DOCSDIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.sh.in
index 236d28e9b454..6197f41195ad 100644
--- a/japanese/canna-server/files/canna.sh.in
+++ b/japanese/canna-server/files/canna.sh.in
@@ -22,22 +22,29 @@ canna_flags=${canna_flags:-"-u bin"}		# Flags to canna program
 # connection instead of a UNIX domain socket.
 #canna_flags="-u bin -inet"
 
-. @RC_SUBR@
+. /etc/rc.subr
 
 name="canna"
 rcvar=`set_rcvar`
-command="@PREFIX@/sbin/cannaserver"
-start_precmd="canna_prestart"
+command="%%PREFIX%%/sbin/cannaserver"
+start_precmd="canna_precmd"
 stop_cmd="canna_stop"
 
-canna_prestart() {
-	@RM@ -f /tmp/.iroha_unix/IROHA
-	@TOUCH@ /var/log/CANNA0msgs
-	@CHOWN@ bin:bin /var/log/CANNA0msgs
+canna_precmd() {
+	rm -f /tmp/.iroha_unix/IROHA
+	touch /var/log/CANNA0msgs
+	mkdir -p -m 0775 \
+		%%PREFIX%%/share/canna/dic/user/user \
+		%%PREFIX%%/share/canna/dic/group
+	chown bin:bin /var/log/CANNA0msgs \
+		%%PREFIX%%/share/canna/dic/user/user \
+		%%PREFIX%%/share/canna/dic/user \
+		%%PREFIX%%/share/canna/dic/group
 }
 
 canna_stop() {
-	@PREFIX@/sbin/cannakill && echo "Stopping ${name}."
+	echo "Stopping ${name}."
+	%%PREFIX%%/sbin/cannakill
 }
 
 load_rc_config $name
diff --git a/japanese/canna-server/files/patch-ac b/japanese/canna-server/files/patch-Canna.conf
index a3bef982a0f9..a3bef982a0f9 100644
--- a/japanese/canna-server/files/patch-ac
+++ b/japanese/canna-server/files/patch-Canna.conf
diff --git a/japanese/canna-server/pkg-descr b/japanese/canna-server/pkg-descr
index d825639763b8..d61bb0bcb191 100644
--- a/japanese/canna-server/pkg-descr
+++ b/japanese/canna-server/pkg-descr
@@ -1,18 +1,4 @@
-Canna is a Kana-Kanji conversion server.
-It supports Mule(Multi-lingual extention Emacs), kinput2 X11 input
-method, etc.
-
-
-  To use from Mule (CANNA version), add the following to your .emacs file:
-
-     (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
-        (progn
-         (load-library "canna")
-         (canna) ))
-
-  Then use the `C-o' key to begin kana-kanji conversion.  Refer to the
-Info file and the documents for more detail.
+Canna is a Kana-Kanji conversion server.  It supports
+Mule(Multi-lingual extention Emacs), kinput2 X11 input method, etc.
 
 WWW: http://canna.sourceforge.jp/
-
-- Max
diff --git a/japanese/canna-server/pkg-install b/japanese/canna-server/pkg-install
deleted file mode 100644
index df6e13e689fd..000000000000
--- a/japanese/canna-server/pkg-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-(grep -v ^# /etc/services | grep canna >/dev/null) || \
-(echo "Now, you need to add following entry to your /etc/services:" ;
- echo ;
-	 echo "	canna           5680/tcp" ;
-	 echo )
diff --git a/japanese/canna-server/pkg-message b/japanese/canna-server/pkg-message
index 77b15661590c..365fdddbcb84 100644
--- a/japanese/canna-server/pkg-message
+++ b/japanese/canna-server/pkg-message
@@ -1,4 +1,3 @@
-
 Now the cannaserver uses a UNIX domain scoekt by default.  If you need
 to use a TCP connection, please edit your /etc/rc.conf (or alike) and
 add the -inet command-line option to canna_flags, i.e.:
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index df6de75d0526..af75614f85f4 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/addwords
 bin/canlisp
 bin/cannacheck
@@ -29,101 +30,73 @@ bin/rmdic
 bin/splitword
 bin/syncdic
 bin/wtoc
-etc/rc.d/canna.sh
-include/canna/RK.h
-include/canna/jrkanji.h
-include/canna/keydef.h
-include/canna/mfdef.h
-include/canna/pubconf.h
-include/canna/sysdep.h
-share/canna/default.canna
-share/canna/dic/canna/bushu.cld
-share/canna/dic/canna/chimei.ctd
-share/canna/dic/canna/dics.dir
-share/canna/dic/canna/fuzokugo.cbd
-share/canna/dic/canna/hojomwd.ctd
-share/canna/dic/canna/hojoswd.ctd
-share/canna/dic/canna/iroha.cbd
-share/canna/dic/canna/iroha.cld
-share/canna/dic/canna/kanasmpl.ctd
-share/canna/dic/canna/katakana.ctd
-share/canna/dic/canna/keishiki.ctd
-share/canna/dic/canna/necgaiji.ctd
-share/canna/dic/canna/number.ctd
-share/canna/dic/canna/software.ctd
-share/canna/dic/canna/suffix.ctd
-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/sokuon.cbp
-share/canna/dic/tut.cbp
-share/canna/dic/vje.cbp
-share/canna/dic/wx2+.cbp
-share/canna/sample/1.1.canna
-share/canna/sample/1.2.canna
-share/canna/sample/fixer.canna
-share/canna/sample/jdemon.canna
-share/canna/sample/just.canna
-share/canna/sample/lan5.canna
-share/canna/sample/matsu.canna
-share/canna/sample/modes.canna
-share/canna/sample/sample.canna
-share/canna/sample/skk.canna
-share/canna/sample/src/default.ctd
-share/canna/sample/src/english.ctd
-share/canna/sample/src/is.c
-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/verbose.canna
-share/canna/sample/vje.canna
-share/canna/sample/wx2+.canna
-lib/libRKC.a
-lib/libRKC.so
-lib/libRKC.so.1
-lib/libRKC16.a
-lib/libRKC16.so
-lib/libRKC16.so.1
-lib/libcanna.a
-lib/libcanna.so
-lib/libcanna.so.1
-lib/libcanna16.a
-lib/libcanna16.so
-lib/libcanna16.so.1
+%%DATADIR%%/default.canna
+%%DATADIR%%/dic/canna/bushu.cld
+%%DATADIR%%/dic/canna/chimei.ctd
+%%DATADIR%%/dic/canna/dics.dir
+%%DATADIR%%/dic/canna/fuzokugo.cbd
+%%DATADIR%%/dic/canna/hojomwd.ctd
+%%DATADIR%%/dic/canna/hojoswd.ctd
+%%DATADIR%%/dic/canna/iroha.cbd
+%%DATADIR%%/dic/canna/iroha.cld
+%%DATADIR%%/dic/canna/kanasmpl.ctd
+%%DATADIR%%/dic/canna/katakana.ctd
+%%DATADIR%%/dic/canna/keishiki.ctd
+%%DATADIR%%/dic/canna/necgaiji.ctd
+%%DATADIR%%/dic/canna/number.ctd
+%%DATADIR%%/dic/canna/software.ctd
+%%DATADIR%%/dic/canna/suffix.ctd
+%%DATADIR%%/dic/default.cbp
+%%DATADIR%%/dic/english.cbp
+%%DATADIR%%/dic/jdaemon.cbp
+%%DATADIR%%/dic/just.cbp
+%%DATADIR%%/dic/kaisoku.cbp
+%%DATADIR%%/dic/kana.cbp
+%%DATADIR%%/dic/lan5.cbp
+%%DATADIR%%/dic/matsu.cbp
+%%DATADIR%%/dic/newjis.cbp
+%%DATADIR%%/dic/romaji.cbp
+%%DATADIR%%/dic/sokuon.cbp
+%%DATADIR%%/dic/tut.cbp
+%%DATADIR%%/dic/vje.cbp
+%%DATADIR%%/dic/wx2+.cbp
+%%DATADIR%%/sample/1.1.canna
+%%DATADIR%%/sample/1.2.canna
+%%DATADIR%%/sample/fixer.canna
+%%DATADIR%%/sample/jdemon.canna
+%%DATADIR%%/sample/just.canna
+%%DATADIR%%/sample/lan5.canna
+%%DATADIR%%/sample/matsu.canna
+%%DATADIR%%/sample/modes.canna
+%%DATADIR%%/sample/sample.canna
+%%DATADIR%%/sample/skk.canna
+%%DATADIR%%/sample/src/default.ctd
+%%DATADIR%%/sample/src/english.ctd
+%%DATADIR%%/sample/src/is.c
+%%DATADIR%%/sample/src/jdaemon.ctd
+%%DATADIR%%/sample/src/just.ctd
+%%DATADIR%%/sample/src/kaisoku.ctd
+%%DATADIR%%/sample/src/kana.ctd
+%%DATADIR%%/sample/src/lan5.ctd
+%%DATADIR%%/sample/src/matsu.ctd
+%%DATADIR%%/sample/src/newjis.ctd
+%%DATADIR%%/sample/src/romaji.ctd
+%%DATADIR%%/sample/src/sokuon.ctd
+%%DATADIR%%/sample/src/tut.ctd
+%%DATADIR%%/sample/src/vje.ctd
+%%DATADIR%%/sample/src/wx2+.ctd
+%%DATADIR%%/sample/tut.canna
+%%DATADIR%%/sample/unix.canna
+%%DATADIR%%/sample/verbose.canna
+%%DATADIR%%/sample/vje.canna
+%%DATADIR%%/sample/wx2+.canna
 sbin/cannaserver
 sbin/cannakill
-@exec mkdir -p %D/share/canna/dic/user/user %D/share/canna/dic/group
-@exec chown bin:bin %D/share/canna/dic/user/user %D/share/canna/dic/user %D/share/canna/dic/group
-@exec chmod 775 %D/share/canna/dic/user/user %D/share/canna/dic/user %D/share/canna/dic/group
-@dirrm share/canna/sample/src
-@dirrm share/canna/sample
-@dirrm share/canna/dic/canna
-@dirrm include/canna
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
-@dirrm lib/canna/dic/group
-@dirrm lib/canna/dic
-@dirrm lib/canna
-@dirrmtry share/canna/dic/user/user
-@dirrmtry share/canna/dic/user
-@dirrmtry share/canna/dic/group
-@dirrmtry share/canna/dic
-@dirrmtry share/canna
+@dirrm %%DATADIR%%/sample/src
+@dirrm %%DATADIR%%/sample
+@dirrm %%DATADIR%%/dic/canna
+@dirrmtry %%DATADIR%%/dic/user/user
+@dirrmtry %%DATADIR%%/dic/user
+@dirrmtry %%DATADIR%%/dic/group
+@dirrmtry %%DATADIR%%/dic
+@dirrmtry %%DATADIR%%