ports/158477: Update port: japanese/today to 2.12
KATO Tsuguru
tkato432 at yahoo.com
Wed Aug 3 07:50:10 UTC 2011
The following reply was made to PR ports/158477; it has been noted by GNATS.
From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/158477: Update port: japanese/today to 2.12
Date: Wed, 3 Aug 2011 16:45:05 +0900
Remake of the patch against current tree.
diff -urN /usr/ports/japanese/today/Makefile japanese/today/Makefile
--- /usr/ports/japanese/today/Makefile 2011-06-16 20:14:47.000000000 +0900
+++ japanese/today/Makefile 2011-08-03 16:39:14.000000000 +0900
@@ -6,9 +6,9 @@
#
PORTNAME= today
-PORTVERSION= 2.11a
+PORTVERSION= 2.12
CATEGORIES= japanese games
-MASTER_SITES= ftp://ftp.vector.co.jp/pack/dos/personal/calendar/today/
+MASTER_SITES= http://ftp.vector.co.jp/pack/dos/personal/calendar/today/
DISTNAME= ja-${PORTNAME}-${PORTVERSION}
DISTFILES= td${PORTVERSION:S/.//}s.lzh \
td${PORTVERSION:S/.//}m.lzh
@@ -16,9 +16,6 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Tells you what day today is
-DEPRECATED= No more public distfiles
-EXPIRATION_DATE= 2011-08-01
-
EXTRACT_DEPENDS=lha:${PORTSDIR}/archivers/lha \
nkf:${PORTSDIR}/japanese/nkf
@@ -28,25 +25,29 @@
NO_WRKSUBDIR= yes
+MAKEFILE= ${FILESDIR}/Makefile
+
post-extract:
+ @(cd ${WRKSRC}; lha xiqf utility.lzh src/dayinfo.c )
@${ECHO_MSG} "===> Extracting tbl file for ${DISTNAME}"
@(cd ${WRKSRC}; lha xqf tbl.lzh )
@${ECHO_MSG} "===> Converting Kanji code for ${DISTNAME}"
@(cd ${WRKSRC}; \
for i in *.c *.h *.doc *.cnf birthday.tbl event*.tbl flower.tbl \
- gengo.tbl hist??.tbl history.tbl holiday.tbl magazine.tbl \
- monthly.tbl schedule.tbl suffix.tbl week.tbl; \
+ gengo.tbl hist??.tbl history.tbl holiday.tbl magazine.tbl \
+ monthly.tbl schedule.tbl suffix.tbl week.tbl; \
do \
${SED} 's/.$$//' $$i | nkf -Se > $$i.tmp ;\
${MV} -f $$i.tmp $$i ; \
done)
- @(cd ${WRKSRC}; lha xiqf utility.lzh src/dayinfo.c )
-
-pre-patch:
- @${ECHO_MSG} "===> Installing custom Makefile for ${DISTNAME}"
- @(${CP} ${FILESDIR}/Makefile ${WRKSRC})
post-patch:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.cnf
+ @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/*.cnf
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/today.doc ${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/japanese/today/distinfo japanese/today/distinfo
--- /usr/ports/japanese/today/distinfo 2011-03-19 09:27:12.000000000 +0900
+++ japanese/today/distinfo 2011-04-16 21:13:50.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (td211as.lzh) = e597849a8f1f5ceb88aefe41b869fa0fa97083d6075a8efbffda1a9bce5d0be6
-SIZE (td211as.lzh) = 180925
-SHA256 (td211am.lzh) = c55a73d76eac8b03e21bbb2fc94f0a5cebcfe2482feefe2372e119b4367b627e
-SIZE (td211am.lzh) = 380771
+SHA256 (td212s.lzh) = 3dc22910825e9be0cb71957265a0d8cc8369c392f9f7c12923f4a863b38c8ed0
+SIZE (td212s.lzh) = 208034
+SHA256 (td212m.lzh) = f10908f2a15c45f6549173224626f478893f420aa64c30e90ac1b5b419b01f06
+SIZE (td212m.lzh) = 463411
diff -urN /usr/ports/japanese/today/files/Makefile japanese/today/files/Makefile
--- /usr/ports/japanese/today/files/Makefile 2000-02-22 02:05:49.000000000 +0900
+++ japanese/today/files/Makefile 2011-06-28 23:56:11.000000000 +0900
@@ -4,7 +4,7 @@
# $FreeBSD: ports/japanese/today/files/Makefile,v 1.4 2000/02/21 17:05:49 taoka Exp $
CC ?= cc
-CFLAGS += -DTRANS -DMSG_STYLE -DINTERNAL_KYUREKI_TBL -D_T_SEARCH_CMDPATH=\"${PREFIX}/etc\" #-DUSE_TERMCAP
+CFLAGS += -DTRANS -DMSG_STYLE -DINTERNAL_KYUREKI_TBL -D_T_SEARCH_DEFPATHS=\"${PREFIX}/etc\" #-DUSE_TERMCAP
LDLIBS = -lm #-ltermcap
HFILES = cdefs.h chu68k.h cmsdos.h cunix.h cwin32.h extern.h
@@ -29,8 +29,8 @@
${BSD_INSTALL_DATA} today.cnf ${PREFIX}/etc
mkdir -p ${PREFIX}/share/today
${BSD_INSTALL_DATA} *.tbl ${PREFIX}/share/today
- mkdir -p ${PREFIX}/share/doc/ja/today
- ${BSD_INSTALL_DATA} today.doc ${PREFIX}/share/doc/ja/today
+# mkdir -p ${PREFIX}/share/doc/ja/today
+# ${BSD_INSTALL_DATA} today.doc ${PREFIX}/share/doc/ja/today
calendar: $(OBJS_CAL)
$(CC) $(OBJS_CAL) $(LDLIBS) -o $@
diff -urN /usr/ports/japanese/today/files/patch-ai japanese/today/files/patch-ai
--- /usr/ports/japanese/today/files/patch-ai 2000-02-22 02:05:56.000000000 +0900
+++ japanese/today/files/patch-ai 2011-04-16 21:25:18.000000000 +0900
@@ -1,6 +1,6 @@
---- today.cnf.orig Sun Mar 14 00:00:00 1999
-+++ today.cnf Sun Feb 13 15:59:51 2000
-@@ -182,10 +182,10 @@
+--- today.cnf.orig 2011-04-16 21:23:23.000000000 +0900
++++ today.cnf 2011-04-16 21:25:05.000000000 +0900
+@@ -200,10 +200,10 @@
#
pager = # $B30It%Z!<%8%c!<$N;XDj(B
# $B;XDj$7$J$1$l$P!"FbB"%Z!<%8%c!<;HMQ(B
@@ -12,13 +12,13 @@
+pause_last = no # $BFbB"%Z!<%8%c!<(B $BI=<(=*N;8e0l;~Dd;_@)8f(B
# yes $B0l;~Dd;_(B
# *no $BDd;_$7$J$$(B
- outputfile = %c%y%m%d.tdy # $B=PNO%U%!%$%kL>(B ($BC^L+YD(B:%c%y%m%d.tdy/%p.tdy)
-@@ -369,7 +369,7 @@
+ outputfile = %c%y%m%d.tdy # $B=PNO%U%!%$%kL>(B ($B%G%U%)%k%H(B:%c%y%m%d.tdy/%p.tdy)
+@@ -404,7 +404,7 @@
#
$common # $B0J9_(B $B6&DL4D6-Dj5AIt(B
--#table_path = c:/bin/tbl # $B3F%F!<%V%k$N8!:w%Q%9L>(B
-+table_path = %%PREFIX%%/share/today # $B3F%F!<%V%k$N8!:w%Q%9L>(B
+-table_path = %ExecCmdPath%/tbl # $B3F%F!<%V%k$N8!:w%Q%9L>(B
++table_path = %%DATADIR%% # $B3F%F!<%V%k$N8!:w%Q%9L>(B
# ';' $B$G6h at Z$jJ#?t;XDj2DG=(B
- # $BL$Dj5A$N>l9g!"4D6-JQ?t(B TODAYTBL $B$N>l=j(B
-
+ # $BL$Dj5A$N>l9g!"4D6-JQ?t(B TODAYTBL $B$N>l(B
+ #
diff -urN /usr/ports/japanese/today/files/patch-al japanese/today/files/patch-al
--- /usr/ports/japanese/today/files/patch-al 2000-02-22 02:05:57.000000000 +0900
+++ japanese/today/files/patch-al 2011-04-16 21:49:36.000000000 +0900
@@ -1,22 +1,21 @@
---- cunix.h.orig Tue Feb 15 03:17:23 2000
-+++ cunix.h Sun Feb 13 16:38:34 2000
-@@ -38,7 +38,9 @@
- #define _T_FPBUFSIZE (64 * 1024) /* fopen $B%P%C%U%!D9(B */
- #define _T_TMPENV "temp" /* temporary $B4D6-JQ?tL>(B */
- #define _T_TMPDIR "/tmp" /* temporary directory */
--#define _T_SEARCH_CMDPATH "/usr/local/lib:/usr/lib"
-+#ifndef _T_SEARCH_CMDPATH
-+#define _T_SEARCH_CMDPATH "/usr/local/etc"
+--- cunix.h.orig 2011-04-16 21:25:44.000000000 +0900
++++ cunix.h 2011-04-16 21:27:40.000000000 +0900
+@@ -40,7 +40,9 @@
+ #define _T_TMPENV "TEMP" /* temporary $B4D6-JQ?tL>(B */
+ #define _T_TMPENV2 "TMPDIR" /* temporary $B4D6-JQ?tL>(B */
+ #define _T_TMPDIR "/tmp" /* temporary directory */
++#if 0
+ #define _T_SEARCH_DEFPATHS "/usr/local/lib/today:/opt/local/lib/today:/usr/local/share/today:/opt/local/share/today:/usr/lib/today:/opt/lib/today:/usr/share/today:/opt/share/today:/usr/local/lib:/opt/local/lib:/usr/lib:/opt/lib"
+#endif
- #define _T_HOMEENV "HOME" /* home $B4D6-JQ?t(B */
- #define _T_PATHSEPARATOR ":" /* path list separator char */
- #define _T_PATHSEP_CHR ':' /* path list separator char */
-@@ -53,7 +55,7 @@
+ /* default search path list */
+ #define _T_HOMEENV "HOME" /* home $B4D6-JQ?t(B */
+ #define _T_PATHENV "PATH" /* path $B4D6-JQ?tL>(B */
+@@ -60,7 +62,7 @@
#define _T_OUTFILE_DEFAULT "%c%y%m%d.today"
#define _T_OUTFILE_TMPNAME "%p.today"
-#if defined(linux)
+#if defined(linux) || defined(__FreeBSD__)
- #define _T_ACCESS_ROK R_OK
- #define strnicmp strncasecmp
- #else
+ #define _T_ACCESS_ROK R_OK
+ #define _T_HAVE_STRTOK_R
+ #define stricmp(a,b) strcasecmp(a,b)
diff -urN /usr/ports/japanese/today/pkg-descr japanese/today/pkg-descr
--- /usr/ports/japanese/today/pkg-descr 1996-10-19 00:04:50.000000000 +0900
+++ japanese/today/pkg-descr 2011-04-16 21:31:01.000000000 +0900
@@ -7,3 +7,5 @@
Of course, it may not know about all the important dates. Also, it
will also display your birthday, assuming you registered it. This
version also has a simple scheduler.
+
+WWW: http://www.vector.co.jp/soft/dos/personal/se002657.html
diff -urN /usr/ports/japanese/today/pkg-plist japanese/today/pkg-plist
--- /usr/ports/japanese/today/pkg-plist 2000-02-22 02:05:58.000000000 +0900
+++ japanese/today/pkg-plist 2011-04-16 21:18:39.000000000 +0900
@@ -2,42 +2,42 @@
bin/calendar-today
bin/dayinfo
etc/today.cnf
-share/doc/ja/today/today.doc
-share/today/birthday.tbl
-share/today/event01.tbl
-share/today/event02.tbl
-share/today/event03.tbl
-share/today/event04.tbl
-share/today/event05.tbl
-share/today/event06.tbl
-share/today/event07.tbl
-share/today/event08.tbl
-share/today/event09.tbl
-share/today/event10.tbl
-share/today/event11.tbl
-share/today/event12.tbl
-share/today/flower.tbl
-share/today/gengo.tbl
-share/today/hist01.tbl
-share/today/hist02.tbl
-share/today/hist03.tbl
-share/today/hist04.tbl
-share/today/hist05.tbl
-share/today/hist06.tbl
-share/today/hist07.tbl
-share/today/hist08.tbl
-share/today/hist09.tbl
-share/today/hist10.tbl
-share/today/hist11.tbl
-share/today/hist12.tbl
-share/today/history.tbl
-share/today/holiday.tbl
-share/today/kyureki.tbl
-share/today/magazine.tbl
-share/today/monthly.tbl
-share/today/schedule.tbl
-share/today/sekki.tbl
-share/today/suffix.tbl
-share/today/week.tbl
- at dirrm share/today
- at dirrm share/doc/ja/today
+%%PORTDOCS%%%%DOCSDIR%%/today.doc
+%%DATADIR%%/birthday.tbl
+%%DATADIR%%/event01.tbl
+%%DATADIR%%/event02.tbl
+%%DATADIR%%/event03.tbl
+%%DATADIR%%/event04.tbl
+%%DATADIR%%/event05.tbl
+%%DATADIR%%/event06.tbl
+%%DATADIR%%/event07.tbl
+%%DATADIR%%/event08.tbl
+%%DATADIR%%/event09.tbl
+%%DATADIR%%/event10.tbl
+%%DATADIR%%/event11.tbl
+%%DATADIR%%/event12.tbl
+%%DATADIR%%/flower.tbl
+%%DATADIR%%/gengo.tbl
+%%DATADIR%%/hist01.tbl
+%%DATADIR%%/hist02.tbl
+%%DATADIR%%/hist03.tbl
+%%DATADIR%%/hist04.tbl
+%%DATADIR%%/hist05.tbl
+%%DATADIR%%/hist06.tbl
+%%DATADIR%%/hist07.tbl
+%%DATADIR%%/hist08.tbl
+%%DATADIR%%/hist09.tbl
+%%DATADIR%%/hist10.tbl
+%%DATADIR%%/hist11.tbl
+%%DATADIR%%/hist12.tbl
+%%DATADIR%%/history.tbl
+%%DATADIR%%/holiday.tbl
+%%DATADIR%%/kyureki.tbl
+%%DATADIR%%/magazine.tbl
+%%DATADIR%%/monthly.tbl
+%%DATADIR%%/schedule.tbl
+%%DATADIR%%/sekki.tbl
+%%DATADIR%%/suffix.tbl
+%%DATADIR%%/week.tbl
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the freebsd-ports-bugs
mailing list