Updated plan to 1.9.

This for PR #36216. Thank you Steven for testing.

Sort some of PLIST.

Removed a few patches that were integrated or not needed.

Changes are:

====== 1.8.5 released 16.2.03 =======

FEATURES:
    * plan's FTP home site has a new name: plan.ftp.fu-berlin.de, shown in
      the About popup. The old address will continue to work. (Thanks, Heiko!)
    * set locale to support other character sets such as Czech, by Petr Kristan
      <petr.kristan@epos.cz>
    * OpenBSD port by Armin Wolfermann <armin.wolfermann@viscomp.com>
    * new plan2vcs perl script that converts plan appointments to korganizer
      format, by Bert Bos <bert@w3.org>
    * if there is a ~/.holiday file, don't read LIB/holiday as well.
    * skip junk in entries synced from PalmPilot DateBk4 messages, by Johan
      Vromans <jvromans@squirrel.nl>
    * allow new holiday syntax "workday before/after <date>", by Ian Holland
      <irh@statscout.com>
    * Italian language translations by Paolo Panizza <pp@ieee.org>
    * accept yyyy/mm/dd date input, Brian T. Schellenberger <bts@babbleon.org>
    * Slovak holidays by Mikulas Sustak <sustak@kte.sjf.stuba.sk>

BUG FIXES:
    * fixed Debian bug 157425: color selection dropbox always starts on Default
    * Suns apparently still run X11R5 and don't have XtSignalId et. al.
    * configure script had problems with defaults when using bash (Michael
      Mauch <michael.mauch@gmx.de>
    * fixed configure script problems on Solaris 2.6, by Horst Scheuermann
      <scheuerm@uni-trier.de>
    * fixed Dutch Driekoningen holiday date, by Johan Vromans
      <JVromans@squirrel.nl>
    * IBM AIX doesn't have Xt timers and doesn'd compile plan 1.8.4, excluded
      XFree workaround for IBM
    * week number 2 appeared twice in 2001. Fixed by Helmut Jarausch
      <jarausch@igpm.rwth-aachen.de>
    * Search->One file could not select the "own" file (top menu choice).
    * cleanup: removed remaining K&R varargs and sunkr target
    * fixed '@' user notation in netplan server, by Gennadi Umanski
      <umanskij@ti.uni-trier.de>
    * fixed Japanese string converion, by Tomoko Hayashi <tomoko@u-aizu.ac.jp>
    * other people's .dayplan file references ('L' lines in ~/.dayplan) over-
      wrote own file entries (Heiko Schlichting <heiko@FU-Berlin.DE>)


====== 1.8.6 released 18.3.03 =======

FEATURES:
    * reversed the change in 1.8.5, at popular demand, that lets a personal
      holiday file replace the system holiday file. plan 1.8.6 again reads
      both, system first. The new "reset" keywords can be used to clear all
      system holidays, following an idea by Heiko Schlichting.

BUG FIXES:
    * the edit menu was broken in 1.8.5, fixed by Heiko Schlichting
      <heiko@FU-Berlin.DE>


====== 1.8.7 released 30.9.03 =======

FEATURES:
    * deleted support for SCO
    * pland -p pops up all alarms that triggered since the last time pland
      ran, not just those from the past three hours, by Brian L. Shaver
      <shaker.lxxv@verizon.net>
    * more room for appointments in year overview, moved year to left edge

BUG FIXES:
    * newly entered appointments no longer vanish from the edit menu.
    * fixed errno compiler errors on SMP systems, Thomas Ribbrock
      <emgaron@gmx.net>
    * Italian language translations by Paolo Panizza <pp@ieee.org> were
      missing from the 1.8.5 and 1.8.6 distributions, now included


====== 1.9 released 6.2.05 =======

FEATURES:
    * saved space in various calendar views such as the year overview
    * the week view repeats the hour title every few day rows; it was too easy
      to get lost without scrolling all the time
    * remove obsolete warning windows when the next warning or the main alarm
      is reached.
    * Linux: when a lockfile from a previous plan process is found, do not kill
      it if it's dead and some non-plan process now uses the old process ID.
    * if user "netplan" exists on the system, netplan runs as that user instead
      of nobody. Needed for Debian. Petter Reinholdtsen <pere@hungry.com>
    * added Belgian French holiday file, Nicolas E'vrard <nicoe@wanadoo.be>
    * command-line option -V: experimental and incomplete vCalendar export.
      File can be read by calendar programs such as Mozilla Calendar.
    * plan is now distributed under the GPL license, at your choice.
    * netplan has a new option -s that sends all messages to syslog.

BUG FIXES:
    * fixed Italian language file, Carlo Mandelli
      <carlo.mandelli@consulenti.fastweb.it>
    * fixed misspelling in the Italian language file, littledark
      <littledark@swissinfo.org>
    * "Delete past entries" did not remove repeating entries whose end date is
      in the past, Aaron Kaplan <kaplan@cs.rochester.edu>
    * fixed choice 1 of configure script on Solaris, Aaron Kaplan
      <kaplan@cs.rochester.edu>
    * after running a long time (months), alarms stopped triggering. Fixed by
      Aaron Kaplan <kaplan@cs.rochester.edu>
    * fixed Spanish holiday file, Fernando Tricas "Garci'a"
      <ftricas@amon.cps.unizar.es>
    * fixed loads of inane gcc warning messages

11 files changed, 55 insertions, 134 deletions

diff --git a/time/plan/Makefile b/time/plan/Makefile
index 96622ed17d0..feeba0dac4a 100644
--- a/time/plan/Makefile
+++ b/time/plan/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2007/03/24 19:21:32 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/04/28 15:20:43 reed Exp $
 
-DISTNAME=	plan-1.8.4
-PKGREVISION=	3
+DISTNAME=	plan-1.9
 CATEGORIES=	x11 time
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/plan/
 
diff --git a/time/plan/distinfo b/time/plan/distinfo
index 39a6adb909e..a293a9f7b52 100644
--- a/time/plan/distinfo
+++ b/time/plan/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.7 2006/01/02 22:29:03 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/04/28 15:20:43 reed 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) = b3ad61ac09017d952f3c75fd3988edf436159e47
+SHA1 (plan-1.9.tar.gz) = 65afff961f801f888714993a9ed6e42a95b2d958
+RMD160 (plan-1.9.tar.gz) = 7bed3f29c62341c264c9edeb60666d83092139ea
+Size (plan-1.9.tar.gz) = 441599 bytes
+SHA1 (patch-aa) = 8909b4fab90facef041879bc41d81e84a3bd7430
 SHA1 (patch-ab) = 6670c398271e5ee6d32194c0b69850f381b5cc5c
-SHA1 (patch-ac) = 3e78546544e2b55e296068be4de31f6366cab2b0
-SHA1 (patch-ad) = f50e8e46e1ed503bf6f16c6cd31dd935e9251772
-SHA1 (patch-ae) = 16be1db73a66f80b761eba564e097ee3170cc880
-SHA1 (patch-af) = bf2853988d9a14a1decdf412c215288b139c8550
-SHA1 (patch-ag) = 1f77cd2d2b7cd2fc49578d790eba03caacf2da82
-SHA1 (patch-ah) = f65cceda80667518f17626666d00b7bca694ae5c
-SHA1 (patch-ai) = e1bc58ae818ac657389011fb7fb56a0e549a8b1f
-SHA1 (patch-aj) = 7eb931047dd5e9e2b8a9b523da6c76e7ead78f65
+SHA1 (patch-ae) = 64c71d707c8e99837a2395fc0cf115eb9f71d9cd
+SHA1 (patch-af) = 58fadadd62916452aa2036ddf9a26b7448149804
+SHA1 (patch-ag) = e99b6cf76ea463b9e75ee6760aaa1ad2e3a1afa1
+SHA1 (patch-ai) = c5cd47ea2bb004219df7807f107ff26fdcc53f51
diff --git a/time/plan/patches/patch-aa b/time/plan/patches/patch-aa
index 9e6116fa6cd..d203479b012 100644
--- a/time/plan/patches/patch-aa
+++ b/time/plan/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/28 15:20:42 reed Exp $
 
---- Makefile.orig	2000-07-17 20:07:03.000000000 +0000
-+++ Makefile
+--- Makefile.orig	2005-02-06 13:11:34.000000000 -0600
++++ Makefile	2007-04-26 09:15:40.000000000 -0500
 @@ -8,19 +8,19 @@
  # after "=", this is parsed and rewritten by the configure script.
  #
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $
 -LIB=/usr/local/lib
 +LIB=${PREFIX}/libexec/plan
  #				# help file (plan.help)
--SBIN=/usr/local/lib
+-SBIN=/usr/local/bin
 +SBIN=${LIB}
  #				# system programs (netplan)
 -HELP=/usr/local/lib
@@ -21,15 +21,15 @@ $NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $
 -NETPLANDIR=/usr/local/lib
 +NETPLANDIR=${LIB}
  #				# unformatted nroff manpage (plan.[14])
--MAN=/usr/local/man
-+MAN=${PREFIX}/man/man
+-MAN=/usr/local/man/man
++MAN=${PREFIX}/${PKGMANDIR}/man
  #				# formatted manpage (plan.[14])
 -CATMAN=/usr/catman/local/cat
-+CATMAN=${PREFIX}/man/cat
++CATMAN=${PREFIX}/${PKGMANDIR}/cat
  #				# subdirectory in home dir, or empty
  PLANRULE=
  #				# lockfile for plan, %d is uid
-@@ -34,12 +34,12 @@ LEX=lex
+@@ -34,12 +34,12 @@
  #				# standard Unix compiler generator
  YACC=yacc
  #				# numerical user ID of <nobody> account
@@ -45,46 +45,46 @@ $NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $
  #				# by default, fork on startup? TRUE or FALSE
  DOFORK=TRUE
  #				# switching to ISO8859-1
-@@ -55,7 +55,7 @@ HOLIDAY=german
- #				# do NOT define -O2 on DEC OSF/1 machines!
+@@ -57,7 +57,7 @@
+ DEBUG=-g
  DEBUG=-O2
  #				# what to do without make arguments
--DEFTARGET=help
+-DEFTARGET=linux
 +DEFTARGET=netbsd
  #------------------------- end of configuration section ----------------------
  
  OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
-@@ -102,7 +102,7 @@ DESTDIR=
+@@ -103,7 +103,7 @@
  
  SGI4_C	=
  SGI5_C	= -DSYSV -DSVR4 -DDESKTOP
--SGI6_C	= -n32 -mips3 -woff 1110,1167,1185 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
-+SGI6_C	= ${CFLAGS} -woff 1110,1167,1185 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
+-SGI6_C	= -n32 -mips3 -woff 1167 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
++SGI6_C	= ${CFLAGS} -woff 1167 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
  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 @@ NCR_C	= -DNCR -DNOMSEP -DRABBITS
+@@ -137,8 +137,7 @@
  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 
 -NBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
 -	  -DNO_MOTIF
-+NBSD_C	= ${CFLAGS} -ansi -DBSD -DRABBITS -DNOLOCK -DNOREGEX
++NBSD_C	= ${CFLAGS} -ansi -DBSD -DRABBITS -DNOLOCK -DNOREGEX 
  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 @@ BSDI_L1	= -lXm -lXt -lX11
+ OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
+@@ -217,8 +216,8 @@
  BSDI_L2	= -lc
  BSDIG_L1= -L/usr/X11/lib -lXm -lXt -lX11
  BSDIG_L2= -L/usr/X11/lib -lc
 -NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
 -NBSD_L2	= -L/usr/X11R6/lib -lc
-+NBSD_L1	= ${LDFLAGS} -lXm -lXt -lX11
++NBSD_L1	=  ${LDFLAGS} -lXm -lXt -lX11
 +NBSD_L2	= ${LDFLAGS} -lc
  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
-@@ -419,8 +418,8 @@ bsdi:
+ OBSD_L1	= -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11
+@@ -403,8 +402,8 @@
  bsdig:
  	env CF="$(BSDIG_C)" L1F="$(BSDIG_L1)" L2F="$(BSDIG_L2)" MYCC=gcc make all
  
@@ -95,7 +95,7 @@ $NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $
  
  freebsd:
  	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
-@@ -569,34 +568,18 @@ g_dbase.o g_dbfile.o g_formfile.o g_form
+@@ -556,34 +555,18 @@
  
  #---------------------------------------------------------------
  install:
@@ -115,15 +115,15 @@ $NetBSD: patch-aa,v 1.5 2006/01/02 22:29:03 joerg Exp $
 -	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
 -	mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
 -	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
--	-(test x'$(CATMAN)' != xNONE' -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
--	-(test x'$(CATMAN)' != xNONE' -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
--	-(test x'$(CATMAN)' != xNONE' -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
--	-(test x'$(MAN)'    != xNONE' -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan) || exit 0
--	-(test x'$(MAN)'    != xNONE' -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan) || exit 0
--	-(test x'$(MAN)'    != xNONE' -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan) || exit 0
--	-(test x'$(CATMAN)' != xNONE' -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan) || exit 0
--	-(test x'$(CATMAN)' != xNONE' -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan) || exit 0
--	-(test x'$(CATMAN)' != xNONE' -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan) || exit 0
+-	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
+-	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
+-	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
+-	-(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan) || exit 0
+-	-(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan) || exit 0
+-	-(test x'$(MAN)'    != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan) || exit 0
+-	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan) || exit 0
+-	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan) || exit 0
+-	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan) || exit 0
 -	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
 -	-(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
 -	-(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
diff --git a/time/plan/patches/patch-ac b/time/plan/patches/patch-ac
deleted file mode 100644
index f9e39c05aa5..00000000000
--- a/time/plan/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/17 23:32:23 wiz Exp $
-
---- ../holiday/holiday_austria.orig	Tue Aug 22 10:59:07 2000
-+++ ../holiday/holiday_austria
-@@ -14,7 +14,7 @@
- small "Gründonnerstag"		on easter minus 3 days
- small "Karfreitag"		on easter minus 2 days
- small "Karsamstag"		on easter minus 1 days
--small "Ostern"		weekend on easter length 2 days=20
-+small "Ostern"		weekend on easter length 2 days
- small "Pfingsten"	weekend on easter plus 49 days length 2 days
- small "Christi Himmelfahrt" weekend on easter plus 39 days
- small "Fronleichnam"	weekend on easter plus 60 days
diff --git a/time/plan/patches/patch-ad b/time/plan/patches/patch-ad
deleted file mode 100644
index 76571f2181d..00000000000
--- a/time/plan/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/17 23:32:23 wiz Exp $
-
---- linuxjunk.h.orig	Sat Nov  7 19:04:41 1998
-+++ linuxjunk.h
-@@ -16,6 +16,8 @@
-  * kill a good project with poor planning.
-  */
- 
-+#include <sys/stat.h>
-+
- #ifdef S_ISDIR
- #define IS_DIR(m) S_ISDIR(m)
- #else
diff --git a/time/plan/patches/patch-ae b/time/plan/patches/patch-ae
index 0973db9a842..1c93092ad09 100644
--- a/time/plan/patches/patch-ae
+++ b/time/plan/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2006/01/02 22:29:03 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2007/04/28 15:20:42 reed Exp $
 
 --- g_dbfile.c.orig	1998-12-24 11:04:41.000000000 +0000
 +++ g_dbfile.c
@@ -10,11 +10,3 @@ $NetBSD: patch-ae,v 1.2 2006/01/02 22:29:03 joerg Exp $
  #include <stdio.h>
  #include <stdlib.h>
  #include <time.h>
-@@ -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 54059165d1c..10d37388b70 100644
--- a/time/plan/patches/patch-af
+++ b/time/plan/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2006/01/02 22:29:03 joerg Exp $
+$NetBSD: patch-af,v 1.3 2007/04/28 15:20:42 reed Exp $
 
---- netplan.c.orig	2000-03-21 20:57:40.000000000 +0000
-+++ netplan.c
+--- netplan.c.orig	2005-01-26 12:55:34.000000000 -0600
++++ netplan.c	2007-04-26 09:01:01.000000000 -0500
 @@ -4,6 +4,7 @@
  
  typedef void *Widget;	/* dummy for prototype declarations in config.h */
@@ -10,11 +10,3 @@ $NetBSD: patch-af,v 1.2 2006/01/02 22:29:03 joerg Exp $
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
-@@ -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
index 3e1723ed204..8c8f52a0cf2 100644
--- a/time/plan/patches/patch-ag
+++ b/time/plan/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2006/01/02 22:29:03 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2007/04/28 15:20:43 reed Exp $
 
---- file_w.c.orig	2006-01-02 22:20:56.000000000 +0000
-+++ file_w.c
+--- file_w.c.orig	2005-01-09 03:56:32.000000000 -0600
++++ file_w.c	2007-04-26 09:01:01.000000000 -0500
 @@ -12,6 +12,7 @@
  #ifdef MIPS
  #include <sys/types.h>
@@ -10,11 +10,3 @@ $NetBSD: patch-ag,v 1.1 2006/01/02 22:29:03 joerg Exp $
  #else
  #include <unistd.h>
  #include <fcntl.h>
-@@ -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
deleted file mode 100644
index 4d447f051f8..00000000000
--- a/time/plan/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
index ed1f0dae456..92a73672bf9 100644
--- a/time/plan/patches/patch-ai
+++ b/time/plan/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2006/01/02 22:29:03 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2007/04/28 15:20:43 reed Exp $
 
---- holiday.c.orig	2006-01-02 22:24:02.000000000 +0000
-+++ holiday.c
-@@ -51,7 +51,7 @@ static int calc_pascha(int);
+--- holiday.c.orig	2005-01-09 03:44:34.000000000 -0600
++++ holiday.c	2007-04-26 09:22:32.000000000 -0500
+@@ -52,7 +52,7 @@
  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__)
+-#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)
++#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)||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
deleted file mode 100644
index eba574ff7bc..00000000000
--- a/time/plan/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$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*/