From fe8aaceaa809b5413b2b3f80848c91e3410b6334 Mon Sep 17 00:00:00 2001 From: form Date: Thu, 21 Mar 2002 09:59:48 +0000 Subject: [PATCH] rename patches. some fixes. --- .../patches/{patch-aj => patch-Makefile_in} | 7 ++- misc/deco/patches/patch-ac | 19 ------ misc/deco/patches/patch-ad | 19 ------ misc/deco/patches/patch-ae | 36 ----------- misc/deco/patches/patch-af | 21 ------- misc/deco/patches/patch-ag | 9 --- misc/deco/patches/patch-ah | 9 --- misc/deco/patches/patch-ai | 62 ------------------- misc/deco/patches/patch-configure | 38 ++++++++++++ misc/deco/patches/patch-deco_h | 14 +++++ misc/deco/patches/patch-dir_c | 17 +++++ misc/deco/patches/patch-draw_c | 12 ++++ misc/deco/patches/{patch-aa => patch-ex_c} | 5 +- misc/deco/patches/{patch-ab => patch-help_c} | 5 +- misc/deco/patches/patch-main_c | 12 ++++ misc/deco/patches/patch-menu_c | 8 +++ misc/deco/patches/patch-rec_c | 30 +++++++++ misc/deco/patches/patch-scr_c | 38 ++++++++++++ misc/deco/patches/patch-ut_c | 21 +++++++ misc/deco/patches/patch-view_c | 8 +++ 20 files changed, 208 insertions(+), 182 deletions(-) rename misc/deco/patches/{patch-aj => patch-Makefile_in} (72%) delete mode 100644 misc/deco/patches/patch-ac delete mode 100644 misc/deco/patches/patch-ad delete mode 100644 misc/deco/patches/patch-ae delete mode 100644 misc/deco/patches/patch-af delete mode 100644 misc/deco/patches/patch-ag delete mode 100644 misc/deco/patches/patch-ah delete mode 100644 misc/deco/patches/patch-ai create mode 100644 misc/deco/patches/patch-configure create mode 100644 misc/deco/patches/patch-deco_h create mode 100644 misc/deco/patches/patch-dir_c create mode 100644 misc/deco/patches/patch-draw_c rename misc/deco/patches/{patch-aa => patch-ex_c} (80%) rename misc/deco/patches/{patch-ab => patch-help_c} (63%) create mode 100644 misc/deco/patches/patch-main_c create mode 100644 misc/deco/patches/patch-menu_c create mode 100644 misc/deco/patches/patch-rec_c create mode 100644 misc/deco/patches/patch-scr_c create mode 100644 misc/deco/patches/patch-ut_c create mode 100644 misc/deco/patches/patch-view_c diff --git a/misc/deco/patches/patch-aj b/misc/deco/patches/patch-Makefile_in similarity index 72% rename from misc/deco/patches/patch-aj rename to misc/deco/patches/patch-Makefile_in index 753f15f2eb8..f4e2bc80af8 100644 --- a/misc/deco/patches/patch-aj +++ b/misc/deco/patches/patch-Makefile_in @@ -1,6 +1,7 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2002/03/21 09:59:48 form Exp $ --- Makefile.in.orig Tue Jan 4 13:38:18 2000 -+++ Makefile.in Tue Feb 8 14:04:43 2000 -@@ -18,7 +18,7 @@ ++++ Makefile.in Thu Mar 21 15:23:54 2002 +@@ -18,7 +18,7 @@ LIBS = @LIBS@ CC = @CC@ CPP = @CPP@ @@ -9,7 +10,7 @@ #### End of system configuration section. #### -@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@ install: deco $(libdir)/deco $(li cd help; for f in *.general *.edit *.view *.hexview; do\ $(INSTALL_DATA) $$f $(libdir)/deco/help/$$f; done $(INSTALL_DATA) ref.man $(mandir)/man1/deco.1 diff --git a/misc/deco/patches/patch-ac b/misc/deco/patches/patch-ac deleted file mode 100644 index c3ffa6697e0..00000000000 --- a/misc/deco/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -*** draw.c.orig Thu Oct 1 18:38:22 1998 ---- draw.c Thu Oct 1 18:38:31 1998 -*************** -*** 81,87 **** - VPutChar ('.'); - if (group) - VPutString (group); -! if ((curtime = timestr (time ((long *) 0)))) - VMPutString (0, 79 - strlen (curtime), curtime); - VStandEnd (); - VMPutString (LINES-1, 0, cmdreg ? ---- 81,87 ---- - VPutChar ('.'); - if (group) - VPutString (group); -! if ((curtime = timestr (time ((time_t *) 0)))) - VMPutString (0, 79 - strlen (curtime), curtime); - VStandEnd (); - VMPutString (LINES-1, 0, cmdreg ? diff --git a/misc/deco/patches/patch-ad b/misc/deco/patches/patch-ad deleted file mode 100644 index 2520fc1e7da..00000000000 --- a/misc/deco/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -*** main.c.orig Thu Oct 1 18:38:59 1998 ---- main.c Thu Oct 1 18:39:04 1998 -*************** -*** 103,109 **** - static void docmdreg (int c); - static void doscrreg (int c); - -! void main (int argc, char **argv, char **envp) - { - register c; - ---- 103,109 ---- - static void docmdreg (int c); - static void doscrreg (int c); - -! int main (int argc, char **argv, char **envp) - { - register c; - diff --git a/misc/deco/patches/patch-ae b/misc/deco/patches/patch-ae deleted file mode 100644 index c13f3913678..00000000000 --- a/misc/deco/patches/patch-ae +++ /dev/null @@ -1,36 +0,0 @@ -*** ut.c.orig Thu Oct 1 18:49:05 1998 ---- ut.c Thu Oct 1 18:49:22 1998 -*************** -*** 24,30 **** - - static char pattern [] = "00-Mon-1900 00:00:00"; - -! char *timestr (long tim) - { - struct tm *t = localtime (&tim); - register char *p = pattern; ---- 24,30 ---- - - static char pattern [] = "00-Mon-1900 00:00:00"; - -! char *timestr (time_t tim) - { - struct tm *t = localtime (&tim); - register char *p = pattern; -*************** -*** 49,55 **** - return (p); - } - -! long timeval (long tim) - { - struct tm *t = localtime (&tim); - ---- 49,55 ---- - return (p); - } - -! long timeval (time_t tim) - { - struct tm *t = localtime (&tim); - diff --git a/misc/deco/patches/patch-af b/misc/deco/patches/patch-af deleted file mode 100644 index 89b4eeb651b..00000000000 --- a/misc/deco/patches/patch-af +++ /dev/null @@ -1,21 +0,0 @@ -*** deco.h.orig Thu Oct 1 18:50:51 1998 ---- deco.h Thu Oct 1 18:51:02 1998 -*************** -*** 107,114 **** - int match (unsigned char *name, unsigned char *pat); - int getmenu (void); - void downmenu (struct menu *m); -! char *timestr (long tim); -! long timeval (long tim); - int hexview (char *filename); - void viewpage (int line, int col); - void viewchar (int c); ---- 107,114 ---- - int match (unsigned char *name, unsigned char *pat); - int getmenu (void); - void downmenu (struct menu *m); -! char *timestr (time_t tim); -! long timeval (time_t tim); - int hexview (char *filename); - void viewpage (int line, int col); - void viewchar (int c); diff --git a/misc/deco/patches/patch-ag b/misc/deco/patches/patch-ag deleted file mode 100644 index cab01720a4b..00000000000 --- a/misc/deco/patches/patch-ag +++ /dev/null @@ -1,9 +0,0 @@ -*** menu.c.orig Thu Oct 1 18:54:23 1998 ---- menu.c Thu Oct 1 18:54:33 1998 -*************** -*** 1,3 **** ---- 1,4 ---- -+ #include - #include "deco.h" - #include "scr.h" - #include "menu.h" diff --git a/misc/deco/patches/patch-ah b/misc/deco/patches/patch-ah deleted file mode 100644 index 795aad6b427..00000000000 --- a/misc/deco/patches/patch-ah +++ /dev/null @@ -1,9 +0,0 @@ -*** view.c.orig Thu Oct 1 18:54:51 1998 ---- view.c Thu Oct 1 18:54:58 1998 -*************** -*** 1,3 **** ---- 1,4 ---- -+ #include - #include "deco.h" - #include "scr.h" - #include "rec.h" diff --git a/misc/deco/patches/patch-ai b/misc/deco/patches/patch-ai deleted file mode 100644 index 5d689cd4d7b..00000000000 --- a/misc/deco/patches/patch-ai +++ /dev/null @@ -1,62 +0,0 @@ -*** configure.orig Thu Oct 1 18:57:01 1998 ---- configure Thu Oct 1 18:57:23 1998 -*************** -*** 2092,2105 **** - echo "$ac_t""no" 1>&6 - fi - -! echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -! echo "configure:2097: checking for tgetent in -lncurses" >&5 -! ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <&6 - fi - -! echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -! echo "configure:2097: checking for tgetent in -lcurses" >&5 -! ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lcurses $LIBS" - cat > conftest.$ac_ext <&6 -! ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 ---- 2127,2139 ---- - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 diff --git a/misc/deco/patches/patch-configure b/misc/deco/patches/patch-configure new file mode 100644 index 00000000000..269e724e5a2 --- /dev/null +++ b/misc/deco/patches/patch-configure @@ -0,0 +1,38 @@ +$OpenBSD: patch-configure,v 1.1 2002/03/21 09:59:48 form Exp $ +--- configure.orig Fri Jul 18 21:48:13 1997 ++++ configure Thu Mar 21 15:23:54 2002 +@@ -2092,14 +2092,14 @@ else + echo "$ac_t""no" 1>&6 + fi + +-echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 +-echo "configure:2097: checking for tgetent in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 ++echo "configure:2097: checking for tgetent in -lcurses" >&5 ++ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" ++LIBS="-lcurses $LIBS" + cat > conftest.$ac_ext <&6 +- ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 diff --git a/misc/deco/patches/patch-deco_h b/misc/deco/patches/patch-deco_h new file mode 100644 index 00000000000..6f9c3a7b500 --- /dev/null +++ b/misc/deco/patches/patch-deco_h @@ -0,0 +1,14 @@ +$OpenBSD: patch-deco_h,v 1.1 2002/03/21 09:59:48 form Exp $ +--- deco.h.orig Fri Jul 18 20:07:03 1997 ++++ deco.h Thu Mar 21 15:23:54 2002 +@@ -107,8 +107,8 @@ int strbcmp (char *s, char *b); + int match (unsigned char *name, unsigned char *pat); + int getmenu (void); + void downmenu (struct menu *m); +-char *timestr (long tim); +-long timeval (long tim); ++char *timestr (time_t tim); ++long timeval (time_t tim); + int hexview (char *filename); + void viewpage (int line, int col); + void viewchar (int c); diff --git a/misc/deco/patches/patch-dir_c b/misc/deco/patches/patch-dir_c new file mode 100644 index 00000000000..b4c00e2355d --- /dev/null +++ b/misc/deco/patches/patch-dir_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-dir_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- dir.c.orig Thu Mar 21 15:29:13 2002 ++++ dir.c Thu Mar 21 15:29:44 2002 +@@ -358,8 +358,11 @@ int setdir (struct dir *d, char *dirname + + d->topfile = d->curfile = 0; + +- compdir = d; +- qsort ((char*)d->cat, (unsigned) d->num, sizeof (d->cat[0]), compfile); ++ if (d->sort != SORTSKIP) { ++ compdir = d; ++ qsort ((char*)d->cat, (unsigned) d->num, ++ sizeof (d->cat[0]), compfile); ++ } + + if (! dirname) { + /* retag files, restore curfile */ diff --git a/misc/deco/patches/patch-draw_c b/misc/deco/patches/patch-draw_c new file mode 100644 index 00000000000..e30cc31fd3f --- /dev/null +++ b/misc/deco/patches/patch-draw_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-draw_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- draw.c.orig Tue Jan 4 13:33:31 2000 ++++ draw.c Thu Mar 21 15:23:53 2002 +@@ -81,7 +81,7 @@ void drawbanners () + VPutChar ('.'); + if (group) + VPutString (group); +- if ((curtime = timestr (time ((long *) 0)))) ++ if ((curtime = timestr (time ((time_t *) 0)))) + VMPutString (0, 79 - strlen (curtime), curtime); + VStandEnd (); + VMPutString (LINES-1, 0, cmdreg ? diff --git a/misc/deco/patches/patch-aa b/misc/deco/patches/patch-ex_c similarity index 80% rename from misc/deco/patches/patch-aa rename to misc/deco/patches/patch-ex_c index 1e042489612..760907455bb 100644 --- a/misc/deco/patches/patch-aa +++ b/misc/deco/patches/patch-ex_c @@ -1,5 +1,6 @@ ---- ex.c Sat Jul 12 18:54:34 1997 -+++ /home/andy/tmp/wrk/ex.c Tue Dec 16 12:14:53 1997 +$OpenBSD: patch-ex_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- ex.c.orig Sun Jul 13 01:54:34 1997 ++++ ex.c Thu Mar 21 15:23:53 2002 @@ -59,11 +59,11 @@ #define UMFILE ".menu" #define INITFILE ".decoini" diff --git a/misc/deco/patches/patch-ab b/misc/deco/patches/patch-help_c similarity index 63% rename from misc/deco/patches/patch-ab rename to misc/deco/patches/patch-help_c index 11882f702be..9e98d7c4b5e 100644 --- a/misc/deco/patches/patch-ab +++ b/misc/deco/patches/patch-help_c @@ -1,5 +1,6 @@ ---- help.c Sat Jul 12 18:54:34 1997 -+++ /home/andy/tmp/wrk/help.c Tue Dec 16 12:15:00 1997 +$OpenBSD: patch-help_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- help.c.orig Sun Jul 13 01:54:34 1997 ++++ help.c Thu Mar 21 15:23:53 2002 @@ -10,7 +10,7 @@ #define CS 34 diff --git a/misc/deco/patches/patch-main_c b/misc/deco/patches/patch-main_c new file mode 100644 index 00000000000..682ce293113 --- /dev/null +++ b/misc/deco/patches/patch-main_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-main_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- main.c.orig Tue Dec 29 02:16:43 1998 ++++ main.c Thu Mar 21 15:23:54 2002 +@@ -103,7 +103,7 @@ static void execute (void); + static void docmdreg (int c); + static void doscrreg (int c); + +-void main (int argc, char **argv, char **envp) ++int main (int argc, char **argv, char **envp) + { + register c; + diff --git a/misc/deco/patches/patch-menu_c b/misc/deco/patches/patch-menu_c new file mode 100644 index 00000000000..a4fcf65df66 --- /dev/null +++ b/misc/deco/patches/patch-menu_c @@ -0,0 +1,8 @@ +$OpenBSD: patch-menu_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- menu.c.orig Sun Jul 13 00:53:25 1997 ++++ menu.c Thu Mar 21 15:23:54 2002 +@@ -1,3 +1,4 @@ ++#include + #include "deco.h" + #include "scr.h" + #include "menu.h" diff --git a/misc/deco/patches/patch-rec_c b/misc/deco/patches/patch-rec_c new file mode 100644 index 00000000000..29750665943 --- /dev/null +++ b/misc/deco/patches/patch-rec_c @@ -0,0 +1,30 @@ +$OpenBSD: patch-rec_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- rec.c.orig Sun Jul 13 01:52:20 1997 ++++ rec.c Thu Mar 21 15:47:00 2002 +@@ -61,7 +61,7 @@ static int lenbuf; + static char *scanbuf, *pbuf; + static char *tfilename; + static int eoln; +-static int MAXLEN = ((unsigned int) (int) -1 >> 1) / sizeof (struct index); ++static int MAXLEN = 32767; + + static int ffcopy (int from, int to) + { +@@ -168,6 +168,9 @@ REC *RecOpen (int fd, int wmode) + if (wmode) { + if (! tfilename) + tfilename = tfilepattern; ++#ifdef HAVE_MKSTEMP ++ r->tfd = mkstemp(tfilename); ++#else + r->tfd = creat (tfilename, 0600); + if (r->tfd < 0) { + error ("Cannot open temporary file"); +@@ -175,6 +178,7 @@ REC *RecOpen (int fd, int wmode) + } + close (r->tfd); + r->tfd = open (tfilename, 2); ++#endif + if (r->tfd < 0) { + error ("Cannot reopen temporary file"); + return (0); diff --git a/misc/deco/patches/patch-scr_c b/misc/deco/patches/patch-scr_c new file mode 100644 index 00000000000..e7a6fce148b --- /dev/null +++ b/misc/deco/patches/patch-scr_c @@ -0,0 +1,38 @@ +$OpenBSD: patch-scr_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- scr.c.orig Tue Dec 29 22:57:11 1998 ++++ scr.c Thu Mar 21 15:31:17 2002 +@@ -167,7 +167,7 @@ static char *KS, *KE; + + static char *CL, *CM, *SE, *SO, *TE, *TI, *VE, *VS, + *AL, *DL, *IS, *IF, *FS, *MD, *MH, *ME, *MR, +- *CF, *CB, *AF, *AB, *Sf, *Sb, *MF, *MB; ++ *CF, *CB, *AF, *AB, *Sf, *Sb, *MF, *MB, *OP; + static NF, NB; + static char MS, C2; + +@@ -231,6 +231,7 @@ struct CapTab outtab [] = { + { "Cs", CAPSTR, 0, 0, 0, &Cs, }, + { "Ce", CAPSTR, 0, 0, 0, &Ce, }, + { "Ct", CAPSTR, 0, 0, 0, &Ct, }, ++ { "op", CAPSTR, 0, 0, 0, &OP, }, + { { 0, 0, }, 0, 0, 0, 0, 0, }, + }; + +@@ -413,6 +414,8 @@ void VClose () + tputs (TE); + if (KE) + tputs (KE); ++ if (OP) ++ tputs (OP); + VFlush (); + TtyReset (); + } +@@ -425,6 +428,8 @@ void VRestore () + tputs (VE); + if (KE) + tputs (KE); ++ if (OP) ++ tputs (OP); + VFlush (); + TtyReset (); + } diff --git a/misc/deco/patches/patch-ut_c b/misc/deco/patches/patch-ut_c new file mode 100644 index 00000000000..7f4e81ea20e --- /dev/null +++ b/misc/deco/patches/patch-ut_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-ut_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- ut.c.orig Tue Jan 4 13:21:31 2000 ++++ ut.c Thu Mar 21 15:23:54 2002 +@@ -24,7 +24,7 @@ + + static char pattern [] = "00-Mon-1900 00:00:00"; + +-char *timestr (long tim) ++char *timestr (time_t tim) + { + struct tm *t = localtime (&tim); + register char *p = pattern; +@@ -49,7 +49,7 @@ char *timestr (long tim) + return (p); + } + +-long timeval (long tim) ++long timeval (time_t tim) + { + struct tm *t = localtime (&tim); + diff --git a/misc/deco/patches/patch-view_c b/misc/deco/patches/patch-view_c new file mode 100644 index 00000000000..a3b24012e18 --- /dev/null +++ b/misc/deco/patches/patch-view_c @@ -0,0 +1,8 @@ +$OpenBSD: patch-view_c,v 1.1 2002/03/21 09:59:48 form Exp $ +--- view.c.orig Sun Jul 13 00:53:25 1997 ++++ view.c Thu Mar 21 15:23:54 2002 +@@ -1,3 +1,4 @@ ++#include + #include "deco.h" + #include "scr.h" + #include "rec.h"