Update plan to 1.8.4. Changes include various bug fixes and the following

new features:

 * Changed configure script, Makefile, and manpages
 * another configure preset for SuSE Linux
 * new SysV alarm signals that prod the X timer events that write
   modified data, as a workaround for broken
 * netplan now listens on two ports (unless overriden in /etc/services):
   5444 for backwards compatibility, and
   2983, the new IANA-registered port.
 * "user" lines in netplan ACLs now accept "user@host" arguments
 * the "another plan window is running, kill/continue" popup now blocks
   until answered.
 * OpenMotif support (XFree 4.0.1, OpenMotif 2.1.30)
 * new options -N, -c, and -h to control more options when adding entries
   from the command line

8 files changed, 84 insertions, 62 deletions

diff --git a/misc/plan/Makefile b/misc/plan/Makefile
index cd6c118eaff..efdbddd634d 100644
--- a/misc/plan/Makefile
+++ b/misc/plan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2000/07/11 09:55:51 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/22 09:44:14 rh Exp $
 #
 
-DISTNAME=	plan-1.8.2
+DISTNAME=	plan-1.8.4
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	misc x11
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/plan/
diff --git a/misc/plan/files/md5 b/misc/plan/files/md5
index 58793c0aa5d..312bbdb4d15 100644
--- a/misc/plan/files/md5
+++ b/misc/plan/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/07/15 00:15:24 mjl Exp $
+$NetBSD: md5,v 1.4 2000/08/22 09:44:15 rh Exp $
 
-MD5 (plan-1.8.2.tar.gz) = 7070567facebf8b1b5eeb38934fa4ad2
+MD5 (plan-1.8.4.tar.gz) = 85f793084fbb88c4bb128c1d835c6b30
diff --git a/misc/plan/files/patch-sum b/misc/plan/files/patch-sum
index 02932670c62..bb37f83b805 100644
--- a/misc/plan/files/patch-sum
+++ b/misc/plan/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/07/15 00:15:24 mjl Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/22 09:44:15 rh Exp $
 
-MD5 (patch-aa) = c4a52b09e1edd279ce8dc1bff6be742d
-MD5 (patch-ab) = ba9c825ecf35bf64c4d0ab13fbc04991
+MD5 (patch-aa) = 86b197fcdc2ccc284ab1e6fdd50364c8
+MD5 (patch-ab) = f640fe7c551a99ad468275a57d01edf2
+MD5 (patch-ac) = d94f971a26acbc734e6ef8ec09971567
diff --git a/misc/plan/patches/patch-aa b/misc/plan/patches/patch-aa
index 2f7f1ba080c..d402d57770a 100644
--- a/misc/plan/patches/patch-aa
+++ b/misc/plan/patches/patch-aa
@@ -1,32 +1,35 @@
-$NetBSD: patch-aa,v 1.4 1999/07/15 00:15:25 mjl Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/22 09:44:16 rh Exp $
 
---- Makefile.orig	Wed Jul  7 22:24:27 1999
-+++ Makefile	Thu Jul 15 01:54:21 1999
-@@ -8,17 +8,17 @@
- # configure script.
+--- Makefile.orig	Mon Jul 17 22:07:03 2000
++++ Makefile
+@@ -8,19 +8,19 @@
+ # after "=", this is parsed and rewritten by the configure script.
  #
  #				# user-callable executable (plan)
 -DIR=/usr/local/bin
-+DIR=${X11BASE}/bin
- #				# auxiliary programs (pland, notifier, netplan)
++DIR=${PREFIX}/bin
+ #				# auxiliary programs (pland, notifier, PS)
 -LIB=/usr/local/lib
-+LIB=${X11BASE}/libexec/plan
++LIB=${PREFIX}/libexec/plan
  #				# help file (plan.help)
+-SBIN=/usr/local/lib
++SBIN=${LIB}
+ #				# system programs (netplan)
 -HELP=/usr/local/lib
-+HELP=${X11BASE}/share/plan
++HELP=${PREFIX}/share/plan
  #				# netplan expects netplan.dir/ here
 -NETPLANDIR=/usr/local/lib
 +NETPLANDIR=${LIB}
  #				# unformatted nroff manpage (plan.[14])
 -MAN=/usr/local/man
-+MAN=${X11BASE}/man/man
++MAN=${PREFIX}/man/man
  #				# formatted manpage (plan.[14])
 -CATMAN=/usr/catman/local/cat
-+CATMAN=${X11BASE}/cat/cat
++CATMAN=${PREFIX}/man/cat
  #				# subdirectory in home dir, or empty
  PLANRULE=
  #				# lockfile for plan, %d is uid
-@@ -32,12 +32,12 @@
+@@ -34,12 +34,12 @@
  #				# standard Unix compiler generator
  YACC=yacc
  #				# numerical user ID of <nobody> account
@@ -42,37 +45,37 @@ $NetBSD: patch-aa,v 1.4 1999/07/15 00:15:25 mjl Exp $
  #				# by default, fork on startup? TRUE or FALSE
  DOFORK=TRUE
  #				# switching to ISO8859-1
-@@ -53,7 +53,7 @@
+@@ -55,7 +55,7 @@
  #				# do NOT define -O2 on DEC OSF/1 machines!
  DEBUG=-O2
  #				# what to do without make arguments
--DEFTARGET=linux
+-DEFTARGET=help
 +DEFTARGET=netbsd
  #------------------------- end of configuration section ----------------------
  
  OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
-@@ -136,8 +136,7 @@
+@@ -140,8 +140,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 -I${X11BASE}/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX
++NBSD_C	= ${CFLAGS} -ansi -I${PREFIX}/include -I${X11BASE}/include -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
-@@ -220,8 +219,8 @@
+@@ -224,8 +223,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	= -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lXm -lXt -lX11
-+NBSD_L2	= -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lc
++NBSD_L1	= -Wl,-rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lXm -lXt -lX11
++NBSD_L2	= -Wl,-rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -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
-@@ -416,7 +415,7 @@
+@@ -420,7 +419,7 @@
  	env CF="$(BSDIG_C)" L1F="$(BSDIG_L1)" L2F="$(BSDIG_L2)" MYCC=gcc make all
  
  netbsd:
@@ -81,38 +84,44 @@ $NetBSD: patch-aa,v 1.4 1999/07/15 00:15:25 mjl Exp $
  
  freebsd:
  	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
-@@ -564,29 +563,15 @@
+@@ -569,34 +568,15 @@
  
  #---------------------------------------------------------------
  install:
--	cp plan $(DIR)
--	-rm -f $(DIR)/pland $(DIR)/notifier
--	cp pland notifier netplan ../misc/plan_cal.ps ../language/* $(LIB)
--	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(LIB)) || exit 0
--	cp ../language/plan.help $(HELP)
--	-strip $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
--	-chmod 755 $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
--	-chmod 644 $(HELP)/plan.help $(LIB)/plan_cal.ps $(LIB)/plan.lang.*
--	-(test x'$(JAPAN)' != x && chmod 644 $(LIB)/plan_calSJ.ps) || exit 0
--	-mkdir $(NETPLANDIR)/netplan.dir
+-	-rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
+-	mkdir -p $(DESTDIR)$(DIR)
+-	cp plan $(DESTDIR)$(DIR)
+-	mkdir -p $(DESTDIR)$(LIB)
+-	cp pland notifier ../misc/plan_cal.ps ../language/* $(DESTDIR)$(LIB)
+-	mkdir -p $(DESTDIR)$(SBIN)
+-	cp netplan $(DESTDIR)$(SBIN)
+-	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
+-	mkdir -p $(DESTDIR)$(HELP)
+-	cp ../language/plan.help $(DESTDIR)$(HELP)
+-	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
+-	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
+-	-chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
+-	-(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 -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
 +	${BSD_INSTALL_PROGRAM} plan $(DIR)
 +	${BSD_INSTALL_PROGRAM} pland notifier netplan ${LIB}
 +	${BSD_INSTALL_DATA} ../misc/plan_cal.ps ${LIB}
 +	${BSD_INSTALL_DATA} ../language/plan.* $(HELP)
 +	-mkdir -p $(NETPLANDIR)/netplan.dir
- 	-chmod 700 $(NETPLANDIR)/netplan.dir
--	-(test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
--	-(test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
--	-(test -x `which nroff` && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
--	-(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan) || exit 0
--	-(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan) || exit 0
--	-(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan) || exit 0
--	-(test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan) || exit 0
--	-(test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan) || exit 0
--	-(test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(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
++	-chmod 700 $(NETPLANDIR)/netplan.dir
 +	-(test -d $(MAN)1 && ${BSD_INSTALL_MAN} ../misc/plan.1 $(MAN)1/plan.1) || exit 0
 +	-(test -d $(MAN)4 && ${BSD_INSTALL_MAN} ../misc/plan.4 $(MAN)4/plan.4) || exit 0
 +	-(test -d $(MAN)1 && ${BSD_INSTALL_MAN} ../misc/netplan.1 $(MAN)1/netplan.1) || exit 0
diff --git a/misc/plan/patches/patch-ab b/misc/plan/patches/patch-ab
index 8497daafb20..f181d667fa0 100644
--- a/misc/plan/patches/patch-ab
+++ b/misc/plan/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 1999/07/15 00:15:25 mjl Exp $
+$NetBSD: patch-ab,v 1.4 2000/08/22 09:44:16 rh Exp $
 
---- time.c.orig	Thu Jul 15 01:28:59 1999
-+++ time.c	Thu Jul 15 01:30:08 1999
-@@ -241,7 +241,7 @@
- 		struct tm *gmt = gmtime(&now);
- 		zone = (gmt->tm_hour - h) * 3600;
+--- time.c.orig	Mon Oct 11 21:11:36 1999
++++ time.c
+@@ -244,7 +244,7 @@
+ 			zone += 24;
+ 		zone *= 3600;
  #else
 -#if defined(bsdi) || defined(SUN) || defined(SVR4) || defined(convex)
 +#if defined(bsdi) || defined(SUN) || defined(SVR4) || defined(convex) || defined(__NetBSD__)
diff --git a/misc/plan/patches/patch-ac b/misc/plan/patches/patch-ac
new file mode 100644
index 00000000000..9ba1ad288ca
--- /dev/null
+++ b/misc/plan/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/08/22 09:44:16 rh 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/misc/plan/pkg/DESCR b/misc/plan/pkg/DESCR
index 8e777afb89f..b4fca4e34c2 100644
--- a/misc/plan/pkg/DESCR
+++ b/misc/plan/pkg/DESCR
@@ -1,12 +1,10 @@
 Plan is a schedule planner based on X/Motif. It displays a month calendar
 similar to xcal, but every day box is large enough to show appointments in
 small print. By pressing on a day box, the appointments for that day can be
-listed and edited. Appointments are entered with the following information
-(everything except the time is optional):
+listed and edited. Appointments are entered with the following information:
 
 - the date, time, and length (time and days) of the appointment,
-- an optional text message to be printed,
-- an optional script to be executed,
+- an optional text message and an optional script to be executed,
 - early-warn and late-warn triggers that precede the alarm time
 - repetitions: [n-th] weekdays, days-of-the-month, every n days, yearly
 - optional fast command-line appointment entry
diff --git a/misc/plan/pkg/PLIST b/misc/plan/pkg/PLIST
index 10e5ce061d0..19ad1e3d9a5 100644
--- a/misc/plan/pkg/PLIST
+++ b/misc/plan/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/07/15 00:15:25 mjl Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/08/22 09:44:17 rh Exp $
 bin/plan
 libexec/plan/pland
 libexec/plan/notifier
@@ -22,6 +22,7 @@ share/plan/holiday/holiday_finnish
 share/plan/holiday/holiday_french
 share/plan/holiday/holiday_frswiss
 share/plan/holiday/holiday_german
+share/plan/holiday/holiday_greek
 share/plan/holiday/holiday_hungary
 share/plan/holiday/holiday_italy
 share/plan/holiday/holiday_japan