Bug 45870 - Update port: japanese/cal.rb to 0.2.2002.11.28
Summary: Update port: japanese/cal.rb to 0.2.2002.11.28
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Edwin Groothuis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-11-30 12:40 UTC by Kimura Fuyuki
Modified: 2002-12-16 13:29 UTC (History)
0 users

See Also:


Attachments
file.diff (2.16 KB, patch)
2002-11-30 12:40 UTC, Kimura Fuyuki
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kimura Fuyuki 2002-11-30 12:40:01 UTC
Update to the recent version.

Fix: cvs server: Diffing .
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2002-12-14 05:04:45 UTC
State Changed
From-To: open->feedback

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! 



Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2002-12-14 05:04:45 UTC
Responsible Changed
From-To: freebsd-ports->edwin

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!
Comment 3 Akinori MUSHA 2002-12-16 13:02:50 UTC
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%%
Comment 4 Edwin Groothuis freebsd_committer freebsd_triage 2002-12-16 13:28:47 UTC
State Changed
From-To: feedback->closed

Commited, thanks!