bump PKGREVISION.

split out into canna-dict and canna-server-bin,
canna-server is meta package for these packages.

3 files changed, 12 insertions, 142 deletions

diff --git a/inputmethod/canna-server/INSTALL b/inputmethod/canna-server/INSTALL
deleted file mode 100755
index 1219a0a90cf..00000000000
--- a/inputmethod/canna-server/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-(grep -v ^# /etc/services | grep 'canna.*5680' >/dev/null) ||	\
-	(echo "" >> /etc/services;			\
-	 echo "# canna package" >> /etc/services;	\
-	 echo "canna		5680/tcp" >> /etc/services;	\
-	 )
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index 4b7beeac76c..10c85662ede 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,75 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:33 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/10 09:52:15 sakamoto Exp $
 
-DISTNAME=	Canna35b2
-PKGNAME=	Canna-server-3.5.2
+DISTNAME=	Canna-server-3.5.2
+PKGREVISION=	2
 CATEGORIES=	japanese inputmethod
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna35/
-
-PATCH_SITES=	http://www.jaist.ac.jp/~fujieda/canna/
-PATCHFILES=	Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
-		Canna35b2-hack1.patch.gz
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
-HOMEPAGE=	http://www.nec.co.jp/japanese/product/computer/soft/canna/
 COMMENT=	Kana-Kanji conversion system (server)
 
-DEPENDS+=	Canna-lib>=3.5.2:../../inputmethod/canna-lib
-
-FILESDIR=	${.CURDIR}/../../inputmethod/canna-lib/files
-DISTINFO_FILE=	${.CURDIR}/../../inputmethod/canna-lib/distinfo
-PATCHDIR=	${.CURDIR}/../../inputmethod/canna-lib/patches
-
-BUILD_DEFS+=	USE_INET6
-USE_X11BASE=	yes
-
-.include "../../mk/bsd.prefs.mk"
-.if 0	# ${USE_INET6} == "YES"
-INET6=		-DINET6
-.else
-INET6=		# empty
-.endif
-CANNAOWNER?=	daemon
-CANNAGROUP?=	daemon
-CANNA_SPOOL=	/var/spool/canna
-CANNA_MODE=	0755
-DICT_DIR?=	/var/dict
-MAKE_ENV+=	CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
-		CANNA_SPOOL=${CANNA_SPOOL} DICT_DIR=${DICT_DIR} INET6=${INET6}
-PLIST_SUBST=	CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
-		CANNA_SPOOL=${CANNA_SPOOL} CANNA_MODE=${CANNA_MODE} \
-		DICT_DIR=${DICT_DIR} PREFIX=${PREFIX}
-
-INSTALL_TARGET=	instserver instclient
-
-post-patch:
-	${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
-	${SED} -e 's|\(SUBDIRS = .*\) misc\(.*\)|\1\2|' \
-		-e 's|\(SERVERDIR = .*\) dic/phono\(.*\)|\1\2|' \
-		-e 's|\(CLIENTDIR = .*\) dic/phono misc|\1|' \
-		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
-	${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
-
-
-do-configure:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
+DEPENDS+=	Canna-server-bin>=3.5.2nb2:../canna-server-bin
+DEPENDS+=	Canna-dict>=3.5.2nb2:../canna-dict
 
-post-build:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/canna \
-		> ${WRKDIR}/canna
+EXTRACT_ONLY=	# empty
+NO_BUILD=	YES
+NO_CHECKSUM=	YES
 
-post-install:
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-	@${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna
-	@${INSTALL_DATA_DIR} ${CANNA_SPOOL}
-	@${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
-	@${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
+do-install:	# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna-server/PLIST b/inputmethod/canna-server/PLIST
index d8523ca0865..8fcaf2dce7e 100644
--- a/inputmethod/canna-server/PLIST
+++ b/inputmethod/canna-server/PLIST
@@ -1,70 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:33 seb Exp $
-@cwd ${DICT_DIR}
-@cwd ${DICT_DIR}
-canna/canna/bushu.cld
-canna/canna/chimei.ctd
-canna/canna/dics.dir
-canna/canna/fuzokugo.cbd
-canna/canna/fuzokugo.cld
-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
-@cwd ${PREFIX}
-bin/canlisp
-bin/cannacheck
-bin/cannakill
-bin/cannastat
-bin/catdic
-bin/crfreq
-bin/crxdic
-bin/crxgram
-bin/cshost
-bin/ctow
-bin/dicar
-bin/dpbindic
-bin/dpromdic
-bin/dpxdic
-bin/forcpp
-bin/forsort
-bin/kpdic
-bin/mergeword
-bin/mkbindic
-bin/mkromdic
-bin/splitword
-bin/wtoc
-etc/rc.d/canna
-man/ja_JP.EUC/man1/addwords.1
-man/ja_JP.EUC/man1/cannacheck.1
-man/ja_JP.EUC/man1/cannakill.1
-man/ja_JP.EUC/man1/cannaserver.1
-man/ja_JP.EUC/man1/cannastat.1
-man/ja_JP.EUC/man1/catdic.1
-man/ja_JP.EUC/man1/cpdic.1
-man/ja_JP.EUC/man1/cshost.1
-man/ja_JP.EUC/man1/ctow.1
-man/ja_JP.EUC/man1/delwords.1
-man/ja_JP.EUC/man1/dicar.1
-man/ja_JP.EUC/man1/dpbindic.1
-man/ja_JP.EUC/man1/dpromdic.1
-man/ja_JP.EUC/man1/lsdic.1
-man/ja_JP.EUC/man1/mkbindic.1
-man/ja_JP.EUC/man1/mkdic.1
-man/ja_JP.EUC/man1/mkromdic.1
-man/ja_JP.EUC/man1/mvdic.1
-man/ja_JP.EUC/man1/rmdic.1
-man/ja_JP.EUC/man1/splitword.1
-man/ja_JP.EUC/man1/wtoc.1
-sbin/cannaserver
-@exec ${MKDIR} ${CANNA_SPOOL}
-@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
-@exec ${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
-@unexec ${RMDIR} ${DICT_DIR}/canna/canna
-@unexec ${RMDIR} ${CANNA_SPOOL}
+@comment $NetBSD: PLIST,v 1.2 2002/06/10 09:52:15 sakamoto Exp $