diff options
author | max <max@FreeBSD.org> | 1997-09-19 19:57:56 +0800 |
---|---|---|
committer | max <max@FreeBSD.org> | 1997-09-19 19:57:56 +0800 |
commit | 2e92ef44cb3784cf0a6e96175894e1ef75525dab (patch) | |
tree | 1de418d86dab2197790cd50d2382e1a89c711f07 /japanese | |
parent | 5b66fe06095176b1c826315990191121fdaa93e0 (diff) | |
download | freebsd-ports-gnome-2e92ef44cb3784cf0a6e96175894e1ef75525dab.tar.gz freebsd-ports-gnome-2e92ef44cb3784cf0a6e96175894e1ef75525dab.tar.zst freebsd-ports-gnome-2e92ef44cb3784cf0a6e96175894e1ef75525dab.zip |
Reorganize the patches to:
- Inhibit multiple patch files to change one file.
- Remove PATCH_STRIP definition from the Makefile.
- One patch file for each file to be modified.
Diffstat (limited to 'japanese')
-rw-r--r-- | japanese/today/Makefile | 4 | ||||
-rw-r--r-- | japanese/today/files/patch-aa | 490 | ||||
-rw-r--r-- | japanese/today/files/patch-ae | 39 | ||||
-rw-r--r-- | japanese/today/files/patch-ag | 45 | ||||
-rw-r--r-- | japanese/today/files/patch-ai | 24 | ||||
-rw-r--r-- | japanese/today/files/patch-aj | 22 |
6 files changed, 170 insertions, 454 deletions
diff --git a/japanese/today/Makefile b/japanese/today/Makefile index 4edbab1f44f3..8fd3f34bd3b5 100644 --- a/japanese/today/Makefile +++ b/japanese/today/Makefile @@ -3,7 +3,7 @@ # Date created: 24 June 1996 # Whom: ABURAYER Rewsirow <pcs51674@asciinet.or.jp> # -# $Id: Makefile,v 1.4 1997/09/14 17:47:20 max Exp $ +# $Id: Makefile,v 1.5 1997/09/14 21:36:10 max Exp $ # DISTNAME= td210bs @@ -21,7 +21,6 @@ BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha \ EXTRACT_CMD= lha EXTRACT_BEFORE_ARGS= xfqw=${WRKDIR} NO_WRKSUBDIR= yes -PATCH_STRIP= -p1 post-extract: @${ECHO_MSG} "===> Extracting tbl file for ${DISTNAME}" @@ -36,7 +35,6 @@ post-extract: gengo.tbl hist??.tbl history.tbl holiday.tbl magazin.tbl \ monthly.tbl week.tbl; \ do \ - echo $$i ; \ ${SED} 's/.$$//' $$i | nkf -e > $$i.tmp ;\ ${MV} -f $$i.tmp $$i ; \ done) diff --git a/japanese/today/files/patch-aa b/japanese/today/files/patch-aa index b410ea9289e7..fa0d343bc261 100644 --- a/japanese/today/files/patch-aa +++ b/japanese/today/files/patch-aa @@ -1,451 +1,39 @@ -# -# FreeBSD のためのパッチ -# -# -diff -c old/calendar.c new/calendar.c -*** old/calendar.c Sun Jun 23 06:16:58 1996 ---- new/calendar.c Sun Jun 23 07:39:54 1996 -*************** -*** 37,43 **** - #include "common.h" - #include "config.h" - #include "getfile.h" -! #include "getopt.h" - #include "getsb.h" - #include "kyureki.h" - #include "main.h" ---- 37,50 ---- - #include "common.h" - #include "config.h" - #include "getfile.h" -! #ifdef __FreeBSD__ -! /* FreeBSD version 2.x and earlier has them defined in stdlib.h */ -! #if __FreeBSD__ >= 3 -! #include <unistd.h> -! #endif -! #else -! #include "getopt.h" -! #endif - #include "getsb.h" - #include "kyureki.h" - #include "main.h" -*************** -*** 960,966 **** ---- 962,972 ---- - /* - * エラーによるプログラム中断処理 - */ -+ #ifndef __FreeBSD__ - void terminate_program(int sig, int subcode) -+ #else -+ void terminate_program(int sig) -+ #endif - { - switch (sig) { - case TERM_MEMERROR: -diff -c old/common.h new/common.h -*** old/common.h Sun Jun 23 06:17:24 1996 ---- new/common.h Sun Jun 23 06:07:18 1996 -*************** -*** 32,38 **** - #define MAXWIDTH 96 /* main.c */ - #define MAXFNAMEBUF 23 /* misc.c 最大ファイル名 + '\0' */ - #define MAXPATHNAME 100 /* main.c, pager.c */ -! #define BIG_ENDIAN /* kyureki.c */ - #define BITFIELD_USE_UNSIGNED_INT /* kyureki.c */ - #define OPEN_OPT (O_RDONLY | O_BINARY) /* kyureki.c */ - #define UNDERLINE ((int)'_') /* misc.c */ ---- 32,38 ---- - #define MAXWIDTH 96 /* main.c */ - #define MAXFNAMEBUF 23 /* misc.c 最大ファイル名 + '\0' */ - #define MAXPATHNAME 100 /* main.c, pager.c */ -! #define _BIG_ENDIAN /* kyureki.c */ - #define BITFIELD_USE_UNSIGNED_INT /* kyureki.c */ - #define OPEN_OPT (O_RDONLY | O_BINARY) /* kyureki.c */ - #define UNDERLINE ((int)'_') /* misc.c */ -*************** -*** 69,75 **** - #define MAXWIDTH 80 /* main.c */ - #define MAXFNAMEBUF 13 /* misc.c 最大ファイル名 + '\0' */ - #define MAXPATHNAME 90 /* main.c, pager.c */ -! #define LITTLE_ENDIAN /* kyureki.c */ - #if defined(LSI_C) - #define BITFIELD_USE_UNSIGNED_INT /* kyureki.c */ - #endif ---- 69,75 ---- - #define MAXWIDTH 80 /* main.c */ - #define MAXFNAMEBUF 13 /* misc.c 最大ファイル名 + '\0' */ - #define MAXPATHNAME 90 /* main.c, pager.c */ -! #define _LITTLE_ENDIAN /* kyureki.c */ - #if defined(LSI_C) - #define BITFIELD_USE_UNSIGNED_INT /* kyureki.c */ - #endif -*************** -*** 117,123 **** - #define MAXWIDTH 80 /* main.c */ - #define MAXFNAMEBUF 256 /* misc.c 4.3BSD 最大ファイル名 + '\0' */ - #define MAXPATHNAME 1024 /* main.c, pager.c */ -! #define BIG_ENDIAN /* kyureki.c */ - #define OPEN_OPT (O_RDONLY) /* kyureki.c */ - #define UNDERLINE ((int)'_') /* misc.c */ - #define OUTFILE_DEFAULT "%y%m%d.today" /* pager.c */ ---- 117,123 ---- - #define MAXWIDTH 80 /* main.c */ - #define MAXFNAMEBUF 256 /* misc.c 4.3BSD 最大ファイル名 + '\0' */ - #define MAXPATHNAME 1024 /* main.c, pager.c */ -! #define _LITTLE_ENDIAN /* kyureki.c */ - #define OPEN_OPT (O_RDONLY) /* kyureki.c */ - #define UNDERLINE ((int)'_') /* misc.c */ - #define OUTFILE_DEFAULT "%y%m%d.today" /* pager.c */ -diff -c old/getfile.c new/getfile.c -*** old/getfile.c Sun Jun 23 06:17:04 1996 ---- new/getfile.c Sun Jun 23 05:57:36 1996 -*************** -*** 11,16 **** ---- 11,19 ---- - * - */ - -+ #ifdef __FreeBSD__ -+ #include <unistd.h> -+ #endif - #include "common.h" - #include "getfile.h" - -diff -c old/kyureki.c new/kyureki.c -*** old/kyureki.c Sun Jun 23 06:17:09 1996 ---- new/kyureki.c Sun Jun 23 05:57:09 1996 -*************** -*** 11,16 **** ---- 11,19 ---- - * - */ - -+ #ifdef __FreeBSD__ -+ #include <unistd.h> -+ #endif - #include "common.h" - #include "main.h" - #include "getfile.h" -*************** -*** 32,38 **** - * 処理系によっては 4bytes にならない場合がある。 - * その様な時は、内蔵旧暦テーブルを使用する。 - */ -! #ifdef BIG_ENDIAN - #ifdef BITFIELD_USE_UNSIGNED_INT - struct KYUREKI_T { - unsigned char year; ---- 35,41 ---- - * 処理系によっては 4bytes にならない場合がある。 - * その様な時は、内蔵旧暦テーブルを使用する。 - */ -! #ifdef _BIG_ENDIAN - #ifdef BITFIELD_USE_UNSIGNED_INT - struct KYUREKI_T { - unsigned char year; -*************** -*** 55,61 **** - }; - #endif - #endif -! #ifdef LITTLE_ENDIAN - #ifdef BITFIELD_USE_UNSIGNED_INT - struct KYUREKI_T { - unsigned char year; ---- 58,64 ---- - }; - #endif - #endif -! #ifdef _LITTLE_ENDIAN - #ifdef BITFIELD_USE_UNSIGNED_INT - struct KYUREKI_T { - unsigned char year; -diff -c old/main.c new/main.c -*** old/main.c Sun Jun 23 06:17:16 1996 ---- new/main.c Sun Jun 23 06:28:20 1996 -*************** -*** 18,24 **** - #include "date.h" - #include "event.h" - #include "getfile.h" -! #include "getopt.h" - #include "history.h" - #include "kyureki.h" - #include "machine.h" ---- 18,31 ---- - #include "date.h" - #include "event.h" - #include "getfile.h" -! #ifdef __FreeBSD__ -! /* FreeBSD version 2.x and earlier has them defined in stdlib.h */ -! #if __FreeBSD__ >= 3 -! #include <unistd.h> -! #endif -! #else -! #include "getopt.h" -! #endif - #include "history.h" - #include "kyureki.h" - #include "machine.h" -*************** -*** 726,732 **** ---- 728,738 ---- - /* - * インタラプトやエラーによるプログラム中断処理 - */ -+ #ifndef __FreeBSD__ - void terminate_program(int sig, int subcode) -+ #else -+ void terminate_program(int sig) -+ #endif - { - switch (sig) { - case SIGINT: -diff -c old/main.h new/main.h -*** old/main.h Sun Jun 23 06:17:29 1996 ---- new/main.h Sun Jun 23 06:24:07 1996 -*************** -*** 119,122 **** ---- 119,126 ---- - #endif /* #ifndef INCLUDE_CALENDAR */ - - extern void errprint(const char *func, int level, const char *fmt, ...); -+ #ifndef __FreeBSD__ - extern void terminate_program(int sig, int subcode); -+ #else -+ extern void terminate_program(int sig); -+ #endif -diff -c old/misc.c new/misc.c -*** old/misc.c Sun Jun 23 06:17:18 1996 ---- new/misc.c Sun Jun 23 06:33:03 1996 -*************** -*** 11,22 **** - * - */ - - #include "common.h" - #include "main.h" - #include "getfile.h" - #include "kyureki.h" - #include "misc.h" -! - #ifndef INCLUDE_CALENDAR - #define JULIAN 1720994 - #define MONTH 30.6001 ---- 11,27 ---- - * - */ - -+ #ifdef __FreeBSD__ -+ #include <unistd.h> -+ #endif - #include "common.h" - #include "main.h" - #include "getfile.h" - #include "kyureki.h" - #include "misc.h" -! #ifdef __FreeBSD__ -! #define strnicmp strncasecmp -! #endif - #ifndef INCLUDE_CALENDAR - #define JULIAN 1720994 - #define MONTH 30.6001 -*************** -*** 1105,1111 **** ---- 1110,1120 ---- - sprintf(pbuf, "%06d", getpid() >> 4); - pb = pbuf + strlen(pbuf) - 5; - #else /* #if defined(MSDOS) || defined(LSI_C) || defined(unix) */ -+ #ifndef __FreeBSD__ - sprintf(pbuf, "%05d", getpid()); -+ #else -+ sprintf(pbuf, "%05ld", getpid()); -+ #endif - pb = pbuf; - #endif - for (i = 0; i < 5; i++) { -*************** -*** 1280,1286 **** ---- 1289,1299 ---- - buf = malloc(size); - if (buf == NULL) { - errprint("xmalloc", ERR_PANIC, "virtual memory exhausted, program stop."); -+ #ifndef __FreeBSD__ - terminate_program(TERM_MEMERROR, 0); -+ #else -+ terminate_program(TERM_MEMERROR); -+ #endif - } - return (buf); - } -diff -c old/pager.c new/pager.c -*** old/pager.c Sun Jun 23 06:17:19 1996 ---- new/pager.c Sun Jun 23 05:56:31 1996 -*************** -*** 11,16 **** ---- 11,19 ---- - * - */ - -+ #ifdef __FreeBSD__ -+ #include <unistd.h> -+ #endif - #include "common.h" - #include "main.h" - #include "getfile.h" /* make_accesspath() */ -*************** -*** 34,40 **** - static int line_count; - static FILE *pager_fp = NULL; - -! static void pause(void); - - /* - * TODAY 出力ファイルの作成 ---- 37,43 ---- - static int line_count; - static FILE *pager_fp = NULL; - -! static void _pause(void); - - /* - * TODAY 出力ファイルの作成 -*************** -*** 109,115 **** - } - if (pager_cmd == NULL) { - if (pager_lastpause == YES) { -! pause(); - } - } else { - sprintf(cmdbuf, "%s %s", pager_cmd, pager_file); ---- 112,118 ---- - } - if (pager_cmd == NULL) { - if (pager_lastpause == YES) { -! _pause(); - } - } else { - sprintf(cmdbuf, "%s %s", pager_cmd, pager_file); -*************** -*** 168,174 **** ---- 171,181 ---- - fputs(linebuffer, pager_fp); - if (fputc('\n', pager_fp) == EOF) { - errprint("pager_output", ERR_ERROR, "ファイル(%s)に出力できません errno = %d", pager_file, errno); -+ #ifndef __FreeBSD__ - terminate_program(TERM_FILEERROR, 0); -+ #else -+ terminate_program(TERM_FILEERROR); -+ #endif - } - } - if (pager_cmd != NULL) { -*************** -*** 181,187 **** - line_count -= maxline; - if (line_count <= 0) { - line_count = screen_max_rows; -! pause(); - line_count -= maxline; - } - } ---- 188,194 ---- - line_count -= maxline; - if (line_count <= 0) { - line_count = screen_max_rows; -! _pause(); - line_count -= maxline; - } - } -*************** -*** 196,202 **** - * それに、unix の環境なら外部ページャの方が良いと思う - */ - static -! void pause(void) - { - #if defined(human68k) || defined(MSDOS) || defined(LSI_C) - cprintf("\033[7m--- more ---\033[0m"); ---- 203,209 ---- - * それに、unix の環境なら外部ページャの方が良いと思う - */ - static -! void _pause(void) - { - #if defined(human68k) || defined(MSDOS) || defined(LSI_C) - cprintf("\033[7m--- more ---\033[0m"); -diff -c old/today.cnf new/today.cnf -*** old/today.cnf Sun Jun 23 09:50:19 1996 ---- new/today.cnf Sun Jun 23 10:27:08 1996 -*************** -*** 214,220 **** - # - $common # 以降 共通環境定義部 - -! #table_path = c:/tbl # 各テーブルの検索パス名 - # ';' で区切り複数指定可能 - # 未定義の場合、環境変数 TODAYTBL の場所 - ---- 214,220 ---- - # - $common # 以降 共通環境定義部 - -! table_path = /usr/local/share/today # 各テーブルの検索パス名 - # ';' で区切り複数指定可能 - # 未定義の場合、環境変数 TODAYTBL の場所 - -diff -c old/version.c new/version.c -*** old/version.c Sun Jun 23 06:17:23 1996 ---- new/version.c Sun Jun 23 10:37:15 1996 -*************** -*** 28,33 **** ---- 28,34 ---- - const char Version[] = "today " __DATE__ " version 2.10B (正式版)"; - const char RCSid[] ="$Id: patch-aa,v 1.1.1.2 1996/11/10 12:40:20 asami Exp $"; - const char UseLanguage[] = -+ #if !defined(TRANS) - #if defined(human68k) - #if defined(__GNUC__) - "gcc version 1.00 Tool#1(68020) Based on 1.42"; -*************** -*** 47,53 **** - /* by Sun-4/470 SunOS4.1.1+JLE1.1.1 */ - #endif - #endif - - #ifdef TRANS -! const char Modify[] = "Modified for 機種名/OS名 by 移植者名"; - #endif ---- 48,57 ---- - /* by Sun-4/470 SunOS4.1.1+JLE1.1.1 */ - #endif - #endif -+ #else -+ "gcc version 2.6.3"; -+ #endif - - #ifdef TRANS -! const char Modify[] = "Modified for FreeBSD2.0.5R by pcs51674@asciinet.or.jp"; - #endif -diff -c old/version.h new/version.h -*** old/version.h Sun Jun 23 06:17:33 1996 ---- new/version.h Sun Jun 23 10:08:17 1996 -*************** -*** 11,17 **** - * - */ - -! /*#define TRANS*/ /* 他機種へ移植した場合 define する */ - - extern const char Copyright[]; - extern const char Version[]; ---- 11,17 ---- - * - */ - -! #define TRANS /* 他機種へ移植した場合 define する */ - - extern const char Copyright[]; - extern const char Version[]; +--- calendar.c.orig Fri Sep 19 20:27:37 1997 ++++ calendar.c Fri Sep 19 20:27:00 1997 +@@ -37,7 +37,14 @@ + #include "common.h" + #include "config.h" + #include "getfile.h" +-#include "getopt.h" ++#ifdef __FreeBSD__ ++/* FreeBSD version 2.x and earlier has them defined in stdlib.h */ ++ #if __FreeBSD__ >= 3 ++ #include <unistd.h> ++ #endif ++#else ++ #include "getopt.h" ++#endif + #include "getsb.h" + #include "kyureki.h" + #include "main.h" +@@ -909,7 +916,7 @@ + + va_start(ap, fmt); + +- fprintf(stderr, "calendar: ", func); ++ fprintf(stderr, "calendar: %s", func); + if (level != ERR_INFO) { + fprintf(stderr, "%s: ", statname[level - ERR_WARN]); + } +@@ -960,7 +967,11 @@ + /* + * エラーによるプログラム中断処理 + */ ++#ifndef __FreeBSD__ + void terminate_program(int sig, int subcode) ++#else ++void terminate_program(int sig) ++#endif + { + switch (sig) { + case TERM_MEMERROR: diff --git a/japanese/today/files/patch-ae b/japanese/today/files/patch-ae new file mode 100644 index 000000000000..dab46f2fbd37 --- /dev/null +++ b/japanese/today/files/patch-ae @@ -0,0 +1,39 @@ +--- main.c.orig Fri Sep 19 20:27:37 1997 ++++ main.c Fri Sep 19 20:27:01 1997 +@@ -18,7 +18,14 @@ + #include "date.h" + #include "event.h" + #include "getfile.h" +-#include "getopt.h" ++#ifdef __FreeBSD__ ++/* FreeBSD version 2.x and earlier has them defined in stdlib.h */ ++ #if __FreeBSD__ >= 3 ++ #include <unistd.h> ++ #endif ++#else ++ #include "getopt.h" ++#endif + #include "history.h" + #include "kyureki.h" + #include "machine.h" +@@ -710,7 +717,7 @@ + + va_start(ap, fmt); + +- fprintf(stderr, "today: ", func); ++ fprintf(stderr, "today: %s", func); + if (level != ERR_INFO) { + fprintf(stderr, "%s: ", statname[level - ERR_WARN]); + } +@@ -726,7 +733,11 @@ + /* + * インタラプトやエラーによるプログラム中断処理 + */ ++#ifndef __FreeBSD__ + void terminate_program(int sig, int subcode) ++#else ++void terminate_program(int sig) ++#endif + { + switch (sig) { + case SIGINT: diff --git a/japanese/today/files/patch-ag b/japanese/today/files/patch-ag new file mode 100644 index 000000000000..4ae251d7cdc2 --- /dev/null +++ b/japanese/today/files/patch-ag @@ -0,0 +1,45 @@ +--- misc.c.orig Fri Sep 19 20:27:37 1997 ++++ misc.c Fri Sep 19 20:23:43 1997 +@@ -11,12 +11,17 @@ + * + */ + ++#ifdef __FreeBSD__ ++ #include <unistd.h> ++#endif + #include "common.h" + #include "main.h" + #include "getfile.h" + #include "kyureki.h" + #include "misc.h" +- ++#ifdef __FreeBSD__ ++ #define strnicmp strncasecmp ++#endif + #ifndef INCLUDE_CALENDAR + #define JULIAN 1720994 + #define MONTH 30.6001 +@@ -1105,7 +1110,11 @@ + sprintf(pbuf, "%06d", getpid() >> 4); + pb = pbuf + strlen(pbuf) - 5; + #else /* #if defined(MSDOS) || defined(LSI_C) || defined(unix) */ ++#ifndef __FreeBSD__ + sprintf(pbuf, "%05d", getpid()); ++#else ++ sprintf(pbuf, "%05ld", getpid()); ++#endif + pb = pbuf; + #endif + for (i = 0; i < 5; i++) { +@@ -1280,7 +1289,11 @@ + buf = malloc(size); + if (buf == NULL) { + errprint("xmalloc", ERR_PANIC, "virtual memory exhausted, program stop."); ++#ifndef __FreeBSD__ + terminate_program(TERM_MEMERROR, 0); ++#else ++ terminate_program(TERM_MEMERROR); ++#endif + } + return (buf); + } diff --git a/japanese/today/files/patch-ai b/japanese/today/files/patch-ai new file mode 100644 index 000000000000..d73fb4fac57b --- /dev/null +++ b/japanese/today/files/patch-ai @@ -0,0 +1,24 @@ +--- today.cnf.orig Fri Sep 19 20:27:37 1997 ++++ today.cnf Fri Sep 19 20:27:22 1997 +@@ -109,10 +109,10 @@ + # + pager = # 外部ページャーの指定 + # 指定しなければ、内蔵ページャー使用 +-pause = yes # 内蔵ページャー 表示一時停止制御 ++pause = no # 内蔵ページャー 表示一時停止制御 + # yes 一時停止 + # *no 停止しない +-pause_last = yes # 内蔵ページャー 表示終了後一時停止制御 ++pause_last = no # 内蔵ページャー 表示終了後一時停止制御 + # yes 一時停止 + # *no 停止しない + #outputfile = %y%m%d.tdy # 出力ファイル名 (デフォルト:%y%m%d.tdy/%p.tdy) +@@ -214,7 +214,7 @@ + # + $common # 以降 共通環境定義部 + +-#table_path = c:/tbl # 各テーブルの検索パス名 ++table_path = /usr/local/share/today # 各テーブルの検索パス名 + # ';' で区切り複数指定可能 + # 未定義の場合、環境変数 TODAYTBL の場所 + diff --git a/japanese/today/files/patch-aj b/japanese/today/files/patch-aj new file mode 100644 index 000000000000..fe274e025381 --- /dev/null +++ b/japanese/today/files/patch-aj @@ -0,0 +1,22 @@ +--- version.c.orig Fri Sep 19 20:27:37 1997 ++++ version.c Fri Sep 19 20:23:43 1997 +@@ -28,6 +28,7 @@ + const char Version[] = "today " __DATE__ " version 2.10B (正式版)"; + const char RCSid[] ="$Id: version.c,v 1.1 1993/07/25 05:39:46 mori Exp $"; + const char UseLanguage[] = ++#if !defined(TRANS) + #if defined(human68k) + #if defined(__GNUC__) + "gcc version 1.00 Tool#1(68020) Based on 1.42"; +@@ -47,7 +48,10 @@ + /* by Sun-4/470 SunOS4.1.1+JLE1.1.1 */ + #endif + #endif ++#else ++ "gcc version 2.6.3"; ++#endif + + #ifdef TRANS +-const char Modify[] = "Modified for 機種名/OS名 by 移植者名"; ++const char Modify[] = "Modified for FreeBSD2.0.5R by pcs51674@asciinet.or.jp"; + #endif |