From fuyuki@hadaly.dyndns.org  Sat Nov 30 04:37:00 2002
Return-Path: <fuyuki@hadaly.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4CB1637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Nov 2002 04:37:00 -0800 (PST)
Received: from t-mta1.odn.ne.jp (mfep1.odn.ne.jp [143.90.131.179])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9409E43EBE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Nov 2002 04:36:58 -0800 (PST)
	(envelope-from fuyuki@hadaly.dyndns.org)
Received: from hadaly.dyndns.org ([218.218.124.119]) by t-mta1.odn.ne.jp
          with ESMTP
          id <20021130123656668.RMVZ.6832.t-mta1.odn.ne.jp@mta1.odn.ne.jp>;
          Sat, 30 Nov 2002 21:36:56 +0900
Received: by hadaly.dyndns.org (Postfix, from userid 1001)
	id 755C6567C; Sat, 30 Nov 2002 21:36:54 +0900 (JST)
Message-Id: <20021130123654.755C6567C@hadaly.dyndns.org>
Date: Sat, 30 Nov 2002 21:36:54 +0900 (JST)
From: Kimura Fuyuki <fuyuki@hadaly.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: japanese/cal.rb to 0.2.2002.11.28
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45870
>Category:       ports
>Synopsis:       Update port: japanese/cal.rb to 0.2.2002.11.28
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 30 04:40:01 PST 2002
>Closed-Date:    Mon Dec 16 05:29:07 PST 2002
>Last-Modified:  Mon Dec 16 05:29:07 PST 2002
>Originator:     Kimura Fuyuki
>Release:        FreeBSD 4.7-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hadaly.dyndns.org 4.7-RELEASE-p1 FreeBSD 4.7-RELEASE-p1 #2: Thu Oct 24 12:00:51 JST 2002 root@hadaly.dyndns.org:/sack/tmp/obj/pub/src/sys/NS i386


	
>Description:
Update to the recent version.
	
>How-To-Repeat:
	
>Fix:
cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/cal.rb/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	4 Nov 2002 01:35:00 -0000	1.1
+++ Makefile	30 Nov 2002 12:31:44 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cal.rb
-PORTVERSION=	0.2
+PORTVERSION=	0.2.2002.11.28
 CATEGORIES=	japanese deskutils
 MASTER_SITES=	http://aglaia.c.u-tokyo.ac.jp/~yamamoto/Script/Calendar/
 DISTFILES=	cal.rb Calendar.rb era_name
@@ -18,8 +18,6 @@
 RUBY_SHEBANG_FILES=	${WRKSRC}/cal.rb
 NO_BUILD=	yes
 
-LIBDIR=		${PREFIX}/libdata/cal
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for i in ${DISTFILES}
@@ -27,13 +25,13 @@
 .endfor
 
 post-patch:
-	${RUBY} -i -pe 'sub "chdir(.*)", %q{chdir("${LIBDIR}")}' ${WRKSRC}/cal.rb
+	${RUBY} -i -pe 'sub "./era_name", "${DATADIR}/era_name"' \
+		${WRKSRC}/Calendar.rb
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cal.rb ${PREFIX}/bin
-	${MKDIR} ${LIBDIR}
-.for i in Calendar.rb era_name
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LIBDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/Calendar.rb ${RUBY_SITELIBDIR}
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/era_name ${DATADIR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/japanese/cal.rb/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	4 Nov 2002 01:35:00 -0000	1.1
+++ distinfo	30 Nov 2002 12:31:44 -0000
@@ -1,3 +1,3 @@
-MD5 (cal.rb/cal.rb) = 89a4eabee1e00de929cd944698a9ea7e
-MD5 (cal.rb/Calendar.rb) = b51bb285fde892ccbdedb0ad8d7d53f9
+MD5 (cal.rb/cal.rb) = 87bab2184bb7373fc6dac2432ac9af9a
+MD5 (cal.rb/Calendar.rb) = 76fd7a954e26d4ae43f87f721241dd4a
 MD5 (cal.rb/era_name) = 2c3c6a4de0d7d8a2101fbe7165509982
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/cal.rb/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	4 Nov 2002 01:35:00 -0000	1.1
+++ pkg-plist	30 Nov 2002 12:31:44 -0000
@@ -1,4 +1,4 @@
 bin/cal.rb
-libdata/cal/Calendar.rb
-libdata/cal/era_name
-@dirrm libdata/cal
+%%RUBY_SITELIBDIR%%/Calendar.rb
+%%DATADIR%%/era_name
+@dirrm %%DATADIR%%

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Dec 13 21:04:45 PST 2002 
State-Changed-Why:  
cal.rb seems to be modified again on 2002.12.02. 
Can you please confirm this port is working wihtout changes to your 
PR and I'll commit it to get it working again! 



Responsible-Changed-From-To: freebsd-ports->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Dec 13 21:04:45 PST 2002 
Responsible-Changed-Why:  
cal.rb seems to be modified again on 2002.12.02. 
Can you please confirm this port is working wihtout changes to your 
PR and I'll commit it to get it working again! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=45870 

From: "Akinori MUSHA" <knu@iDaemons.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/45870: Update port: japanese/cal.rb to 0.2.2002.11.28
Date: Mon, 16 Dec 2002 22:02:50 +0900

 It seems the update on 2002-12-02 was to change the method to locate
 the library and bump the version number.
 
 Here's the complete patch.
 
 -- 
                      /
                     /__  __            Akinori.org / MUSHA.org
                    / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
 Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp
 
 "I believe in what I see, I believe in what I hear,
    I believe that what I'm feeling changes how the world appears."
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/japanese/cal.rb/Makefile,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile
 --- Makefile	4 Nov 2002 01:35:00 -0000	1.1
 +++ Makefile	16 Dec 2002 12:58:13 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	cal.rb
 -PORTVERSION=	0.2
 +PORTVERSION=	0.21
  CATEGORIES=	japanese deskutils
  MASTER_SITES=	http://aglaia.c.u-tokyo.ac.jp/~yamamoto/Script/Calendar/
  DISTFILES=	cal.rb Calendar.rb era_name
 @@ -18,8 +18,6 @@
  RUBY_SHEBANG_FILES=	${WRKSRC}/cal.rb
  NO_BUILD=	yes
  
 -LIBDIR=		${PREFIX}/libdata/cal
 -
  do-extract:
  	${MKDIR} ${WRKSRC}
  .for i in ${DISTFILES}
 @@ -27,13 +25,15 @@
  .endfor
  
  post-patch:
 -	${RUBY} -i -pe 'sub "chdir(.*)", %q{chdir("${LIBDIR}")}' ${WRKSRC}/cal.rb
 +	${RUBY} -i -pe 'sub "./era_name", "${DATADIR}/era_name"' \
 +		${WRKSRC}/Calendar.rb
 +	${RUBY} -i -pe '/Dir::chdir/ and print "#"' \
 +		${WRKSRC}/cal.rb
  
  do-install:
  	${INSTALL_SCRIPT} ${WRKSRC}/cal.rb ${PREFIX}/bin
 -	${MKDIR} ${LIBDIR}
 -.for i in Calendar.rb era_name
 -	${INSTALL_DATA} ${WRKSRC}/${i} ${LIBDIR}
 -.endfor
 +	${INSTALL_DATA} ${WRKSRC}/Calendar.rb ${RUBY_SITELIBDIR}
 +	${MKDIR} ${DATADIR}
 +	${INSTALL_DATA} ${WRKSRC}/era_name ${DATADIR}
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/japanese/cal.rb/distinfo,v
 retrieving revision 1.1
 diff -u -r1.1 distinfo
 --- distinfo	4 Nov 2002 01:35:00 -0000	1.1
 +++ distinfo	16 Dec 2002 12:52:55 -0000
 @@ -1,3 +1,3 @@
 -MD5 (cal.rb/cal.rb) = 89a4eabee1e00de929cd944698a9ea7e
 -MD5 (cal.rb/Calendar.rb) = b51bb285fde892ccbdedb0ad8d7d53f9
 +MD5 (cal.rb/cal.rb) = d4ef14a378adcf91628ac156cba2396e
 +MD5 (cal.rb/Calendar.rb) = 76fd7a954e26d4ae43f87f721241dd4a
  MD5 (cal.rb/era_name) = 2c3c6a4de0d7d8a2101fbe7165509982
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/japanese/cal.rb/pkg-plist,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-plist
 --- pkg-plist	4 Nov 2002 01:35:00 -0000	1.1
 +++ pkg-plist	16 Dec 2002 12:52:45 -0000
 @@ -1,4 +1,4 @@
  bin/cal.rb
 -libdata/cal/Calendar.rb
 -libdata/cal/era_name
 -@dirrm libdata/cal
 +%%RUBY_SITELIBDIR%%/Calendar.rb
 +%%DATADIR%%/era_name
 +@dirrm %%DATADIR%%
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Mon Dec 16 05:28:47 PST 2002 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45870 
>Unformatted:
