summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--japanese/rskkserv/Makefile40
-rw-r--r--japanese/rskkserv/distinfo2
-rw-r--r--japanese/rskkserv/files/patch-Makefile29
-rw-r--r--japanese/rskkserv/files/patch-rskkserv.conf29
-rw-r--r--japanese/rskkserv/pkg-descr3
-rw-r--r--japanese/rskkserv/pkg-plist3
6 files changed, 34 insertions, 72 deletions
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index ce90c556e9a2..e4aa4d838fc7 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rskkserv
-PORTVERSION= 2.91.1
+PORTVERSION= 2.94.0
CATEGORIES= japanese ruby
MASTER_SITES= http://www.unixuser.org/~ysjj/rskkserv/
DIST_SUBDIR= ruby
@@ -14,29 +14,41 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap \
- ${LOCALBASE}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
+ ${SKKJISYO_BASE}/${SKKJISYO}:${SKK_MASTERDIR}
USE_RUBY= yes
+USE_AUTOCONF= yes
+USE_GMAKE= yes
+
+CONFIGURE_ARGS= --with-ruby="${RUBY}" \
+ --with-dicfile="${SKKJISYO_BASE}/${SKKJISYO}" \
+ --with-cachedir="${SKKJISYO_BASE}" \
+ --with-logdir="/var/log" \
+ --sbindir="${PREFIX}/libexec"
+
SKKJISYO_SIZE?= L
-SKKJISYO?= SKK-JISYO.${SKKJISYO_SIZE}
+SKKJISYO_BASE= ${LOCALBASE}/share/skk
+SKKJISYO= SKK-JISYO.${SKKJISYO_SIZE}
SKK_MASTERDIR= ${PORTSDIR}/japanese/skk-jisyo
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/rskkserv.sh
-MAKE_ARGS= prefix="${PREFIX}" \
- skkdicsize="${SKKJISYO_SIZE}" \
- epwdicbase="${PREFIX}/share/dict" \
- skkdicbase="${PREFIX}/share/skk" \
- SKKSERV=rskkserv
+MAKE_ARGS= SKKSERV=rskkserv
DOCS_EN= ChangeLog
DOCS_JA= README TODO
-pre-patch:
- ${CP} ${WRKSRC}/rskkserv.conf.sample ${WRKSRC}/rskkserv.conf.in
+post-patch:
+ ${RUBY} -i -p \
+ -e 'gsub %r:/usr/share/skk:, %q:${SKKJISYO_BASE}:' \
+ -e 'gsub %r:/opt/epwing/(\w+):, %q:${LOCALBASE}/share/dict/\\1-fpw:' \
+ -e 'gsub %r:SKK-JISYO\\.L:, %q:${SKKJISYO}:' \
+ -e 'sub %r%(CACHEDIR\s*=\s*")[^"]*(")%, \
+ %q%\\1${SKKJISYO_BASE}\\2%' \
+ ${WRKSRC}/rskkserv.conf.sample
post-install:
- ${CP} -R ${WRKSRC}/skkserv ${RUBY_SITELIBDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/rskkserv.conf.sample ${PREFIX}/etc/
@if [ ! -f ${STARTUP_SCRIPT} ]; then \
${ECHO} "Installing ${STARTUP_SCRIPT} file."; \
${ECHO} "#!/bin/sh" > ${STARTUP_SCRIPT}; \
@@ -44,7 +56,11 @@ post-install:
${ECHO} "start)" >> ${STARTUP_SCRIPT}; \
${ECHO} " if [ -f ${PREFIX}/libexec/rskkserv ]; then" >> \
${STARTUP_SCRIPT}; \
- ${ECHO} " ${ECHO} -n ' rskkserv'; ${PREFIX}/libexec/rskkserv" >> \
+ ${ECHO} " ${ECHO} -n ' rskkserv';" >> \
+ ${ECHO} " if [ ${SKKJISYO_BASE}/${SKKJISYO} -nt ${SKKJISYO_BASE}/${SKKJISYO}.a ]; then" >> \
+ ${ECHO} " ${ECHO} -n ' (updading index cache..)'; " >> \
+ ${ECHO} " fi; " >> ${STARTUP_SCRIPT}; \
+ ${ECHO} " ${PREFIX}/libexec/rskkserv" >> \
${STARTUP_SCRIPT}; \
${ECHO} " fi" >> ${STARTUP_SCRIPT}; \
${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \
diff --git a/japanese/rskkserv/distinfo b/japanese/rskkserv/distinfo
index 1b79d6dbc911..93cdb75ee2fd 100644
--- a/japanese/rskkserv/distinfo
+++ b/japanese/rskkserv/distinfo
@@ -1 +1 @@
-MD5 (ruby/rskkserv-2.91.1.tar.gz) = a901fd111ff3d050f71a1056a5b489e1
+MD5 (ruby/rskkserv-2.94.0.tar.gz) = ff4f73dab57d79619e7deacca3342f4c
diff --git a/japanese/rskkserv/files/patch-Makefile b/japanese/rskkserv/files/patch-Makefile
deleted file mode 100644
index b01a4d9454b6..000000000000
--- a/japanese/rskkserv/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index 74717e79936a..000000000000
--- a/japanese/rskkserv/files/patch-rskkserv.conf
+++ /dev/null
@@ -1,29 +0,0 @@
---- rskkserv.conf.in.orig Sun Jan 21 20:29:32 2001
-+++ rskkserv.conf.in Sun Jan 21 20:29:32 2001
-@@ -12 +12 @@
-- DICFILE = "/usr/share/skk/SKK-JISYO.L"
-+ DICFILE = "@skkdicbase@/SKK-JISYO.@skkdicsize@"
-@@ -18 +18 @@
-- DICFILE = "/usr/share/skk/SKK-JISYO.JIS2"
-+ DICFILE = "@skkdicbase@/SKK-JISYO.JIS2"
-@@ -22 +22 @@
--# DICFILE = "/usr/share/skk/SKK-JISYO.JIS3_4"
-+# DICFILE = "@skkdicbase@/SKK-JISYO.JIS3_4"
-@@ -26 +26 @@
-- DICFILE = "/usr/share/skk/SKK-JISYO.pubdic+"
-+ DICFILE = "@skkdicbase@/SKK-JISYO.pubdic+"
-@@ -30 +30 @@
-- DICFILE = "/usr/share/skk/SKK-JISYO.zipcode"
-+ DICFILE = "@skkdicbase@/SKK-JISYO.zipcode"
-@@ -34 +34 @@
-- DICFILE = "/usr/share/skk/SKK-JISYO.office.zipcode"
-+ DICFILE = "@skkdicbase@/SKK-JISYO.office.zipcode"
-@@ -43 +43 @@
-- DICDIR = "/opt/epwing/koujien"
-+ DICDIR = "@epwdicbase@/koujien"
-@@ -48 +48 @@
-- DICDIR = "/opt/epwing/mypaedia"
-+ DICDIR = "@epwdicbase@/mypaedia-fpw"
-@@ -53 +53 @@
-- DICDIR = "/opt/epwing/wdic"
-+ DICDIR = "@epwdicbase@/wdic-fpw"
diff --git a/japanese/rskkserv/pkg-descr b/japanese/rskkserv/pkg-descr
index 19ce358f9878..52f80a4be0de 100644
--- a/japanese/rskkserv/pkg-descr
+++ b/japanese/rskkserv/pkg-descr
@@ -1,5 +1,6 @@
rskkserv is an alternative implementation of skkserv written in Ruby.
-Author: Shugo Maeda <shugo@ruby-lang.org>
+Author: Shugo Maeda <shugo@ruby-lang.org>,
+ YAMASHITA Junji <ysjj@unixuser.org> (current maintainer)
WWW: http://www.ruby-lang.org/en/raa-list.rhtml?name=rskkserv
diff --git a/japanese/rskkserv/pkg-plist b/japanese/rskkserv/pkg-plist
index 163d10c8cee5..10f1387b9df8 100644
--- a/japanese/rskkserv/pkg-plist
+++ b/japanese/rskkserv/pkg-plist
@@ -1,5 +1,8 @@
etc/rc.d/rskkserv.sh
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/ebdic.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 18:17:54 +0000