5 files changed, 48 insertions, 12 deletions

diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index 5e14464f6feb..1e5748f3ab95 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	rskkserv
-PORTVERSION=	2.94.12a
-PORTREVISION=	1
+PORTVERSION=	2.95.2
+PORTREVISION=	0
 CATEGORIES=	japanese ruby
-MASTER_SITES=	http://www.unixuser.org/~ysjj/rskkserv/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	rskkserv/12104
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -37,8 +38,11 @@ SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/rskkserv.sh
 
+MAN1=		rskkserv.1
+MANLANG=	"" ja
+
 DOCS_EN=	ChangeLog
-DOCS_JA=	README		TODO
+DOCS_JA=	TODO
 
 post-extract:
 	${LN} -s ${WRKSRC}/skkserv.rb.in ${WRKSRC}/rskkserv.in
@@ -51,10 +55,13 @@ post-patch:
 		-e 'gsub %r:SKK-JISYO\\.L:, %q:${SKKJISYO}:' \
 		-e 'sub %r%(CACHEDIR\s*=\s*")[^"]*(")%, \
 					     %q%\\1${SKKJISYO_BASE}\\2%' \
-		${WRKSRC}/rskkserv.conf.sample
+		${WRKSRC}/doc/rskkserv.conf.sample
+	${RUBY} -i -p \
+		-e 'sub %r%/usr/bin/ruby%, %q%${RUBY}% ' \
+		${WRKSRC}/doc/conf-o2n.rb
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/rskkserv.conf.sample ${PREFIX}/etc/
+	${INSTALL_DATA} ${WRKSRC}/doc/rskkserv.conf.sample ${PREFIX}/etc/
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then \
 		${ECHO} "Installing ${STARTUP_SCRIPT} file."; \
 		( \
@@ -70,7 +77,7 @@ post-install:
 		${ECHO_CMD} "	pidfile=/var/run/rskkserv.pid"; \
 		${ECHO_CMD} "	if [ -f \$$pidfile ]; then"; \
 		${ECHO_CMD} "	    kill \`cat \$$pidfile\` && echo -n ' rskkserv'"; \
-		${ECHO_CMD} "	    ${RM} \$$pidfile"; \
+		${ECHO_CMD} "	    ${RM} -f \$$pidfile"; \
 		${ECHO_CMD} "	else"; \
 		${ECHO_CMD} "	    ${ECHO_CMD} ' rskkserv: not running'"; \
 		${ECHO_CMD} "	fi"; \
@@ -90,6 +97,10 @@ post-install:
 .for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/rskkserv.1 ${PREFIX}/man/man1/rskkserv.1
+	${INSTALL_MAN} ${WRKSRC}/doc/rskkserv.1.ja_JP.eucJP ${PREFIX}/man/ja/man1/rskkserv.1
 .endif
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/doc/conf-o2n.rb ${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/rskkserv/distinfo b/japanese/rskkserv/distinfo
index 813243c09b98..749156177d0b 100644
--- a/japanese/rskkserv/distinfo
+++ b/japanese/rskkserv/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/rskkserv-2.94.12a.tar.gz) = c7d7c49baa8ae6ab4ee87946bd288005
-SIZE (ruby/rskkserv-2.94.12a.tar.gz) = 40763
+MD5 (ruby/rskkserv-2.95.2.tar.gz) = 0f92730ce62668143c178a1080d7759f
+SIZE (ruby/rskkserv-2.95.2.tar.gz) = 57903
diff --git a/japanese/rskkserv/files/patch-doc::conf-o2n.rb b/japanese/rskkserv/files/patch-doc::conf-o2n.rb
new file mode 100644
index 000000000000..3c471747e4be
--- /dev/null
+++ b/japanese/rskkserv/files/patch-doc::conf-o2n.rb
@@ -0,0 +1,11 @@
+--- doc/conf-o2n.rb.orig	Thu Nov  4 02:08:37 2004
++++ doc/conf-o2n.rb	Thu Nov  4 08:18:09 2004
+@@ -41,7 +41,7 @@
+ 
+     def global
+       ["HOST", "PORT", "MAX_CLIENTS", "DAEMON", "TCPWRAP",
+-       "PIDFILE", "LOG_FILE"].each do |var|
++       "PID_FILE", "LOG_FILE"].each do |var|
+         set_if_def(SKKServerConfig, var, var.downcase)
+       end
+ 
diff --git a/japanese/rskkserv/files/patch-doc::rskkserv.conf.sample b/japanese/rskkserv/files/patch-doc::rskkserv.conf.sample
new file mode 100644
index 000000000000..56311a3edfce
--- /dev/null
+++ b/japanese/rskkserv/files/patch-doc::rskkserv.conf.sample
@@ -0,0 +1,11 @@
+--- doc/rskkserv.conf.sample.orig	Thu Nov  4 05:55:42 2004
++++ doc/rskkserv.conf.sample	Thu Nov  4 08:17:56 2004
+@@ -6,7 +6,7 @@
+ 
+ daemon = true
+ tcpwrap = true
+-pid_FILE = "/var/run/rskkserv.pid"
++pid_file = "/var/run/rskkserv.pid"
+ 
+ # nolog, emerg, alert, crit, err, warning, notice, info, debug
+ log_level = debug
diff --git a/japanese/rskkserv/pkg-plist b/japanese/rskkserv/pkg-plist
index 916aa948d8fc..3681b00ab6ac 100644
--- a/japanese/rskkserv/pkg-plist
+++ b/japanese/rskkserv/pkg-plist
@@ -3,14 +3,17 @@ etc/rskkserv.conf
 etc/rskkserv.conf.sample
 %%RUBY_SITEARCHLIBDIR%%/skkserv/skkdic.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/skkserv
-%%RUBY_SITELIBDIR%%/skkserv/skkdic.rb
-%%RUBY_SITELIBDIR%%/skkserv/logger.rb
+%%RUBY_SITELIBDIR%%/skkserv/bdbdic.rb
+%%RUBY_SITELIBDIR%%/skkserv/conf.rb
 %%RUBY_SITELIBDIR%%/skkserv/ebdic.rb
+%%RUBY_SITELIBDIR%%/skkserv/logger.rb
+%%RUBY_SITELIBDIR%%/skkserv/skkdic.rb
 @dirrm %%RUBY_SITELIBDIR%%/skkserv
 libexec/rskkserv
 @unexec rm -f %D/share/skk/SKK-JISYO.[LMS].[an] 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TODO
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%EXAMPLESDIR%%/conf-o2n.rb
+@dirrm %%EXAMPLESDIR%%