Update to 1.8.2.

Changes from 1.7.2 include:

if the X server fails to send X timer events, switch to synchronous file
writing to avoid data loss. Works around bug or incompatibility in XFree.
new script to convert Microsoft Schedule+ files to .dayplan format
fixed output of -W -i for web interface
the .plan.dir choice in the configure script caused path trouble in plan
weekday before/after syntax was wrong in holiday parser,
fixed possible crash when closing file list menu
plan -F: stdout could not be redirected, added missing fflush
various error popups are now modal, to prevent them from being overlooked
fixed month and year PostScript printing, texts were in the wrong places
CGI scripts and HTML pages for web browser access
national language support
simple Todo appointments that keep appearing after they first trigger
implemented default advance-warning times (Config->Calendar views)
color PostScript printouts
new config mode that allows daemon to exeute insecure netplan scripts
new config mode that makes Thursday the selector for the first week
small holidays crash day view
if pland was started between 0:00 and 2:59:59, it overlooked appointments
fixed "W:" note prefix
netplan identd queries went to the local host instead of the remote host
fixed Y2K problem in PostScript printout.
plan -t/-T will now mark warnings with "Warn:".
notifier now resizes correctly, text area grows instead of buttons
user ID was freed twice in netplan
it is now possible to inspect messages attached to read-only appts
plan -t had multiday problems

6 files changed, 108 insertions, 82 deletions

diff --git a/misc/plan/Makefile b/misc/plan/Makefile
index a3929560c2e..99c4494bb71 100644
--- a/misc/plan/Makefile
+++ b/misc/plan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1999/01/29 19:49:11 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/15 00:15:23 mjl Exp $
 #
 
-DISTNAME=	plan-1.7.2
-WRKSRC=		${WRKDIR}/src
+DISTNAME=	plan-1.8.2
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	misc x11
 MASTER_SITES=	ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
 
@@ -16,9 +16,9 @@ ALL_TARGET=	netbsd
 pre-install:
 	${MKDIR} ${X11BASE}/libexec/plan ${X11BASE}/share/plan \
 		${X11BASE}/share/plan/holiday
-	${INSTALL_DATA} ${WRKDIR}/holiday/holiday_* ${X11BASE}/share/plan/holiday
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/holiday/holiday_* ${X11BASE}/share/plan/holiday
 .for file in HISTORY README
-	${INSTALL_DATA} ${WRKDIR}/${file} ${X11BASE}/share/plan
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${file} ${X11BASE}/share/plan
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/plan/files/md5 b/misc/plan/files/md5
index 9c15771fd9a..58793c0aa5d 100644
--- a/misc/plan/files/md5
+++ b/misc/plan/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/01/29 19:49:26 tron Exp $
+$NetBSD: md5,v 1.3 1999/07/15 00:15:24 mjl Exp $
 
-MD5 (plan-1.7.2.tar.gz) = 0dac73da57e85d101d6060cb222a938f
+MD5 (plan-1.8.2.tar.gz) = 7070567facebf8b1b5eeb38934fa4ad2
diff --git a/misc/plan/files/patch-sum b/misc/plan/files/patch-sum
index 19124209c17..02932670c62 100644
--- a/misc/plan/files/patch-sum
+++ b/misc/plan/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/15 00:15:24 mjl Exp $
 
-MD5 (patch-aa) = d84edfb85f3f187c5eb02fb863828c6f
-MD5 (patch-ab) = c3a416ec16dee35f29731524978d73ec
+MD5 (patch-aa) = c4a52b09e1edd279ce8dc1bff6be742d
+MD5 (patch-ab) = ba9c825ecf35bf64c4d0ab13fbc04991
diff --git a/misc/plan/patches/patch-aa b/misc/plan/patches/patch-aa
index 1c4f940a261..2f7f1ba080c 100644
--- a/misc/plan/patches/patch-aa
+++ b/misc/plan/patches/patch-aa
@@ -1,44 +1,57 @@
-$NetBSD: patch-aa,v 1.3 1999/01/29 19:49:45 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/07/15 00:15:25 mjl Exp $
 
---- Makefile.orig	Sat May  9 22:21:09 1998
-+++ Makefile	Thu Sep  3 23:15:04 1998
-@@ -6,18 +6,18 @@
- # DO NOT put a blank between the path and the #, or you'll get compile errors.
+--- Makefile.orig	Wed Jul  7 22:24:27 1999
++++ Makefile	Thu Jul 15 01:54:21 1999
+@@ -8,17 +8,17 @@
+ # configure script.
  #
- 
--DIR  = /usr/local/bin#		# user-callable executable (plan)
--LIB  = /usr/local/lib#		# auxiliary programs (pland, notifier, netplan)
--HELP = $(LIB)#			# help file (plan.help)
-+DIR  = ${X11BASE}/bin#		# user-callable executable (plan)
-+LIB  = ${X11BASE}/libexec/plan#	# auxiliary programs (pland, notifier, netplan)
-+HELP = ${X11BASE}/share/plan#	# help file (plan.help)
- NETPLANDIR = $(LIB)#		# netplan expects netplan.dir/ here
- # NETPLANDIR = "/var/lib/plan"#	# use this for Debian Linux
--MAN  = /usr/man/local/man#	# unformatted nroff manpage (plan.[14])
-+MAN  = ${X11BASE}/man/man#		# unformatted nroff manpage (plan.[14])
- # MAN = /usr/local/man/man#	# for linux
--CATMAN = /usr/catman/local/cat#	# formatted manpage (plan.[14])
-+CATMAN = ${X11BASE}/cat/cat#	# formatted manpage (plan.[14])
- INCDIR =#			# extra cc options, e.g. "-I/var/include"
--NOB_UID = 60001#		# numerical user ID of <nobody> account
--NOB_GID = 60001#		# default numerical group ID of <nobody> account
--CPP_PATH="/lib/cpp -P -I$(HELP)"# used by plan to pre-process holiday files,
-+NOB_UID = 39#			# numerical user ID of <nobody> account
-+NOB_GID = 39#			# default numerical group ID of <nobody> account
-+CPP_PATH="/usr/bin/cpp -P -I$(HELP)"# used by plan to pre-process holiday files,
+ #				# user-callable executable (plan)
+-DIR=/usr/local/bin
++DIR=${X11BASE}/bin
+ #				# auxiliary programs (pland, notifier, netplan)
+-LIB=/usr/local/lib
++LIB=${X11BASE}/libexec/plan
+ #				# help file (plan.help)
+-HELP=/usr/local/lib
++HELP=${X11BASE}/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
+ #				# formatted manpage (plan.[14])
+-CATMAN=/usr/catman/local/cat
++CATMAN=${X11BASE}/cat/cat
+ #				# subdirectory in home dir, or empty
+ PLANRULE=
+ #				# lockfile for plan, %d is uid
+@@ -32,12 +32,12 @@
+ #				# standard Unix compiler generator
+ YACC=yacc
+ #				# numerical user ID of <nobody> account
+-NOB_UID=60001
++NOB_UID=39
+ #				# default numerical group ID of <nobody>
+-NOB_GID=60001
++NOB_GID=39
+ # 				# used by plan to pre-process holiday files,
  #				# plan will check if this file really exists
- ESCTOISOLATIN=\"\\033\(B\"#	# switching to ISO8859-1
- ESCTOJISLATIN=\"\\033\(J\"#	# switching to JIS X0201-1976 roman
-@@ -28,7 +28,7 @@
- #        -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
- #				# JAPAN requires X11R5 and a Japanese env.
- 
--DEBUG = -g
-+#DEBUG = -g
- #DEBUG = -O2#			# do NOT define -O2 on DEC OSF/1 machines!
- #DEBUG =
+-CPP_PATH='/lib/cpp -P -I$(HELP)'
++CPP_PATH='/usr/bin/cpp -P -I$(HELP)'
+ #				# by default, fork on startup? TRUE or FALSE
+ DOFORK=TRUE
+ #				# switching to ISO8859-1
+@@ -53,7 +53,7 @@
+ #				# do NOT define -O2 on DEC OSF/1 machines!
+ DEBUG=-O2
+ #				# what to do without make arguments
+-DEFTARGET=linux
++DEFTARGET=netbsd
+ #------------------------- end of configuration section ----------------------
  
-@@ -113,8 +113,7 @@
+ OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
+@@ -136,8 +136,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 
@@ -48,55 +61,61 @@ $NetBSD: patch-aa,v 1.3 1999/01/29 19:49:45 tron Exp $
  FBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
  	  -DSTDLIBMALLOC
  LINUX_C	= -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX
-@@ -195,8 +194,8 @@
+@@ -220,8 +219,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	= -L${X11BASE}/lib -lXm -lXt -lX11
-+NBSD_L2	= -L${X11BASE}/lib -lc
- FBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext
++NBSD_L1	= -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lXm -lXt -lX11
++NBSD_L2	= -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
-@@ -528,31 +527,19 @@
+@@ -416,7 +415,7 @@
+ 	env CF="$(BSDIG_C)" L1F="$(BSDIG_L1)" L2F="$(BSDIG_L2)" MYCC=gcc make all
+ 
+ netbsd:
+-	env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAKE) all
++	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
+@@ -564,29 +563,15 @@
  
  #---------------------------------------------------------------
  install:
 -	cp plan $(DIR)
 -	-rm -f $(DIR)/pland $(DIR)/notifier
--	cp pland notifier netplan ../misc/plan_cal.ps $(LIB)
+-	cp pland notifier netplan ../misc/plan_cal.ps ../language/* $(LIB)
 -	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(LIB)) || exit 0
--	cp ../misc/plan.help $(HELP)
+-	cp ../language/plan.help $(HELP)
 -	-strip $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
-+	${BSD_INSTALL_PROGRAM} plan $(DIR)
-+	${BSD_INSTALL_PROGRAM} pland notifier netplan $(LIB)
-+	${BSD_INSTALL_DATA} ../misc/plan_cal.ps $(LIB)
-+	${BSD_INSTALL_DATA} ../misc/plan.help $(HELP)
- 	-chmod 755 $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
- 	-chmod 644 $(HELP)/plan.help $(LIB)/plan_cal.ps
+-	-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 $(LIB)/netplan.dir
-+	-mkdir -p $(LIB)/netplan.dir
- 	-chmod 700 $(LIB)/netplan.dir
+-	-mkdir $(NETPLANDIR)/netplan.dir
++	${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.1) || exit 0
--	-(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4) || exit 0
--	-(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan.1) || exit 0
--	-(test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1) || exit 0
--	-(test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4) || exit 0
--	-(test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan.1) || exit 0
--	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_german ${HOME}/.holiday) || 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
 +	-(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
  	@echo ""
--	@echo "use ../holiday/* as templates for your ~/.holiday file"
-+	@echo "Use " ${X11BASE}"/share/plan/holiday/* as templates for your ~/.holiday file."
+ 	@echo "use ../holiday/* as templates for your ~/.holiday file"
  
- clean:
- 	-rm -f *.o
diff --git a/misc/plan/patches/patch-ab b/misc/plan/patches/patch-ab
index eade3d69e0b..8497daafb20 100644
--- a/misc/plan/patches/patch-ab
+++ b/misc/plan/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.2 1999/01/29 19:49:45 tron Exp $
+$NetBSD: patch-ab,v 1.3 1999/07/15 00:15:25 mjl Exp $
 
---- time.c-orig	Wed Jan 14 21:36:09 1998
-+++ time.c	Wed Dec 30 10:48:35 1998
-@@ -232,7 +232,7 @@
- 		dst  = zone - 3600;
- 		dst  = 0;	/* jmorriso@bogomips.ee.ubc.ca 28.8.94 */
+--- 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;
  #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/pkg/PLIST b/misc/plan/pkg/PLIST
index d7c49b365f1..10e5ce061d0 100644
--- a/misc/plan/pkg/PLIST
+++ b/misc/plan/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/01/29 19:49:59 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/07/15 00:15:25 mjl Exp $
 bin/plan
 libexec/plan/pland
 libexec/plan/notifier
@@ -22,7 +22,6 @@ share/plan/holiday/holiday_finnish
 share/plan/holiday/holiday_french
 share/plan/holiday/holiday_frswiss
 share/plan/holiday/holiday_german
-share/plan/holiday/holiday_german.orig
 share/plan/holiday/holiday_hungary
 share/plan/holiday/holiday_italy
 share/plan/holiday/holiday_japan
@@ -32,7 +31,15 @@ share/plan/holiday/holiday_spain
 share/plan/holiday/holiday_swedish
 share/plan/holiday/holiday_uk
 share/plan/holiday/holiday_us
+share/plan/holiday/holiday_combi
+share/plan/holiday/holiday_czech
+share/plan/holiday/holiday_portugal
 share/plan/plan.help
+share/plan/plan.lang.dutch
+share/plan/plan.lang.english
+share/plan/plan.lang.french
+share/plan/plan.lang.german
+share/plan/plan.lang.spanish
 @dirrm share/plan/holiday
 @dirrm share/plan
 @dirrm libexec/plan