Update to 2.90.1.

5 files changed, 93 insertions, 11 deletions

diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index 715c79e0180..53a3c0e780b 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	rskkserv
-PORTVERSION=	2.3.2
+PORTVERSION=	2.90.1
 CATEGORIES=	japanese ruby
-MASTER_SITES=	http://www.ruby-lang.org/~shugo/rskkserv/
+MASTER_SITES=	http://www.unixuser.org/~ysjj/rskkserv/
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -24,21 +24,27 @@ SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/rskkserv.sh
 MAKE_ARGS=	prefix="${PREFIX}" \
-		dicfile="${LOCALBASE}/share/skk/${SKKJISYO}"
+		skkdicsize="${SKKJISYO_SIZE}" \
+		epwdicbase="${PREFIX}/share/dict" \
+		skkdicbase="${PREFIX}/share/skk" \
+		SKKSERV=rskkserv
 
-pre-build:
-	cd ${WRKSRC} && ${MAKE} clean
+DOCS_EN=	ChangeLog
+DOCS_JA=	README		TODO
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/skkserv.rb ${PREFIX}/sbin/rskkserv
+post-patch:
+	${MV} ${WRKSRC}/rskkserv.conf ${WRKSRC}/rskkserv.conf.in
+
+post-install:
+	${CP} -R ${WRKSRC}/skkserv ${RUBY_SITELIBDIR}/
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then \
 		${ECHO} "Installing ${STARTUP_SCRIPT} file."; \
 		${ECHO} "#!/bin/sh" > ${STARTUP_SCRIPT}; \
 		${ECHO} 'case $$1 in' >> ${STARTUP_SCRIPT}; \
 		${ECHO} "start)" >> ${STARTUP_SCRIPT}; \
-		${ECHO} "	if [ -f ${PREFIX}/sbin/rskkserv ]; then" >> \
+		${ECHO} "	if [ -f ${PREFIX}/libexec/rskkserv ]; then" >> \
 			${STARTUP_SCRIPT}; \
-		${ECHO} "		${ECHO} -n ' rskkserv'; ${PREFIX}/sbin/rskkserv" >> \
+		${ECHO} "		${ECHO} -n ' rskkserv'; ${PREFIX}/libexec/rskkserv" >> \
 			${STARTUP_SCRIPT}; \
 		${ECHO} "	fi" >> ${STARTUP_SCRIPT}; \
 		${ECHO} "	;;" >> ${STARTUP_SCRIPT}; \
@@ -50,5 +56,14 @@ do-install:
 		${ECHO} 'esac' >> ${STARTUP_SCRIPT}; \
 		${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \
 	fi
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_DOCDIR}/rskkserv/ja
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rskkserv/
+.endfor
+.for f in ${DOCS_JA}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rskkserv/ja/
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/rskkserv/distinfo b/japanese/rskkserv/distinfo
index de51c93800e..2684c546543 100644
--- a/japanese/rskkserv/distinfo
+++ b/japanese/rskkserv/distinfo
@@ -1 +1 @@
-MD5 (ruby/rskkserv-2.3.2.tar.gz) = eac4480b80a1c016f0456c77d6265a29
+MD5 (ruby/rskkserv-2.90.1.tar.gz) = 02083c55d712439b9ac2466c5da82261
diff --git a/japanese/rskkserv/files/patch-Makefile b/japanese/rskkserv/files/patch-Makefile
new file mode 100644
index 00000000000..b01a4d9454b
--- /dev/null
+++ b/japanese/rskkserv/files/patch-Makefile
@@ -0,0 +1,29 @@
+--- Makefile.orig	Tue Jan  9 01:27:21 2001
++++ Makefile	Fri Jan 19 06:20:30 2001
+@@ -8,6 +8,11 @@
+ datadir = $(prefix)/share
+ etcdir = $(prefix)/etc
+ libexecdir = $(prefix)/libexec
++skkdicbase = $(datadir)/share/skk
++epwdicbase = /opt/epwing
++skkdicsize = L
++
++all: $(SKKSERV) $(CONFILE)
+ 
+ $(SKKSERV): skkserv.rb.in
+ 	$(RUBY) -p -e 'sub %r%@exec_prefix@%, %q%$(exec_prefix)%' \
+@@ -15,7 +20,13 @@
+ 		skkserv.rb.in > $@
+ 	chmod 755 $@
+ 
+-all: $(SKKSERV)
++$(CONFILE): $(CONFILE).in
++	$(RUBY) -p -e 'sub %r%@skkdicbase@%, %q%$(skkdicbase)%' \
++		   -e 'sub %r%@epwdicbase@%, %q%$(epwdicbase)%' \
++		   -e 'sub %r%@skkdicsize@%, %q%$(skkdicsize)%' \
++		   -e 'sub %r%(CACHEDIR\s*=\s*")[^"]*(")%, \
++					     %q%\\1${PREFIX}/share/skk\\2%' \
++		$(CONFILE).in > $@
+ 
+ clean:
+ 	rm -f $(SKKSERV) *~
diff --git a/japanese/rskkserv/files/patch-rskkserv.conf b/japanese/rskkserv/files/patch-rskkserv.conf
new file mode 100644
index 00000000000..dd28746f084
--- /dev/null
+++ b/japanese/rskkserv/files/patch-rskkserv.conf
@@ -0,0 +1,29 @@
+--- rskkserv.conf.orig	Thu Jan 11 16:37:27 2001
++++ rskkserv.conf	Fri Jan 19 06:06:57 2001
+@@ -9 +9 @@
+-    DICFILE = "/usr/share/skk/SKK-JISYO.L"
++    DICFILE = "@skkdicbase@/SKK-JISYO.@skkdicsize@"
+@@ -15 +15 @@
+-      DICFILE = "/usr/share/skk/SKK-JISYO.JIS2"
++      DICFILE = "@skkdicbase@/SKK-JISYO.JIS2"
+@@ -19 +19 @@
+-#        DICFILE = "/usr/share/skk/SKK-JISYO.JIS3_4"
++#        DICFILE = "@skkdicbase@/SKK-JISYO.JIS3_4"
+@@ -23 +23 @@
+-      DICFILE = "/usr/share/skk/SKK-JISYO.pubdic+"
++      DICFILE = "@skkdicbase@/SKK-JISYO.pubdic+"
+@@ -27 +27 @@
+-      DICFILE = "/usr/share/skk/SKK-JISYO.zipcode"
++      DICFILE = "@skkdicbase@/SKK-JISYO.zipcode"
+@@ -31 +31 @@
+-      DICFILE = "/usr/share/skk/SKK-JISYO.office.zipcode"
++      DICFILE = "@skkdicbase@/SKK-JISYO.office.zipcode"
+@@ -37 +37 @@
+-      DICDIR = "/opt/epwing/koujien"
++      DICDIR = "@epwdicbase@/koujien"
+@@ -42 +42 @@
+-      DICDIR = "/opt/epwing/mypaedia"
++      DICDIR = "@epwdicbase@/mypaedia-fpw"
+@@ -47 +47 @@
+-      DICDIR = "/opt/epwing/wdic"
++      DICDIR = "@epwdicbase@/wdic-fpw"
diff --git a/japanese/rskkserv/pkg-plist b/japanese/rskkserv/pkg-plist
index b365fd93ef0..33320d5c16d 100644
--- a/japanese/rskkserv/pkg-plist
+++ b/japanese/rskkserv/pkg-plist
@@ -1,3 +1,12 @@
-sbin/rskkserv
 etc/rc.d/rskkserv.sh
+etc/rskkserv.conf
+%%RUBY_SITELIBDIR%%/skkserv/skkdic.rb
+%%RUBY_SITELIBDIR%%/skkserv/ebdic.rb
+@dirrm %%RUBY_SITELIBDIR%%/skkserv
+libexec/rskkserv
 @unexec rm -f %D/share/skk/SKK-JISYO.[LMS].[an] 2>/dev/null || true
+%%RUBY_DOCDIR%%/rskkserv/ChangeLog
+%%RUBY_DOCDIR%%/rskkserv/ja/README
+%%RUBY_DOCDIR%%/rskkserv/ja/TODO
+@dirrm %%RUBY_DOCDIR%%/rskkserv/ja
+@dirrm %%RUBY_DOCDIR%%/rskkserv