ports/73508: [PATCH] japanese/rskkserv: Update to 2.95.2
Hideyuki KURASHINA
rushani at FreeBSD.org
Thu Nov 4 01:00:58 UTC 2004
>Number: 73508
>Category: ports
>Synopsis: [PATCH] japanese/rskkserv: Update to 2.95.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 04 01:00:54 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Hideyuki KURASHINA
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD ***.*******.jp 5.3-STABLE FreeBSD 5.3-STABLE #0: Tue Nov 2 01:14:35 JST 2004 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/*** i386
>Description:
Update to 2.95.2. From 2.94.13 (refer ports/73316 for this catch-up),
- MASTER_SITES updated.
- Format of configuration file has been changed. Include
utility (conf-o2n.rb) that generates new format from old one.
- Dependency on ``nkf'' at its build stage is not required now
because Japanese version of manual page is now encoded by EUC-JP.
>How-To-Repeat:
Check below.
http://prdownloads.sourceforge.jp/rskkserv/12104/rskkserv-2.95.2.tar.gz
>Fix:
Apply following patch.
Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.88
diff -u -r1.88 UPDATING
--- UPDATING 31 Oct 2004 10:44:54 -0000 1.88
+++ UPDATING 4 Nov 2004 00:37:13 -0000
@@ -6,6 +6,14 @@
time you update your ports collection, before attempting any port
upgrades.
+20041104:
+ AFFECTS: users of japanese/rskkserv
+ AUTHOR: rushani at FreeBSD.org
+
+ Since version 2.95, the format of PREFIX/etc/rskkserv.conf has been changed.
+ Update your configuration file. PREFIX/share/examples/rskkserv/conf-o2n.rb
+ may help.
+
20041031:
AFFECTS: users of databases/mysql40-server
AUTHOR: ale at FreeBSD.org
Index: japanese/rskkserv/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/rskkserv/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- japanese/rskkserv/Makefile 14 Mar 2004 06:16:48 -0000 1.18
+++ japanese/rskkserv/Makefile 3 Nov 2004 23:51:10 -0000
@@ -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 at FreeBSD.org
@@ -37,8 +38,11 @@
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 @@
-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 @@
${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 @@
.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>
Index: japanese/rskkserv/distinfo
===================================================================
RCS file: /home/ncvs/ports/japanese/rskkserv/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- japanese/rskkserv/distinfo 22 Mar 2004 15:05:14 -0000 1.9
+++ japanese/rskkserv/distinfo 3 Nov 2004 20:38:02 -0000
@@ -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
Index: japanese/rskkserv/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/rskkserv/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- japanese/rskkserv/pkg-plist 6 Oct 2002 21:25:25 -0000 1.6
+++ japanese/rskkserv/pkg-plist 3 Nov 2004 22:28:19 -0000
@@ -3,14 +3,17 @@
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
+ at dirrm %%EXAMPLESDIR%%
Index: japanese/rskkserv/files/patch-doc::conf-o2n.rb
===================================================================
RCS file: japanese/rskkserv/files/patch-doc::conf-o2n.rb
diff -N japanese/rskkserv/files/patch-doc::conf-o2n.rb
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ japanese/rskkserv/files/patch-doc::conf-o2n.rb 3 Nov 2004 23:18:14 -0000
@@ -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
+
Index: japanese/rskkserv/files/patch-doc::rskkserv.conf.sample
===================================================================
RCS file: japanese/rskkserv/files/patch-doc::rskkserv.conf.sample
diff -N japanese/rskkserv/files/patch-doc::rskkserv.conf.sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ japanese/rskkserv/files/patch-doc::rskkserv.conf.sample 3 Nov 2004 23:18:24 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list