Attachment #116524 for bug #158477

View | Details | Raw Unified | Return to bug 158477
Collapse All | Expand All

Lines 6-14 Link Here

(-)japanese/today/Makefile (-13 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= today	8	PORTNAME= today
9	PORTVERSION= 2.11a	9	PORTVERSION= 2.12
10	CATEGORIES= japanese games	10	CATEGORIES= japanese games
11	MASTER_SITES= ftp://ftp.vector.co.jp/pack/dos/personal/calendar/today/	11	MASTER_SITES= http://ftp.vector.co.jp/pack/dos/personal/calendar/today/
12	DISTNAME= ja-${PORTNAME}-${PORTVERSION}	12	DISTNAME= ja-${PORTNAME}-${PORTVERSION}
13	DISTFILES= td${PORTVERSION:S/.//}s.lzh \	13	DISTFILES= td${PORTVERSION:S/.//}s.lzh \
14	td${PORTVERSION:S/.//}m.lzh	14	td${PORTVERSION:S/.//}m.lzh
Lines 16-24 Link Here
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
17	COMMENT= Tells you what day today is	17	COMMENT= Tells you what day today is
18		18
19	DEPRECATED= No more public distfiles
20	EXPIRATION_DATE= 2011-08-01
21
22	EXTRACT_DEPENDS=lha:${PORTSDIR}/archivers/lha \	19	EXTRACT_DEPENDS=lha:${PORTSDIR}/archivers/lha \
23	nkf:${PORTSDIR}/japanese/nkf	20	nkf:${PORTSDIR}/japanese/nkf
24		21
Lines 28-52 Link Here
28		25
29	NO_WRKSUBDIR= yes	26	NO_WRKSUBDIR= yes
30		27
		28	MAKEFILE= ${FILESDIR}/Makefile
		29
31	post-extract:	30	post-extract:
		31	@(cd ${WRKSRC}; lha xiqf utility.lzh src/dayinfo.c )
32	@${ECHO_MSG} "===> Extracting tbl file for ${DISTNAME}"	32	@${ECHO_MSG} "===> Extracting tbl file for ${DISTNAME}"
33	@(cd ${WRKSRC}; lha xqf tbl.lzh )	33	@(cd ${WRKSRC}; lha xqf tbl.lzh )
34	@${ECHO_MSG} "===> Converting Kanji code for ${DISTNAME}"	34	@${ECHO_MSG} "===> Converting Kanji code for ${DISTNAME}"
35	@(cd ${WRKSRC}; \	35	@(cd ${WRKSRC}; \
36	for i in .c .h .doc .cnf birthday.tbl event*.tbl flower.tbl \	36	for i in .c .h .doc .cnf birthday.tbl event*.tbl flower.tbl \
37	gengo.tbl hist??.tbl history.tbl holiday.tbl magazine.tbl \	37	gengo.tbl hist??.tbl history.tbl holiday.tbl magazine.tbl \
38	monthly.tbl schedule.tbl suffix.tbl week.tbl; \	38	monthly.tbl schedule.tbl suffix.tbl week.tbl; \
39	do \	39	do \
40	${SED} 's/.$$//' $$i \| nkf -Se > $$i.tmp ;\	40	${SED} 's/.$$//' $$i \| nkf -Se > $$i.tmp ;\
41	${MV} -f $$i.tmp $$i ; \	41	${MV} -f $$i.tmp $$i ; \
42	done)	42	done)
43	@(cd ${WRKSRC}; lha xiqf utility.lzh src/dayinfo.c )
44
45	pre-patch:
46	@${ECHO_MSG} "===> Installing custom Makefile for ${DISTNAME}"
47	@(${CP} ${FILESDIR}/Makefile ${WRKSRC})
48		43
49	post-patch:	44	post-patch:
50	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/*.cnf	45	@${REINPLACE_CMD} -e 's\|%%DATADIR%%\|${DATADIR}\|g' ${WRKSRC}/*.cnf
		46
		47	post-install:
		48	.if !defined(NOPORTDOCS)
		49	@${MKDIR} ${DOCSDIR}
		50	${INSTALL_DATA} ${WRKSRC}/today.doc ${DOCSDIR}
		51	.endif
51		52
52	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)japanese/today/distinfo (-4 / +4 lines)
1	SHA256 (td211as.lzh) = e597849a8f1f5ceb88aefe41b869fa0fa97083d6075a8efbffda1a9bce5d0be6	1	SHA256 (td212s.lzh) = 3dc22910825e9be0cb71957265a0d8cc8369c392f9f7c12923f4a863b38c8ed0
2	SIZE (td211as.lzh) = 180925	2	SIZE (td212s.lzh) = 208034
3	SHA256 (td211am.lzh) = c55a73d76eac8b03e21bbb2fc94f0a5cebcfe2482feefe2372e119b4367b627e	3	SHA256 (td212m.lzh) = f10908f2a15c45f6549173224626f478893f420aa64c30e90ac1b5b419b01f06
4	SIZE (td211am.lzh) = 380771	4	SIZE (td212m.lzh) = 463411

Lines 4-10 Link Here

(-)japanese/today/files/Makefile (-3 / +3 lines)
4	# $FreeBSD: ports/japanese/today/files/Makefile,v 1.4 2000/02/21 17:05:49 taoka Exp $	4	# $FreeBSD: ports/japanese/today/files/Makefile,v 1.4 2000/02/21 17:05:49 taoka Exp $
5		5
6	CC ?= cc	6	CC ?= cc
7	CFLAGS += -DTRANS -DMSG_STYLE -DINTERNAL_KYUREKI_TBL -D_T_SEARCH_CMDPATH=\"${PREFIX}/etc\" #-DUSE_TERMCAP	7	CFLAGS += -DTRANS -DMSG_STYLE -DINTERNAL_KYUREKI_TBL -D_T_SEARCH_DEFPATHS=\"${PREFIX}/etc\" #-DUSE_TERMCAP
8	LDLIBS = -lm #-ltermcap	8	LDLIBS = -lm #-ltermcap
9		9
10	HFILES = cdefs.h chu68k.h cmsdos.h cunix.h cwin32.h extern.h	10	HFILES = cdefs.h chu68k.h cmsdos.h cunix.h cwin32.h extern.h
Lines 29-36 Link Here
29	${BSD_INSTALL_DATA} today.cnf ${PREFIX}/etc	29	${BSD_INSTALL_DATA} today.cnf ${PREFIX}/etc
30	mkdir -p ${PREFIX}/share/today	30	mkdir -p ${PREFIX}/share/today
31	${BSD_INSTALL_DATA} *.tbl ${PREFIX}/share/today	31	${BSD_INSTALL_DATA} *.tbl ${PREFIX}/share/today
32	mkdir -p ${PREFIX}/share/doc/ja/today	32	# mkdir -p ${PREFIX}/share/doc/ja/today
33	${BSD_INSTALL_DATA} today.doc ${PREFIX}/share/doc/ja/today	33	# ${BSD_INSTALL_DATA} today.doc ${PREFIX}/share/doc/ja/today
34		34
35	calendar: $(OBJS_CAL)	35	calendar: $(OBJS_CAL)
36	$(CC) $(OBJS_CAL) $(LDLIBS) -o $@	36	$(CC) $(OBJS_CAL) $(LDLIBS) -o $@




--- 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 =				# ____________________
 				# __________________________________

+pause_last = no		# ______________ ______________________
 				#   yes ________
 				#  *no  __________
 outputfile = %c%y%m%d.tdy	# ______________ (__________:%c%y%m%d.tdy/%p.tdy)
@@ -404,7 +404,7 @@
 #
 $common				# ____ ______________
 
-table_path = %ExecCmdPath%/tbl	# ______________________
+table_path = %%DATADIR%%	# ______________________
 				# ';' ____________________
 				# ______________________ TODAYTBL ____
 #




--- 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 __________ */
 #define _T_TMPENV2			"TMPDIR"		/* temporary __________ */
 #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"
+#define _T_SEARCH_CMDPATH	"/usr/local/etc"
+#endif
 											/* default search path list */
 #define _T_HOMEENV			"HOME"			/* home ________ */
 #define _T_PATHENV			"PATH"			/* path __________ */
@@ -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 _T_HAVE_STRTOK_R
 #define stricmp(a,b)		strcasecmp(a,b)

Lines 7-9 Link Here

(-)japanese/today/pkg-descr (+2 lines)
7	Of course, it may not know about all the important dates. Also, it	7	Of course, it may not know about all the important dates. Also, it
8	will also display your birthday, assuming you registered it. This	8	will also display your birthday, assuming you registered it. This
9	version also has a simple scheduler.	9	version also has a simple scheduler.
		10
		11	WWW: http://www.vector.co.jp/soft/dos/personal/se002657.html




bin/calendar-today
bin/dayinfo
etc/today.cnf
%%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
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 158477

Lines 1-6 Link Here

(-)japanese/today/files/patch-ai (-9 / +9 lines)
1	--- today.cnf.orig Sun Mar 14 00:00:00 1999	1	--- today.cnf.orig 2011-04-16 21:23:23.000000000 +0900
2	+++ today.cnf Sun Feb 13 15:59:51 2000	2	+++ today.cnf 2011-04-16 21:25:05.000000000 +0900
3	@@ -182,10 +182,10 @@	3	@@ -200,10 +200,10 @@
4	#	4	#
5	pager = # ____________________	5	pager = # ____________________
6	# __________________________________	6	# __________________________________
Lines 12-24 Link Here
12	+pause_last = no # ______________ ______________________	12	+pause_last = no # ______________ ______________________
13	# yes ________	13	# yes ________
14	# *no __________	14	# *no __________
15	outputfile = %c%y%m%d.tdy # ______________ (______:%c%y%m%d.tdy/%p.tdy)	15	outputfile = %c%y%m%d.tdy # ______________ (__________:%c%y%m%d.tdy/%p.tdy)
16	@@ -369,7 +369,7 @@	16	@@ -404,7 +404,7 @@
17	#	17	#
18	$common # ____ ______________	18	$common # ____ ______________
19		19
20	-#table_path = c:/bin/tbl # ______________________	20	-table_path = %ExecCmdPath%/tbl # ______________________
21	+table_path = %%PREFIX%%/share/today # ______________________	21	+table_path = %%DATADIR%% # ______________________
22	# ';' ____________________	22	# ';' ____________________
23	# ______________________ TODAYTBL ______	23	# ______________________ TODAYTBL ____
24		24	#

Lines 1-22 Link Here

(-)japanese/today/files/patch-al (-16 / +15 lines)
1	--- cunix.h.orig Tue Feb 15 03:17:23 2000	1	--- cunix.h.orig 2011-04-16 21:25:44.000000000 +0900
2	+++ cunix.h Sun Feb 13 16:38:34 2000	2	+++ cunix.h 2011-04-16 21:27:40.000000000 +0900
3	@@ -38,7 +38,9 @@	3	@@ -40,7 +40,9 @@
4	#define _T_FPBUFSIZE (64 * 1024) /* fopen __________ */	4	#define _T_TMPENV "TEMP" /* temporary __________ */
5	#define _T_TMPENV "temp" /* temporary __________ */	5	#define _T_TMPENV2 "TMPDIR" /* temporary __________ */
6	#define _T_TMPDIR "/tmp" /* temporary directory */	6	#define _T_TMPDIR "/tmp" /* temporary directory */
7	-#define _T_SEARCH_CMDPATH "/usr/local/lib:/usr/lib"	7	+#if 0
8	+#ifndef _T_SEARCH_CMDPATH	8	#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"
9	+#define _T_SEARCH_CMDPATH "/usr/local/etc"
10	+#endif	9	+#endif
11	#define _T_HOMEENV "HOME" /* home ________ */	10	/* default search path list */
12	#define _T_PATHSEPARATOR ":" /* path list separator char */	11	#define _T_HOMEENV "HOME" /* home ________ */
13	#define _T_PATHSEP_CHR ':' /* path list separator char */	12	#define _T_PATHENV "PATH" /* path __________ */
14	@@ -53,7 +55,7 @@	13	@@ -60,7 +62,7 @@
15	#define _T_OUTFILE_DEFAULT "%c%y%m%d.today"	14	#define _T_OUTFILE_DEFAULT "%c%y%m%d.today"
16	#define _T_OUTFILE_TMPNAME "%p.today"	15	#define _T_OUTFILE_TMPNAME "%p.today"
17		16
18	-#if defined(linux)	17	-#if defined(linux)
19	+#if defined(linux) \|\| defined(__FreeBSD__)	18	+#if defined(linux) \|\| defined(__FreeBSD__)
20	#define _T_ACCESS_ROK R_OK	19	#define _T_ACCESS_ROK R_OK
21	#define strnicmp strncasecmp	20	#define _T_HAVE_STRTOK_R
22	#else	21	#define stricmp(a,b) strcasecmp(a,b)

Lines 2-43 Link Here

(-)japanese/today/pkg-plist (-39 / +39 lines)
2	bin/calendar-today	2	bin/calendar-today
3	bin/dayinfo	3	bin/dayinfo
4	etc/today.cnf	4	etc/today.cnf
5	share/doc/ja/today/today.doc	5	%%PORTDOCS%%%%DOCSDIR%%/today.doc
6	share/today/birthday.tbl	6	%%DATADIR%%/birthday.tbl
7	share/today/event01.tbl	7	%%DATADIR%%/event01.tbl
8	share/today/event02.tbl	8	%%DATADIR%%/event02.tbl
9	share/today/event03.tbl	9	%%DATADIR%%/event03.tbl
10	share/today/event04.tbl	10	%%DATADIR%%/event04.tbl
11	share/today/event05.tbl	11	%%DATADIR%%/event05.tbl
12	share/today/event06.tbl	12	%%DATADIR%%/event06.tbl
13	share/today/event07.tbl	13	%%DATADIR%%/event07.tbl
14	share/today/event08.tbl	14	%%DATADIR%%/event08.tbl
15	share/today/event09.tbl	15	%%DATADIR%%/event09.tbl
16	share/today/event10.tbl	16	%%DATADIR%%/event10.tbl
17	share/today/event11.tbl	17	%%DATADIR%%/event11.tbl
18	share/today/event12.tbl	18	%%DATADIR%%/event12.tbl
19	share/today/flower.tbl	19	%%DATADIR%%/flower.tbl
20	share/today/gengo.tbl	20	%%DATADIR%%/gengo.tbl
21	share/today/hist01.tbl	21	%%DATADIR%%/hist01.tbl
22	share/today/hist02.tbl	22	%%DATADIR%%/hist02.tbl
23	share/today/hist03.tbl	23	%%DATADIR%%/hist03.tbl
24	share/today/hist04.tbl	24	%%DATADIR%%/hist04.tbl
25	share/today/hist05.tbl	25	%%DATADIR%%/hist05.tbl
26	share/today/hist06.tbl	26	%%DATADIR%%/hist06.tbl
27	share/today/hist07.tbl	27	%%DATADIR%%/hist07.tbl
28	share/today/hist08.tbl	28	%%DATADIR%%/hist08.tbl
29	share/today/hist09.tbl	29	%%DATADIR%%/hist09.tbl
30	share/today/hist10.tbl	30	%%DATADIR%%/hist10.tbl
31	share/today/hist11.tbl	31	%%DATADIR%%/hist11.tbl
32	share/today/hist12.tbl	32	%%DATADIR%%/hist12.tbl
33	share/today/history.tbl	33	%%DATADIR%%/history.tbl
34	share/today/holiday.tbl	34	%%DATADIR%%/holiday.tbl
35	share/today/kyureki.tbl	35	%%DATADIR%%/kyureki.tbl
36	share/today/magazine.tbl	36	%%DATADIR%%/magazine.tbl
37	share/today/monthly.tbl	37	%%DATADIR%%/monthly.tbl
38	share/today/schedule.tbl	38	%%DATADIR%%/schedule.tbl
39	share/today/sekki.tbl	39	%%DATADIR%%/sekki.tbl
40	share/today/suffix.tbl	40	%%DATADIR%%/suffix.tbl
41	share/today/week.tbl	41	%%DATADIR%%/week.tbl
42	@dirrm share/today	42	@dirrm %%DATADIR%%
43	@dirrm share/doc/ja/today	43	%%PORTDOCS%%@dirrm %%DOCSDIR%%