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

  remove japanese/sj3.
- Use localhost as the default listen address instead of INADDR_ANY.
- Add "servername" directive to serverrc.
- Fix incorrect descriptions in serverrc.
- Take maintainership.

8 files changed, 56 insertions, 146 deletions

diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index c14870168960..e0f63967fb0c 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	SJ3
+# New ports collection makefile for:	sj3-lib
 # Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
@@ -7,42 +7,33 @@
 
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
-		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
-MASTER_SITES+=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nork
+MASTER_SITES=	LOCAL/nork
+PKGNAMESUFFIX=	-lib
 
 PATCH_SITES=	http://quasiquote.org/files/
 PATCHFILES=	${PORTNAME}-qq-2.0.1.21.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	hiroo+freebsd@oikumene.gcd.org
-COMMENT=	A Japanese input method
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	A Japanese input method, library part
 
-USE_RC_SUBR=	sj3.sh
 USE_IMAKE=	yes
+USE_LDCONFIG=	yes
+NO_INSTALL_MANPAGES=	yes
+SUB_FILES=	sj3_freebsd.tmpl
+SUB_LIST=	DESTDIR=${DESTDIR}
 
-MAN1=		sj3.1 sj3dic.1 sj3mkdic.1 sj3serv.1
-MANLANG=	ja
-MANCOMPRESSED=	no
-PORTDOCS=	Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms
-
-# NOTE : You must not use 'xmkmf -a', because the running 'make depend' caused a error.
+POSTPATCHES=	${FILESDIR}/post-patch-Imakefile \
+		${FILESDIR}/post-patch-include-Const.h
 
 .include <bsd.port.pre.mk>
 
-pre-configure:
-	${REINPLACE_CMD} -e "\#^SJ3TOP#s#=.*#= ${PREFIX}#" \
-		-e "\#^SJ3DICTDIR#s#=.*#= \\$$\(SJ3LIBDIR)/sj3/dict#" \
-		-e "\#^SJ3VARRUNDIR#s#=.*#= ${DESTDIR}\\$$\(VARDIR)/run/sj3#" \
-		${WRKSRC}/sj3.tmpl
-
-do-configure:
-	( cd $(WRKSRC) ; ${XMKMF} ; make Makefiles )
+post-patch:
+	cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH}
 
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+pre-configure: apply-slist
+	${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl
 
 .include <bsd.port.post.mk>
diff --git a/japanese/sj3-lib/files/patch-sj3.tmpl b/japanese/sj3-lib/files/patch-sj3.tmpl
index e9e027128774..4efe7b5082ba 100644
--- a/japanese/sj3-lib/files/patch-sj3.tmpl
+++ b/japanese/sj3-lib/files/patch-sj3.tmpl
@@ -1,21 +1,9 @@
---- ./sj3.tmpl.orig	Sat Jun  9 23:22:10 2007
-+++ ./sj3.tmpl	Sat Jun  9 23:22:45 2007
-@@ -56,18 +56,6 @@
+--- sj3.tmpl.orig	1997-01-23 20:20:58.000000000 +0900
++++ sj3.tmpl	2008-09-07 16:07:19.000000000 +0900
+@@ -62,3 +62,5 @@
+ #endif
  
- #define Sj3LibRev 1.21
- 
--/*
-- * Change for FreeBSD.
-- * Because When the LANG variable is EUC, setlocale function in library libc 
-- * return NULL, use it in library libxpg4 
-- * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-- */
--#if defined(FreeBSDArchitecture)
--
--CODE_LIBS	= -lxpg4
--
--#endif
--
- #if SystemV4 || SystemV
- USETLI          = -DTLI
- #else
+ #endif
++
++#include "sj3_freebsd.tmpl"
+\ No newline at end of file
diff --git a/japanese/sj3-lib/files/post-patch-Imakefile b/japanese/sj3-lib/files/post-patch-Imakefile
new file mode 100644
index 000000000000..bda7bb5b226f
--- /dev/null
+++ b/japanese/sj3-lib/files/post-patch-Imakefile
@@ -0,0 +1,23 @@
+--- Imakefile.orig	2008-09-07 16:20:03.000000000 +0900
++++ Imakefile	2008-09-07 16:20:51.000000000 +0900
+@@ -42,7 +42,7 @@
+  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
+  */
+ 
+-SUBDIRS = sjcompat dict doc kanakan server sj3rkcv sj3lib sj3 sj3dic sj3stat demo
++SUBDIRS = sjcompat sj3lib
+ 
+ AllTarget(includes)
+ MakeSubdirs($(SUBDIRS))
+@@ -62,11 +62,6 @@
+ 	echo "#define DEFKEYFILE	\"$(SJ3CONFDIR)/cvtkey.\"") \	@@\
+ 	>> include/Paths.h
+ 
+-install::
+-	$(MKDIRHIER) $(SJ3VARRUNDIR)
+-	chown $(SJ3OWNER) $(SJ3VARRUNDIR)
+-	chgrp $(SJ3GROUP) $(SJ3VARRUNDIR)
+-
+ clean::
+ 	rm -f include/Paths.h
+ 
diff --git a/japanese/sj3-lib/files/sj3.sh.in b/japanese/sj3-lib/files/sj3.sh.in
deleted file mode 100644
index f39a18764ccd..000000000000
--- a/japanese/sj3-lib/files/sj3.sh.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: sj3
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these sj3_* variables in one of these files:
-#	/etc/rc.conf
-#	/etc/rc.conf.local
-#	/etc/rc.conf.d/sj3
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-sj3_enable=${sj3_enable:-"NO"}		# Enable sj3
-#sj3_program="%%PREFIX%%/sbin/sj3serv"	# Location of sj3
-
-. %%RC_SUBR%%
-
-name="sj3"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/sj3serv"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/japanese/sj3-lib/files/sj3_freebsd.tmpl.in b/japanese/sj3-lib/files/sj3_freebsd.tmpl.in
new file mode 100644
index 000000000000..09e56d6c344c
--- /dev/null
+++ b/japanese/sj3-lib/files/sj3_freebsd.tmpl.in
@@ -0,0 +1,5 @@
+/* $FreeBSD$ */
+
+SJ3TOP=		%%PREFIX%%
+SJ3DICTDIR=	$(SJ3LIBDIR)/sh3/dict
+SJ3VARRUNDIR=	%%DESTDIR%%$(VARDIR)/run/sj3
diff --git a/japanese/sj3-lib/pkg-descr b/japanese/sj3-lib/pkg-descr
index 3daaeb2d9b61..e0d1fba83a52 100644
--- a/japanese/sj3-lib/pkg-descr
+++ b/japanese/sj3-lib/pkg-descr
@@ -1,20 +1,3 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv), 
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
-
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
-
-sj3		3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem 
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+This is SJ3, a Japanese input method developed by Sony Corporation.
+SJ3 is composed of Kana-Kanji conversion server(sj3serv), Kana-Kanji
+conversion client for terminal(sj3) and Kana-Kanji conversion library(sj3lib).
diff --git a/japanese/sj3-lib/pkg-install b/japanese/sj3-lib/pkg-install
deleted file mode 100644
index 800be546af56..000000000000
--- a/japanese/sj3-lib/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-    PRE-INSTALL)
-	USER=_sj3
-	GROUP=${USER}
-	UID=912
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "SJ3 Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-esac
diff --git a/japanese/sj3-lib/pkg-plist b/japanese/sj3-lib/pkg-plist
index 2e7e1c6edf02..eb09f85044ad 100644
--- a/japanese/sj3-lib/pkg-plist
+++ b/japanese/sj3-lib/pkg-plist
@@ -1,21 +1,5 @@
-bin/sj3
-bin/sj3dic
-bin/sj3mkdic
-bin/sj3stat
-etc/sj3/cvtkey.news
-etc/sj3/cvtkey.nwp511
-etc/sj3/cvtkey.nwp517
-etc/sj3/cvtkey.xterm
-etc/sj3/serverrc
-etc/sj3/sjrc
-etc/sj3/sjrk
+@comment $FreeBSD$
 include/sj3lib.h
 lib/libsj3lib.a
 lib/libsj3lib.so
 lib/libsj3lib.so.1
-lib/sj3/dict/sj3main.dic
-sbin/sj3serv
-@dirrm lib/sj3/dict/user
-@dirrm lib/sj3/dict
-@dirrm lib/sj3
-@dirrm etc/sj3