From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 30 15:30:26 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4F9816A4D0 for ; Sat, 30 Oct 2004 15:30:26 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93B0C43D45 for ; Sat, 30 Oct 2004 15:30:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9UFUQ36055397 for ; Sat, 30 Oct 2004 15:30:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9UFUQYN055393; Sat, 30 Oct 2004 15:30:26 GMT (envelope-from gnats) Resent-Date: Sat, 30 Oct 2004 15:30:26 GMT Resent-Message-Id: <200410301530.i9UFUQYN055393@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hideyuki KURASHINA Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E253F16A4CE for ; Sat, 30 Oct 2004 15:23:32 +0000 (GMT) Received: from wasley.bl.mmtr.or.jp (wasley.bl.mmtr.or.jp [210.228.173.142]) by mx1.FreeBSD.org (Postfix) with SMTP id 82C0743D39 for ; Sat, 30 Oct 2004 15:23:31 +0000 (GMT) (envelope-from rushani@FreeBSD.org) Received: (qmail 5383 invoked from network); 31 Oct 2004 00:23:29 +0900 Received: from unknown (HELO localhost) (219.102.36.33) by wasley.bl.mmtr.or.jp with SMTP; 31 Oct 2004 00:23:29 +0900 Message-Id: <20041031.002138.41631876.rushani@FreeBSD.org> Date: Sun, 31 Oct 2004 00:21:38 +0900 (JST) From: Hideyuki KURASHINA To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: knu@FreeBSD.org Subject: ports/73316: [PATCH] japanese/rskkserv: Update to 2.94.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Oct 2004 15:30:26 -0000 >Number: 73316 >Category: ports >Synopsis: [PATCH] japanese/rskkserv: Update to 2.94.13 >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: Sat Oct 30 15:30:26 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: Wed Oct 27 07:33:22 JST 2004 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/*** i386 >Description: Update to 2.94.13. Since manual pages are included from this release, let them installed. However, Japanese version is not encoded by EUC-JP, convert it from ISO-2022-JP. To avoid following result, # /usr/local/etc/rc.d/rskkserv.sh stop rskkservrm: /var/run/rskkserv.pid: No such file or directory add `-f' option for ${RM} in process that generates ${PREFIX}/etc/rc.d/rskkserv.sh because rskkserv tries to delete its pid file when the program is interrupted or terminated. >How-To-Repeat: Check below. http://raa.ruby-lang.org/list.rhtml?name=rskkserv >Fix: Apply following patch. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/rskkserv/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 14 Mar 2004 06:16:48 -0000 1.18 +++ Makefile 30 Oct 2004 14:37:50 -0000 @@ -6,8 +6,8 @@ # PORTNAME= rskkserv -PORTVERSION= 2.94.12a -PORTREVISION= 1 +PORTVERSION= 2.94.13 +PORTREVISION= 0 CATEGORIES= japanese ruby MASTER_SITES= http://www.unixuser.org/~ysjj/rskkserv/ DIST_SUBDIR= ruby @@ -15,6 +15,7 @@ MAINTAINER= knu@FreeBSD.org COMMENT= An alternative implementation of skkserv written in Ruby +BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap \ ${SKKJISYO_BASE}/${SKKJISYO}:${SKK_MASTERDIR} @@ -37,9 +38,14 @@ STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/rskkserv.sh +MAN1= rskkserv.1 +MANLANG= "" ja + DOCS_EN= ChangeLog DOCS_JA= README TODO +WRKSRC= ${WRKDIR}/${DISTNAME:S/${PORTVERSION}/cvs/} + post-extract: ${LN} -s ${WRKSRC}/skkserv.rb.in ${WRKSRC}/rskkserv.in @@ -51,10 +57,10 @@ -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 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 +76,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 +96,11 @@ .for f in ${DOCS_JA} ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ .endfor + ${INSTALL_MAN} ${WRKSRC}/doc/rskkserv.1 ${PREFIX}/man/man1/rskkserv.1 + ( cd ${WRKSRC}/doc/ && \ + ${MV} rskkserv.1.ja_JP.eucJP rskkserv.1.ja_JP.eucJP.jis && \ + nkf -e rskkserv.1.ja_JP.eucJP.jis > rskkserv.1.ja_JP.eucJP ) + ${INSTALL_MAN} ${WRKSRC}/doc/rskkserv.1.ja_JP.eucJP ${PREFIX}/man/ja/man1/rskkserv.1 .endif .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/japanese/rskkserv/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo 22 Mar 2004 15:05:14 -0000 1.9 +++ distinfo 30 Oct 2004 11:41:33 -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.94.13.tar.gz) = 1a78835f66c85d27e88596d6ed03bd93 +SIZE (ruby/rskkserv-2.94.13.tar.gz) = 467983 Index: files/patch-configure.in =================================================================== RCS file: files/patch-configure.in diff -N files/patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure.in 30 Oct 2004 12:26:48 -0000 @@ -0,0 +1,9 @@ +--- configure.in.orig Sat Apr 12 21:35:52 2003 ++++ configure.in Sat Oct 30 21:26:41 2004 +@@ -89,4 +89,6 @@ + Makefile + rskkserv.spec + ext/extconf.rb ++doc/rskkserv.1 ++doc/rskkserv.1.ja_JP.eucJP + ]) >Release-Note: >Audit-Trail: >Unformatted: