bump PKGREVISION.

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

4 files changed, 12 insertions, 105 deletions

diff --git a/inputmethod/sj3-server/INSTALL b/inputmethod/sj3-server/INSTALL
deleted file mode 100644
index 41b27cf7274..00000000000
--- a/inputmethod/sj3-server/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case $2 in
-    POST-INSTALL)
-	dic="${PKG_PREFIX}/libdata/sj3/dict/user"
-	mkdir -p $dic
-	chown ${SJ3OWNER}.${SJ3GROUP} $dic
-	;;
-esac
diff --git a/inputmethod/sj3-server/Makefile b/inputmethod/sj3-server/Makefile
index a8834d1ab72..e98813b664c 100644
--- a/inputmethod/sj3-server/Makefile
+++ b/inputmethod/sj3-server/Makefile
@@ -1,62 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:13 seb Exp $
-#
+# $NetBSD: Makefile,v 1.2 2002/06/10 10:22:41 sakamoto Exp $
 
-DISTNAME=	sj3-2.0.1.20
-PKGNAME=	sj3-server-2.0.1.20
+DISTNAME=	sj3-server-2.0.1.20
+PKGREVISION=	1
 CATEGORIES=	japanese inputmethod
-MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/	\
-		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 COMMENT=	Japanese input method (server)
 
-DEPENDS+=	sj3-lib-2.0.1.20:../../inputmethod/sj3-lib
+DEPENDS+=	sj3-server-bin>=2.0.1.20nb1:../sj3-server-bin
+DEPENDS+=	sj3-dict>=2.0.1.20nb1:../sj3-dict
 
-FILESDIR=	${.CURDIR}/../../inputmethod/sj3-lib/files
-PATCHDIR=	${.CURDIR}/../../inputmethod/sj3-lib/patches
+EXTRACT_ONLY=	# empty
+NO_BUILD=	YES
+NO_CHECKSUM=	YES
 
-.include "../../mk/bsd.prefs.mk"
-SJ3OWNER?=	daemon
-SJ3GROUP?=	daemon
-DICT_DIR?=	/var/dict
-MAKE_ENV+=	SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} DICT_DIR=${DICT_DIR} \
-		LOCAL_LDFLAGS="${LDFLAGS}"
-PLIST_SUBST=	SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} DICT_DIR=${DICT_DIR} \
-		PREFIX=${PREFIX}
-
-INSTALL_SRC=	${PKGDIR}/INSTALL
-INSTALL_FILE=	${WRKDIR}/INSTALL
-
-STARTUP_SCRIPT=	etc/rc.d/sj3
-STARTUP_SCRIPT_SRC=${WRKDIR}/STARTUP
-
-pre-configure:
-	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
-	@${SED} -e 's|\(SUBDIRS = .*\)sj3lib \(.*\)|\1\2|'	\
-		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
-	@for file in `${FIND} ${WRKSRC} -name Imakefile`; do	\
-		${MV} -f $$file $$file.orig;			\
-		${SED} -e 's|\(= \).*/lib\(sj3lib\).a|\1-l\2|'	\
-			$$file.orig > $$file;			\
-	 done
-
-do-configure:
-	@(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles)
-
-post-build:
-	@${ECHO} '#!/bin/sh'				 > ${STARTUP_SCRIPT_SRC}
-	@${ECHO} 'sj3=${PREFIX}/bin/sj3serv'		>> ${STARTUP_SCRIPT_SRC}
-	@${ECHO} 'if [ -f $$sj3 ]; then'		>> ${STARTUP_SCRIPT_SRC}
-	@${ECHO} "    echo -n ' sj3'"			>> ${STARTUP_SCRIPT_SRC}
-	@${ECHO} '	$$sj3'				>> ${STARTUP_SCRIPT_SRC}
-	@${ECHO} 'fi'					>> ${STARTUP_SCRIPT_SRC}
-	@${SED} -e 's|$${SJ3OWNER}|${SJ3OWNER}|'	\
-		-e 's|$${SJ3GROUP}|${SJ3GROUP}|'	\
-		-e 's|$${DICT_DIR}|${DICT_DIR}|'	\
-		-e 's|$${PREFIX}|${PREFIX}|'		\
-		${INSTALL_SRC} > ${INSTALL_FILE}
-
-post-install:
-	@${INSTALL_SCRIPT} ${STARTUP_SCRIPT_SRC} ${PREFIX}/${STARTUP_SCRIPT}
+do-install:	# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-server/PLIST b/inputmethod/sj3-server/PLIST
index 51d13407fdb..eb9b08cff1e 100644
--- a/inputmethod/sj3-server/PLIST
+++ b/inputmethod/sj3-server/PLIST
@@ -1,33 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:13 seb Exp $
-@cwd ${DICT_DIR}
-@cwd ${DICT_DIR}
-sj3/sj3main.dic
-@cwd ${PREFIX}
-bin/sj3
-bin/sj3dic
-bin/sj3mkdic
-bin/sj3serv
-bin/sj3stat
-etc/rc.d/sj3
-man/ja_JP.EUC/man1/sj3.1
-man/ja_JP.EUC/man1/sj3dic.1
-man/ja_JP.EUC/man1/sj3mkdic.1
-man/ja_JP.EUC/man1/sj3serv.1
-share/sj3/Nihongo.ps.Z
-share/sj3/cvtkey.news
-share/sj3/cvtkey.nwp511
-share/sj3/cvtkey.nwp517
-share/sj3/cvtkey.xterm
-share/sj3/hinsi.ms
-share/sj3/makedict.ms
-share/sj3/serverrc
-share/sj3/sj3lib.ms
-share/sj3/sj3serv.ms
-share/sj3/sjrc
-share/sj3/sjrk
-@dirrm share/sj3
-@exec ${MKDIR} ${DICT_DIR}/sj3/user
-@exec ${CHMOD} 755 ${DICT_DIR}/sj3/user
-@exec ${CHOWN} ${SJ3OWNER}:${SJ3GROUP} ${DICT_DIR}/sj3/user
-@unexec ${RMDIR} ${DICT_DIR}/sj3/user
-@unexec ${RMDIR} ${DICT_DIR}/sj3
+@comment $NetBSD: PLIST,v 1.2 2002/06/10 10:22:41 sakamoto Exp $
diff --git a/inputmethod/sj3-server/distinfo b/inputmethod/sj3-server/distinfo
deleted file mode 100644
index b758a5fb4ab..00000000000
--- a/inputmethod/sj3-server/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:13 seb Exp $
-
-SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
-Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
-SHA1 (patch-aa) = e2c60ca8709f8b78833ebc4f506b4cc63812a5bd
-SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd
-SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1
-SHA1 (patch-ad) = be015448eb4ee267a2228838cc2a08e2586b0a85
-SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc
-SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5
-SHA1 (patch-ag) = b01fda538eb70a8f66cd42bcc719e24da848929f