4 files changed, 41 insertions, 35 deletions

diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index b7faa5ed7535..a9ed7d8dfe43 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	rskkserv
-PORTVERSION=	2.95.3
-PORTREVISION=	1
+PORTVERSION=	2.95.4
+PORTREVISION=	0
 CATEGORIES=	japanese ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	rskkserv/12167
+MASTER_SITE_SUBDIR=	rskkserv/15241
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -19,9 +19,18 @@ COMMENT=	An alternative implementation of skkserv written in Ruby
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap \
 		${SKKJISYO_BASE}/${SKKJISYO}:${SKK_MASTERDIR}
 
+.if defined(WITH_RUBY_CDB)
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/cdb.so:${PORTSDIR}/databases/ruby-cdb
+.endif
+
+.if defined(WITH_RUBY_EB)
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
+.endif
+
 USE_RUBY=	yes
 USE_AUTOCONF_VER=	213
 USE_GMAKE=	yes
+USE_RC_SUBR=	rskkserv.sh
 
 CONFIGURE_ARGS=	--with-ruby="${RUBY}" \
 		--with-dicfile="${SKKJISYO_BASE}/${SKKJISYO}" \
@@ -35,8 +44,6 @@ SKKJISYO_BASE=	${LOCALBASE}/share/skk
 SKKJISYO=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
 
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/rskkserv.sh
-
 MAN1=		rskkserv.1
 MANLANG=	"" ja
 
@@ -60,33 +67,6 @@ post-patch:
 		${WRKSRC}/doc/conf-o2n.rb
 
 post-install:
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then \
-		${ECHO} "Installing ${STARTUP_SCRIPT} file."; \
-		( \
-		${ECHO_CMD} "#!/bin/sh"; \
-		${ECHO_CMD} "case \$$1 in"; \
-		${ECHO_CMD} "start)"; \
-		${ECHO_CMD} "	if [ -f ${PREFIX}/sbin/rskkserv ]; then"; \
-		${ECHO_CMD} "		${ECHO_CMD} -n ' rskkserv: '"; \
-		${ECHO_CMD} "		${PREFIX}/sbin/rskkserv"; \
-		${ECHO_CMD} "	fi"; \
-		${ECHO_CMD} "	;;"; \
-		${ECHO_CMD} "stop)"; \
-		${ECHO_CMD} "	pidfile=/var/run/rskkserv.pid"; \
-		${ECHO_CMD} "	if [ -f \$$pidfile ]; then"; \
-		${ECHO_CMD} "	    kill \`cat \$$pidfile\` && echo -n ' rskkserv'"; \
-		${ECHO_CMD} "	    ${RM} -f \$$pidfile"; \
-		${ECHO_CMD} "	else"; \
-		${ECHO_CMD} "	    ${ECHO_CMD} ' rskkserv: not running'"; \
-		${ECHO_CMD} "	fi"; \
-		${ECHO_CMD} "	;;"; \
-		${ECHO_CMD} "*)"; \
-		${ECHO_CMD} "	${ECHO_CMD} \"usage: \$$0 {start|stop}\" 1>&2"; \
-		${ECHO_CMD} "	;;"; \
-		${ECHO_CMD} "esac"; \
-		) > ${STARTUP_SCRIPT}; \
-		${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \
-	fi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
diff --git a/japanese/rskkserv/distinfo b/japanese/rskkserv/distinfo
index 2f1d5fe42475..b941702d4d18 100644
--- a/japanese/rskkserv/distinfo
+++ b/japanese/rskkserv/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/rskkserv-2.95.3.tar.gz) = d0db2fac37ef70d041784771b15741e3
-SIZE (ruby/rskkserv-2.95.3.tar.gz) = 58419
+MD5 (ruby/rskkserv-2.95.4.tar.gz) = f4a148c90093103b3f72358cbb260b30
+SIZE (ruby/rskkserv-2.95.4.tar.gz) = 60634
diff --git a/japanese/rskkserv/files/rskkserv.sh.in b/japanese/rskkserv/files/rskkserv.sh.in
new file mode 100644
index 000000000000..7be0a302caad
--- /dev/null
+++ b/japanese/rskkserv/files/rskkserv.sh.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: rskkserv
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+prefix=%%PREFIX%%
+
+rskkserv_enable=${rskkserv_enable:-"NO"}
+rskkserv_flags=${rskkserv_flags:-""}
+
+. %%RC_SUBR%%
+
+name="rskkserv"
+rcvar=`set_rcvar`
+command="${prefix}/sbin/${name}"
+command_interpreter="${prefix}/bin/ruby"
+pidfile="/var/run/${name}.pid"
+required_files="${prefix}/etc/${name}.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/japanese/rskkserv/pkg-plist b/japanese/rskkserv/pkg-plist
index f61db480efe1..4fe772ba9f02 100644
--- a/japanese/rskkserv/pkg-plist
+++ b/japanese/rskkserv/pkg-plist
@@ -1,11 +1,12 @@
-etc/rc.d/rskkserv.sh
 @unexec if cmp -s %D/etc/rskkserv.conf %D/%%EXAMPLESDIR%%/rskkserv.conf; then rm -f %D/etc/rskkserv.conf; fi
 %%RUBY_SITEARCHLIBDIR%%/skkserv/skkdic.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/skkserv
 %%RUBY_SITELIBDIR%%/skkserv/bdbdic.rb
+%%RUBY_SITELIBDIR%%/skkserv/cdbdic.rb
 %%RUBY_SITELIBDIR%%/skkserv/conf.rb
 %%RUBY_SITELIBDIR%%/skkserv/ebdic.rb
 %%RUBY_SITELIBDIR%%/skkserv/logger.rb
+%%RUBY_SITELIBDIR%%/skkserv/nulldic.rb
 %%RUBY_SITELIBDIR%%/skkserv/skkdic.rb
 @dirrm %%RUBY_SITELIBDIR%%/skkserv
 sbin/rskkserv