From 4748100400ecae36d92935b04721731628a06a25 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 2 Jan 2006 22:29:03 +0000 Subject: Fix errno. DragonFly support. --- time/plan/distinfo | 12 ++++++++---- time/plan/patches/patch-aa | 24 +++++++++++++----------- time/plan/patches/patch-ae | 14 +++++++++++--- time/plan/patches/patch-af | 14 +++++++++++--- time/plan/patches/patch-ag | 20 ++++++++++++++++++++ time/plan/patches/patch-ah | 12 ++++++++++++ time/plan/patches/patch-ai | 13 +++++++++++++ time/plan/patches/patch-aj | 12 ++++++++++++ 8 files changed, 100 insertions(+), 21 deletions(-) create mode 100644 time/plan/patches/patch-ag create mode 100644 time/plan/patches/patch-ah create mode 100644 time/plan/patches/patch-ai create mode 100644 time/plan/patches/patch-aj (limited to 'time') diff --git a/time/plan/distinfo b/time/plan/distinfo index 270d425ff3b..39a6adb909e 100644 --- a/time/plan/distinfo +++ b/time/plan/distinfo @@ -1,11 +1,15 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 19:14:55 wiz Exp $ +$NetBSD: distinfo,v 1.7 2006/01/02 22:29:03 joerg Exp $ SHA1 (plan-1.8.4.tar.gz) = 0b4c5f2d078d3ad48f734c89a316258a56a5749a RMD160 (plan-1.8.4.tar.gz) = 90c4ffa67be680b110ae5564f208d0a1edfbc9f8 Size (plan-1.8.4.tar.gz) = 422458 bytes -SHA1 (patch-aa) = 6159fa85cfe7ad8416e03e33ddb0cf3754cde6b9 +SHA1 (patch-aa) = b3ad61ac09017d952f3c75fd3988edf436159e47 SHA1 (patch-ab) = 6670c398271e5ee6d32194c0b69850f381b5cc5c SHA1 (patch-ac) = 3e78546544e2b55e296068be4de31f6366cab2b0 SHA1 (patch-ad) = f50e8e46e1ed503bf6f16c6cd31dd935e9251772 -SHA1 (patch-ae) = 7d0fa64ada11940169d0bfa076e25b65ff1f1d15 -SHA1 (patch-af) = f1eb1428667fb27bafe8aaca5bc6741b1a29d0fe +SHA1 (patch-ae) = 16be1db73a66f80b761eba564e097ee3170cc880 +SHA1 (patch-af) = bf2853988d9a14a1decdf412c215288b139c8550 +SHA1 (patch-ag) = 1f77cd2d2b7cd2fc49578d790eba03caacf2da82 +SHA1 (patch-ah) = f65cceda80667518f17626666d00b7bca694ae5c +SHA1 (patch-ai) = e1bc58ae818ac657389011fb7fb56a0e549a8b1f +SHA1 (patch-aj) = 7eb931047dd5e9e2b8a9b523da6c76e7ead78f65 diff --git a/time/plan/patches/patch-aa b/time/plan/patches/patch-aa index fa85b495aa8..9e6116fa6cd 100644 --- a/time/plan/patches/patch-aa +++ b/time/plan/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ +$NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $ ---- Makefile.orig 2000-07-17 16:07:03.000000000 -0400 -+++ Makefile 2004-06-10 18:02:25.000000000 -0400 +--- Makefile.orig 2000-07-17 20:07:03.000000000 +0000 ++++ Makefile @@ -8,19 +8,19 @@ # after "=", this is parsed and rewritten by the configure script. # @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ # # subdirectory in home dir, or empty PLANRULE= # # lockfile for plan, %d is uid -@@ -34,12 +34,12 @@ +@@ -34,12 +34,12 @@ LEX=lex # # standard Unix compiler generator YACC=yacc # # numerical user ID of account @@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ # # by default, fork on startup? TRUE or FALSE DOFORK=TRUE # # switching to ISO8859-1 -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ HOLIDAY=german # # do NOT define -O2 on DEC OSF/1 machines! DEBUG=-O2 # # what to do without make arguments @@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ #------------------------- end of configuration section ---------------------- OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\" -@@ -102,7 +102,7 @@ +@@ -102,7 +102,7 @@ DESTDIR= SGI4_C = SGI5_C = -DSYSV -DSVR4 -DDESKTOP @@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ HP8_C = -Aa -I/usr/include/Motif1.1 -I/usr/include/X11R4 -I/usr/include\ -D_INCLUDE_HPUX_SOURCE -D_INCLUDE_POSIX_SOURCE\ -D_INCLUDE_XOPEN_SOURCE -DNOREGEX -DFIXMBAR -DRABBITS -@@ -140,8 +140,7 @@ +@@ -140,8 +140,7 @@ NCR_C = -DNCR -DNOMSEP -DRABBITS USL_C = -DNOKILL0 -I/usr/X/include BSDI_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi BSDIG_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi @@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -DSTDLIBMALLOC LINUX_C = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -@@ -224,8 +223,8 @@ +@@ -224,8 +223,8 @@ BSDI_L1 = -lXm -lXt -lX11 BSDI_L2 = -lc BSDIG_L1= -L/usr/X11/lib -lXm -lXt -lX11 BSDIG_L2= -L/usr/X11/lib -lc @@ -84,16 +84,18 @@ $NetBSD: patch-aa,v 1.4 2004/06/10 22:42:42 jschauma Exp $ FBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext -lSM -lICE -lXpm FBSD_L2 = -L/usr/X11R6/lib -lc LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 -@@ -420,7 +419,7 @@ +@@ -419,8 +418,8 @@ bsdi: + bsdig: env CF="$(BSDIG_C)" L1F="$(BSDIG_L1)" L2F="$(BSDIG_L2)" MYCC=gcc make all - netbsd: +-netbsd: - env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAKE) all ++netbsd dragonfly: + env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=${CC} $(MAKE) all freebsd: env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all -@@ -569,34 +568,18 @@ +@@ -569,34 +568,18 @@ g_dbase.o g_dbfile.o g_formfile.o g_form #--------------------------------------------------------------- install: diff --git a/time/plan/patches/patch-ae b/time/plan/patches/patch-ae index d08f71777be..0973db9a842 100644 --- a/time/plan/patches/patch-ae +++ b/time/plan/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.1 2004/06/10 22:42:43 jschauma Exp $ +$NetBSD: patch-ae,v 1.2 2006/01/02 22:29:03 joerg Exp $ ---- g_dbfile.c.orig 2004-06-11 18:17:47.000000000 -0400 -+++ g_dbfile.c 2004-06-11 18:18:13.000000000 -0400 +--- g_dbfile.c.orig 1998-12-24 11:04:41.000000000 +0000 ++++ g_dbfile.c @@ -6,6 +6,7 @@ */ @@ -10,3 +10,11 @@ $NetBSD: patch-ae,v 1.1 2004/06/10 22:42:43 jschauma Exp $ #include #include #include +@@ -34,7 +35,6 @@ + #define R_SEP '\n' /* row (card) separator */ + #define ESC '\\' /* treat next char literally */ + +-extern int errno; + extern char *progname; /* argv[0] */ + extern Widget toplevel; /* top-level shell for icon name */ + diff --git a/time/plan/patches/patch-af b/time/plan/patches/patch-af index 4ef4e001b7f..54059165d1c 100644 --- a/time/plan/patches/patch-af +++ b/time/plan/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1 2004/06/10 22:42:43 jschauma Exp $ +$NetBSD: patch-af,v 1.2 2006/01/02 22:29:03 joerg Exp $ ---- netplan.c.orig 2004-06-11 18:18:30.000000000 -0400 -+++ netplan.c 2004-06-11 18:18:43.000000000 -0400 +--- netplan.c.orig 2000-03-21 20:57:40.000000000 +0000 ++++ netplan.c @@ -4,6 +4,7 @@ typedef void *Widget; /* dummy for prototype declarations in config.h */ @@ -10,3 +10,11 @@ $NetBSD: patch-af,v 1.1 2004/06/10 22:42:43 jschauma Exp $ #include #include #include +@@ -51,7 +52,6 @@ static struct pfile *file_list; /* array + struct client *client_list; /* array of clients (entry 0 unused) */ + static fd_set rd0, wr0, ex0; /* preset fd masks for main select */ + static time_t update_time; /* date of last unwritten change */ +-extern int errno; + static BOOL do_auth = FALSE;/* authentication required (identd) */ + static int netplan_port[2];/* ports we are listening on */ + static int fd_inet[2]; /* file descriptor for base socket */ diff --git a/time/plan/patches/patch-ag b/time/plan/patches/patch-ag new file mode 100644 index 00000000000..3e1723ed204 --- /dev/null +++ b/time/plan/patches/patch-ag @@ -0,0 +1,20 @@ +$NetBSD: patch-ag,v 1.1 2006/01/02 22:29:03 joerg Exp $ + +--- file_w.c.orig 2006-01-02 22:20:56.000000000 +0000 ++++ file_w.c +@@ -12,6 +12,7 @@ + #ifdef MIPS + #include + #include ++#include + #else + #include + #include +@@ -23,7 +24,6 @@ + + static BOOL writefile(struct plist *, char *, int, int); + +-extern int errno; + extern char *progname; /* argv[0] */ + extern struct config config; /* global configuration data */ + extern struct plist *mainlist; /* all schedule entries */ diff --git a/time/plan/patches/patch-ah b/time/plan/patches/patch-ah new file mode 100644 index 00000000000..4d447f051f8 --- /dev/null +++ b/time/plan/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.1 2006/01/02 22:29:03 joerg Exp $ + +--- g_formfile.c.orig 2006-01-02 22:23:01.000000000 +0000 ++++ g_formfile.c +@@ -35,7 +35,6 @@ char *itemname[NITEMS] = { + "None", "Label", "Print", "Input", "Time", "Note", "Choice", "Flag", + "Button", "Summary", "Chart" }; + +-extern int errno; + extern char *progname; /* argv[0] */ + extern Widget toplevel; /* top-level shell for error popups */ + diff --git a/time/plan/patches/patch-ai b/time/plan/patches/patch-ai new file mode 100644 index 00000000000..ed1f0dae456 --- /dev/null +++ b/time/plan/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2006/01/02 22:29:03 joerg Exp $ + +--- holiday.c.orig 2006-01-02 22:24:02.000000000 +0000 ++++ holiday.c +@@ -51,7 +51,7 @@ static int calc_pascha(int); + extern int yyparse(void); + + +-#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__) ++#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__DragonFly__) + int yylineno; + #else + extern int yylineno; /* current line # being parsed */ diff --git a/time/plan/patches/patch-aj b/time/plan/patches/patch-aj new file mode 100644 index 00000000000..eba574ff7bc --- /dev/null +++ b/time/plan/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.1 2006/01/02 22:29:03 joerg Exp $ + +--- daemon.c.orig 2006-01-02 22:25:46.000000000 +0000 ++++ daemon.c +@@ -110,7 +110,6 @@ extern time_t cutoff; /* all triggers + static BOOL reread; /* caught SIGHUP, re-read mainlist */ + static BOOL debug; /* print debugging information */ + static BOOL opt_t; /* TRUE if -t (tty) */ +-extern int errno; /* system error */ + + int curr_year; /* dummy for DST calculating routines*/ + Widget mainwindow; /* dummy for error popup in network.c*/ -- cgit v1.2.3