From 05869ae2d1d36d22c55acdc4d40e0a9e69d55dfe Mon Sep 17 00:00:00 2001 From: fgsch Date: Fri, 20 Jun 2003 00:14:51 +0000 Subject: [PATCH] the horror! c2k bugs. fix them and regen the patches. --- x11/xpostitPlus/patches/patch-Imakefile | 31 +++++++ x11/xpostitPlus/patches/patch-aa | 19 ---- x11/xpostitPlus/patches/patch-insert_c | 110 ++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 19 deletions(-) create mode 100644 x11/xpostitPlus/patches/patch-Imakefile delete mode 100644 x11/xpostitPlus/patches/patch-aa create mode 100644 x11/xpostitPlus/patches/patch-insert_c diff --git a/x11/xpostitPlus/patches/patch-Imakefile b/x11/xpostitPlus/patches/patch-Imakefile new file mode 100644 index 00000000000..fcf4a52129a --- /dev/null +++ b/x11/xpostitPlus/patches/patch-Imakefile @@ -0,0 +1,31 @@ +$OpenBSD: patch-Imakefile,v 1.1 2003/06/20 00:14:51 fgsch Exp $ +--- Imakefile.orig Tue Sep 10 00:36:09 1996 ++++ Imakefile Thu Jun 19 21:04:32 2003 +@@ -23,8 +23,8 @@ XCOMM Ported to X11 Release 4. Added ap + XCOMM + XCOMM + +-BINDIR=bin-d +-MANDIR=man-d ++XCOMM BINDIR=bin-d ++XCOMM MANDIR=man-d + + XCOMM The following defines are used for various things. If you find you + XCOMM have a need for more than one of them, just create a single DEFINES +@@ -35,14 +35,14 @@ XCOMM or you use one which won't provide + XCOMM DEFINES = -DNOWM + + XCOMM for debugging purposes +-DEFINES = -g -Wall ++DEFINES = -Wall + + XCOMM uncomment the following if you still use instead of + XCOMM DEFINES = -DUSE_DIR + + XCOMM uncomment the following if you want to be prompted on exit for saving + XCOMM notes if you haven't specified to save-on-exit on the command line. +-XCOMM DEFINES = -DPROMPT_FOR_SAVE ++DEFINES = -DPROMPT_FOR_SAVE + + XCOMM uncomment the following if your SYSV system doesn't support bcopy(), + XCOMM bzero(), or rindex() diff --git a/x11/xpostitPlus/patches/patch-aa b/x11/xpostitPlus/patches/patch-aa deleted file mode 100644 index 93b6ca1949e..00000000000 --- a/x11/xpostitPlus/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ ---- Imakefile.orig Fri Sep 26 12:06:02 1997 -+++ Imakefile Fri Sep 26 12:30:24 1997 -@@ -25,4 +25,4 @@ - --BINDIR=bin-d --MANDIR=man-d -+XCOMM BINDIR=bin-d -+XCOMM MANDIR=man-d - -@@ -37,3 +37,3 @@ - XCOMM for debugging purposes --DEFINES = -g -Wall -+DEFINES = -Wall - -@@ -44,3 +44,3 @@ - XCOMM notes if you haven't specified to save-on-exit on the command line. --XCOMM DEFINES = -DPROMPT_FOR_SAVE -+DEFINES = -DPROMPT_FOR_SAVE - diff --git a/x11/xpostitPlus/patches/patch-insert_c b/x11/xpostitPlus/patches/patch-insert_c new file mode 100644 index 00000000000..97e10abbd26 --- /dev/null +++ b/x11/xpostitPlus/patches/patch-insert_c @@ -0,0 +1,110 @@ +$OpenBSD: patch-insert_c,v 1.1 2003/06/20 00:14:51 fgsch Exp $ +--- insert.c.orig Thu Jun 19 21:01:53 2003 ++++ insert.c Thu Jun 19 21:03:39 2003 +@@ -261,7 +261,6 @@ Widget w; + time_t time_tp; + struct tm *tm_tp; + char dayname[12]; +- char year[5]; + char month[10]; + + /* get todays date and current time */ +@@ -297,78 +296,78 @@ Widget w; + case 10: sprintf(month, "Nov"); break; + case 11: sprintf(month, "Dec"); break; + } +- if ( tm_tp->tm_year > 100 ) +- sprintf(year,"20"); +- else +- sprintf(year,"19"); + + switch (active_item) + { + case 0: + sprintf (cmd, +- "%02d/%02d/%02d", tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year ); ++ "%02d/%02d/%02d", tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year % 100); + break; + + case 1: + sprintf (cmd, +- "<%02d/%02d/%02d>", tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year ); ++ "<%02d/%02d/%02d>", tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year % 100); + break; + + case 2: + sprintf (cmd, +- "(%02d/%02d/%02d)", tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year ); ++ "(%02d/%02d/%02d)", tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year % 100); + break; + + case 3: + sprintf (cmd, + "%02d/%02d/%02d - %02d:%02d", +- tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year, ++ tm_tp->tm_mon, tm_tp->tm_mday, ++ tm_tp->tm_year % 100, + tm_tp->tm_hour, tm_tp->tm_min ); + break; + + case 4: + sprintf (cmd, + "%02d/%02d/%02d(%02d:%02d)", +- tm_tp->tm_mon, tm_tp->tm_mday, tm_tp->tm_year, ++ tm_tp->tm_mon, tm_tp->tm_mday, ++ tm_tp->tm_year % 100, + tm_tp->tm_hour, tm_tp->tm_min ); + break; + + case 5: + sprintf (cmd, +- "%s %d, %s%d", month, tm_tp->tm_mday, year, tm_tp->tm_year); ++ "%s %d, %d", month, tm_tp->tm_mday, tm_tp->tm_year + 1900); + break; + + case 6: + sprintf (cmd, +- "%s %d, %s%d - %02d:%02d", +- month, tm_tp->tm_mday, year, tm_tp->tm_year, ++ "%s %d, %d - %02d:%02d", ++ month, tm_tp->tm_mday, tm_tp->tm_year + 1900, + tm_tp->tm_hour, tm_tp->tm_min ); + break; + + case 7: + sprintf (cmd, +- "%s %d, %s%d (%02d:%02d)", +- month, tm_tp->tm_mday, year, tm_tp->tm_year, ++ "%s %d, %d (%02d:%02d)", ++ month, tm_tp->tm_mday, tm_tp->tm_year + 1900, + tm_tp->tm_hour, tm_tp->tm_min ); + break; + + case 8: + sprintf (cmd, +- "%s %s %d, %s%d", +- dayname, month, tm_tp->tm_mday, year, tm_tp->tm_year); ++ "%s %s %d, %d", ++ dayname, month, tm_tp->tm_mday, tm_tp->tm_year + 1900); + break; + + case 9: + sprintf (cmd, +- "%s %s %d, %s%d - %02d:%02d", +- dayname, month, tm_tp->tm_mday, year, tm_tp->tm_year, ++ "%s %s %d, %d - %02d:%02d", ++ dayname, month, tm_tp->tm_mday, ++ tm_tp->tm_year + 1900, + tm_tp->tm_hour, tm_tp->tm_min ); + break; + + case 10: + sprintf (cmd, +- "%s %s %d, %s%d (%02d:%02d)", +- dayname, month, tm_tp->tm_mday, year, tm_tp->tm_year, ++ "%s %s %d, %d (%02d:%02d)", ++ dayname, month, tm_tp->tm_mday, ++ tm_tp->tm_year + 1900, + tm_tp->tm_hour, tm_tp->tm_min ); + break; +