Upgrade to 1.6.1.

PR:		3189
Submitted by:	Daniel Eischen <deischen@iworks.InterWorks.org>

5 files changed, 179 insertions, 233 deletions

diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index dcf77d8f6e5..451854ed11e 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	plan
-# Version required:			1.5.1
+# Version required:			1.6
 # Date created:				14 April 1996
 # Whom:	Daniel Eischen <deischen@iworks.InterWorks.org>
 #
-# $Id: Makefile,v 1.4 1996/11/18 09:54:18 asami Exp $
+# $Id: Makefile,v 1.5 1997/03/11 23:40:08 asami Exp $
 #
 
-DISTNAME=	plan-1.5.1
+DISTNAME=	plan-1.6.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	deischen@iworks.InterWorks.org
 
 REQUIRES_MOTIF=	yes
-MAN1=		plan.1
+MAN1=		netplan.1 plan.1
 MAN4=		plan.4
 
 .include <bsd.port.mk>
diff --git a/deskutils/plan/distinfo b/deskutils/plan/distinfo
index 6af4a35259f..4b14c578994 100644
--- a/deskutils/plan/distinfo
+++ b/deskutils/plan/distinfo
@@ -1 +1 @@
-MD5 (plan-1.5.1.tar.gz) = 682b384f66bd1c641ea87a7dde730737
+MD5 (plan-1.6.1.tar.gz) = 0003e582b34a80c1250cf7d3c476e7c2
diff --git a/deskutils/plan/files/patch-ab b/deskutils/plan/files/patch-ab
index fbcedffd7b8..9accb6ffb47 100644
--- a/deskutils/plan/files/patch-ab
+++ b/deskutils/plan/files/patch-ab
@@ -1,209 +1,152 @@
-*** src/Makefile.orig	Sun Apr 14 15:55:22 1996
---- src/Makefile	Tue Apr 16 18:41:20 1996
-***************
-*** 6,21 ****
-  # DO NOT put a blank between the path and the #, or you'll get compile errors.
-  #
-  
-! DIR  = /usr/local/bin#		# user-callable executable (plan)
-! LIB  = /usr/local/lib#		# auxiliary programs (pland, notifier, netplan)
-! HELP = $(LIB)#			# help file (plan.help)
-! MAN  = /usr/man/local/man#	# unformatted nroff manpage (plan.[14])
-! # MAN = /usr/local/man/man#	# for linux
-  CATMAN = /usr/catman/local/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,
-  #				# plan will check if this file really exists
-  ESCTOISOLATIN=\"\\033\(B\"#	# switching to ISO8859-1
-  ESCTOJISLATIN=\"\\033\(J\"#	# switching to JIS X0201-1976 roman
---- 6,26 ----
-  # DO NOT put a blank between the path and the #, or you'll get compile errors.
-  #
-  
-! PLANBASE = /usr/local#
-! DOCBASE = $(PLANBASE)/share/doc/plan#
-! NETPLAN  = $(PLANBASE)/share#	# netplan directory
-! 
-! DIR  = $(PLANBASE)/bin#		# user-callable executable (plan)
-! LIB = $(DIR)#         		# auxiliary programs (pland, notifier, netplan)
-! EXAMPLES = $(DOCBASE)/examples#	# Example holiday files
-! DOCS = $(DOCBASE)#		# doc files
-! #MAN  = /usr/man/local/man#	# unformatted nroff manpage (plan.[14])
-! MAN = $(PLANBASE)/man/man#	# for linux and freebsd
-  CATMAN = /usr/catman/local/cat#	# formatted manpage (plan.[14])
-  INCDIR =#			# extra cc options, e.g. "-I/var/include"
-! NOB_UID = 65534#		# numerical user ID of <nobody> account
-! NOB_GID = 65534#		# default numerical group ID of <nobody> account
-! CPP_PATH="/usr/bin/cpp -P -I$(DOCS)"# 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
-***************
-*** 26,32 ****
-  #        -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
-  #				# JAPAN requires X11R5 and a Japanese env.
-  
-! DEBUG = -g
-  #DEBUG = -O2 -s			# do NOT define -O2 on DEC OSF/1 machines!
-  
-  #DEFTARGET = sgi
---- 31,37 ----
-  #        -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
-  #				# JAPAN requires X11R5 and a Japanese env.
-  
-! #DEBUG = -g
-  #DEBUG = -O2 -s			# do NOT define -O2 on DEC OSF/1 machines!
-  
-  #DEFTARGET = sgi
-***************
-*** 54,59 ****
---- 59,66 ----
-  #	-DVARARGS	use pre-ANSI varargs instead of stdargs
-  #	-DDESTROYBUG	fixes Linux XtDestroyWidget bug that kills plan when a
-  #			Done button is used. WARNING: introduces a memory leak
-+ #	-DSTDLIBMALLOC	do not include <malloc.h>, use <stdlib.h> instead,
-+ #			(FreeBSD)
-  #
-  # Note for HP systems: if you have the PROG-AUX option, remove -DNOREGEX
-  # from HP_C, and add -lPW to HP_L1. On Suns, try removing -DNOREGEX (and
-***************
-*** 104,109 ****
---- 111,119 ----
-  BSDIG_C	= -ansi -I/usr/X11/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX -Dbsdi
-  NBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
-  	  -DNO_MOTIF
-+ FBSD_C	= $(CFLAGS) -ansi -I/usr/X11R6/include -DBSD -DFLOCK -DRABBITS -Dfreebsd -DSTDLIBMALLOC
-+ IBM_C	= -O -I/usr/include/X11 -D_ALL_SOURCE -DIBM -DAIXV3 -DNOMSEP -DRABBITS
-+ PS2_C	= -O -I/usr/include/X11 -D_POSIX_SOURCE\
-  LINUX_C	= -D_POSIX_SOURCE -DNOLOCK -DLINUX
-  SVR4_C	= -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
-  NEWS_C	= -DNEWSOS4 -DSUN -DBSD -DRABBITS -DPID_T="int" -Dconst=""
-***************
-*** 179,184 ****
---- 189,196 ----
-  BSDIG_L2= -L/usr/X11/lib -lc
-  NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
-  NBSD_L2	= -L/usr/X11R6/lib -lc
-+ FBSD_L1	= -L/usr/X11R6/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
-+ FBSD_L2	= -lc
-  LINUX_L1= -lXm -lXt -lX11 -lXpm -lc
-  LINUX_L2= -lc
-  SVR4_L1	= -lXm -lXt -lX11 -lgen -lsocket -lnsl
-***************
-*** 236,241 ****
---- 248,254 ----
-  	@echo "  make bsdi      BSDI/386"
-  	@echo "  make bsdig     BSDI/386 with gcc"
-  #	@echo "  make netbsd	NetBSD/i386 1.0A (maybe others too)"
-+ 	@echo "  make freebsd   FreeBSD 2.x"
-  	@echo "  make svr4      SVR4 Using gcc"
-  	@echo "  make news4     Sony NEWS-OS4.x"
-  	@echo "  make news4g    Sony NEWS-OS4.x with gcc"
-***************
-*** 344,349 ****
---- 357,365 ----
-  netbsd:
-  	env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAK all
-  
-+ freebsd:
-+ 	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
-+ 
-  svr4:
-  	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
-  
-***************
-*** 437,449 ****
-  	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-  
-  holiday.o: holiday.c Makefile
-! 	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
-  
-  lock.o: lock.c
-! 	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
-  
-  netplan.o: netplan.c netplan_if.h
-! 	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-  #	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$3}'` -DNOBODY_GID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$4}'` $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-  
-  parser.c: parser.y
---- 453,465 ----
-  	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-  
-  holiday.o: holiday.c Makefile
-! 	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(DOCS)\" $<
-  
-  lock.o: lock.c
-! 	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(DOCS)\" $<
-  
-  netplan.o: netplan.c netplan_if.h
-! 	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) $(INCDIR) -c -DLIB=\"$(NETPLAN)\" $<
-  #	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$3}'` -DNOBODY_GID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$4}'` $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-  
-  parser.c: parser.y
-***************
-*** 465,492 ****
-  
-  #---------------------------------------------------------------
-  install:
-! 	cp plan $(DIR)
-! 	-rm -f $(DIR)/pland $(DIR)/notifier
-! 	cp pland notifier netplan ../misc/plan_cal.ps $(LIB)
-! 	@if [ '$(JAPAN)' ]; then cp ../misc/plan_calSJ.ps $(LIB); fi
-! 	cp ../misc/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
-! 	@if [ '$(JAPAN)' ]; then chmod 644 $(LIB)/plan_calSJ.ps; fi
-! 	-mkdir $(LIB)/netplan.dir
-! 	-chmod 777 $(LIB)/netplan.dir
-  	-test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat
-  	-test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat
-  	-test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1
-  	-test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4
-! 	-test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1
-! 	-test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4
-! 	-test -f ${HOME}/.holiday || cp ../holiday/holiday_german ${HOME}/.holiday
-! 	-test `uname` = IRIX && mkdir $$HOME/.icons
-! 	-test `uname` = IRIX && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon
-  	@echo ""
-! 	@echo "use ../holiday/* as templates for your ~/.holiday file"
-  
-  clean:
-  	-rm -f *.o
---- 481,514 ----
-  
-  #---------------------------------------------------------------
-  install:
-! 	-mkdir -p $(DOCBASE)
-! 	-mkdir -p $(EXAMPLES)
-! 	cp pland $(DIR)
-! 	cp notifier netplan plan ../misc/Killpland $(LIB)
-! 	cp ../misc/plan.help ../misc/plan_cal.ps ../misc/Mkdoc \
-! 	   ../misc/Mkdoc.nawk ../misc/Monochrome ../misc/BlackWhite $(DOCS)
-! 	-strip $(DIR)/plan $(DIR)/pland $(DIR)/notifier $(DIR)/netplan
-! 	-chmod 755 $(DIR)/plan
-! 	-chmod 755 $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
-! 	-chmod 644 $(DOCS)/plan.help $(DOCS)/plan_cal.ps
-! 	-chmod 755 $(DOCS)/Mkdoc $(DOCS)/Mkdoc.nawk
-! 	-chmod 644 $(DOCS)/Monochrome $(DOCS)/BlackWhite
-! 	-chmod 755 $(LIB)/Killpland
-! 	-mkdir $(NETPLAN)/netplan.dir
-! 	-chmod 777 $(NETPLAN)/netplan.dir
-  	-test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat
-  	-test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat
-  	-test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1
-  	-test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4
-! #	-test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1
-! #	-test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4
-! #	-test -f ${HOME}/.holiday || cp ../holiday/holiday_german ${HOME}/.holiday
-! 	-test -d $(EXAMPLES) && cp ../holiday/holiday_* $(EXAMPLES)
-! 	-test -f ../README && cp ../README $(DOCS)
-! #	-test `uname` = IRIX && mkdir $$HOME/.icons
-! #	-test `uname` = IRIX && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon
-  	@echo ""
-! 	@echo "Use $(EXAMPLES)/* as templates for your ~/.holiday file"
-  
-  clean:
-  	-rm -f *.o
+--- src/Makefile.orig	Sun Apr 13 21:50:29 1997
++++ src/Makefile	Thu Jun 19 14:11:42 1997
+@@ -6,16 +6,22 @@
+ # DO NOT put a blank between the path and the #, or you'll get compile errors.
+ #
+ 
+-DIR  = /usr/local/bin#		# user-callable executable (plan)
+-LIB  = /usr/local/lib#		# auxiliary programs (pland, notifier, netplan)
+-HELP = $(LIB)#			# help file (plan.help)
+-MAN  = /usr/man/local/man#	# unformatted nroff manpage (plan.[14])
+-# MAN = /usr/local/man/man#	# for linux
++PLANBASE = /usr/local#
++DOCBASE = $(PLANBASE)/share/doc/plan#
++NETPLAN  = $(PLANBASE)/share#	# netplan directory
++
++DIR  = $(PLANBASE)/bin#		# user-callable executable (plan)
++LIB = $(DIR)#         		# auxiliary programs (pland, notifier, netplan)
++EXAMPLES = $(DOCBASE)/examples#	# Example holiday files
++DOCS = $(DOCBASE)#		# doc files
++HELP = $(DOCBASE)#              # help file (plan.help)
++#MAN  = /usr/man/local/man#	# unformatted nroff manpage (plan.[14])
++MAN = $(PLANBASE)/man/man#	# for linux and freebsd
+ CATMAN = /usr/catman/local/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 = 65534#		# numerical user ID of <nobody> account
++NOB_GID = 65534#		# default numerical group ID of <nobody> account
++CPP_PATH="/usr/bin/cpp -P -I$(DOCS)"# 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
+@@ -26,9 +32,9 @@
+ #        -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
+ #				# JAPAN requires X11R5 and a Japanese env.
+ 
+-DEBUG = -s
++#DEBUG = -s
+ #DEBUG = -g
+-#DEBUG = -O2 -s			# do NOT define -O2 on DEC OSF/1 machines!
++DEBUG = -O2 -s			# do NOT define -O2 on DEC OSF/1 machines!
+ 
+ #DEFTARGET = sgi
+ DEFTARGET = help
+@@ -55,6 +61,8 @@
+ #	-DVARARGS	use pre-ANSI varargs instead of stdargs
+ #	-DDESTROYBUG	fixes Linux XtDestroyWidget bug that kills plan when a
+ #			Done button is used. WARNING: introduces a memory leak
++#	-DSTDLIBMALLOC	do not include <malloc.h>, use <stdlib.h> instead,
++#			(FreeBSD)
+ #
+ # Note for HP systems: if you have the PROG-AUX option, remove -DNOREGEX
+ # from HP_C, and add -lPW to HP_L1. On Suns, try removing -DNOREGEX (and
+@@ -105,6 +113,9 @@
+ BSDIG_C	= -ansi -I/usr/X11/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX -Dbsdi
+ NBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
+ 	  -DNO_MOTIF
++FBSD_C	= $(CFLAGS) -ansi -I/usr/X11R6/include -DBSD -DFLOCK -DRABBITS -Dfreebsd -DSTDLIBMALLOC
++IBM_C	= -O -I/usr/include/X11 -D_ALL_SOURCE -DIBM -DAIXV3 -DNOMSEP -DRABBITS
++PS2_C	= -O -I/usr/include/X11 -D_POSIX_SOURCE\
+ LINUX_C	= -D_POSIX_SOURCE -DNOLOCK -DLINUX
+ SVR4_C	= -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
+ NEWS_C	= -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DPID_T="int" -Dconst=""
+@@ -181,6 +192,8 @@
+ BSDIG_L2= -L/usr/X11/lib -lc
+ NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
+ NBSD_L2	= -L/usr/X11R6/lib -lc
++FBSD_L1	= -L/usr/X11R6/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
++FBSD_L2	= -lc
+ LINUX_L1= -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext
+ LINUX_L2= -lc
+ SVR4_L1	= -lXm -lXt -lX11 -lgen -lsocket -lnsl
+@@ -240,6 +253,7 @@
+ 	@echo "  make bsdi      BSDI/386"
+ 	@echo "  make bsdig     BSDI/386 with gcc"
+ #	@echo "  make netbsd	NetBSD/i386 1.0A (maybe others too)"
++	@echo "  make freebsd   FreeBSD 2.x"
+ 	@echo "  make svr4      SVR4 Using gcc"
+ 	@echo "  make news4     Sony NEWS-OS4.x"
+ 	@echo "  make news4g    Sony NEWS-OS4.x with gcc"
+@@ -349,6 +363,9 @@
+ netbsd:
+ 	env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAKE) all
+ 
++freebsd:
++	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
++
+ svr4:
+ 	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
+ 
+@@ -451,13 +468,13 @@
+ 	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
+ 
+ holiday.o: holiday.c Makefile
+-	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
++	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(DOCS)\" $<
+ 
+ util.o: util.c
+ 	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
+ 
+ netplan.o: netplan.c netplan_if.h
+-	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
++	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) $(INCDIR) -c -DLIB=\"$(NETPLAN)\" $<
+ #	$(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$3}'` -DNOBODY_GID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$4}'` $(INCDIR) -c -DLIB=\"$(LIB)\" $<
+ 
+ parser.c: parser.y
+@@ -480,31 +497,25 @@
+ 
+ #---------------------------------------------------------------
+ install:
+-	cp plan $(DIR)
+-	-rm -f $(DIR)/pland $(DIR)/notifier
+-	cp pland notifier netplan ../misc/plan_cal.ps $(LIB)
+-	-test x$(JAPAN) != x && cp ../misc/plan_calSJ.ps $(LIB)
+-	cp ../misc/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
+-	-test x$(JAPAN) != x && chmod 644 $(LIB)/plan_calSJ.ps
+-	-mkdir $(LIB)/netplan.dir
+-	-chmod 777 $(LIB)/netplan.dir
++	${INSTALL} -d $(DOCBASE)
++	${INSTALL} -d $(EXAMPLES)
++	${INSTALL} -c pland $(DIR)
++	${INSTALL} -c -m 755 notifier netplan plan ../misc/Killpland $(LIB)
++	${INSTALL} -c -m 644 ../misc/plan.help ../misc/plan_cal.ps \
++	  ../misc/Monochrome ../misc/BlackWhite $(DOCS)
++	${INSTALL} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
++	${INSTALL} -d $(NETPLAN)/netplan.dir
++	-chmod 777 $(NETPLAN)/netplan.dir
+ 	-test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat
+ 	-test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat
+ 	-test -x `which nroff` && nroff -man ../misc/netplan.1 >../misc/netplan.1cat
+ 	-test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1
+ 	-test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4
+ 	-test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan.1
+-	-test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1
+-	-test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4
+-	-test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan.1
+-	-test -f ${HOME}/.holiday || cp ../holiday/holiday_german ${HOME}/.holiday
+-	-test `uname` = IRIX && mkdir $$HOME/.icons
+-	-test `uname` = IRIX && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon
+-	@echo ""
+-	@echo "use ../holiday/* as templates for your ~/.holiday file"
++	${INSTALL} -c -m 644 ../README $(DOCBASE)
++	${INSTALL} -c -m 644 ../holiday/holiday_* $(EXAMPLES)
++	${ECHO} ""
++	${ECHO} "Use " $(EXAMPLES)"/holiday/* as templates for your ~/.holiday file"
+ 
+ clean:
+ 	-rm -f *.o
diff --git a/deskutils/plan/files/patch-ag b/deskutils/plan/files/patch-ag
index 11f6f42b771..159180dc2c7 100644
--- a/deskutils/plan/files/patch-ag
+++ b/deskutils/plan/files/patch-ag
@@ -1,19 +1,19 @@
-*** src/network.c.orig	Sun Apr 14 21:17:43 1996
---- src/network.c	Sun Apr 14 21:18:18 1996
+*** src/sublist.c.orig	Sun Apr 14 16:38:13 1996
+--- src/sublist.c	Sun Apr 14 16:38:34 1996
 ***************
-*** 165,171 ****
-  		addr.sin_family = AF_INET;
-  		addr.sin_port   = config.net_port;
-  		memcpy(&addr.sin_addr, hent->h_addr, sizeof(hent->h_length));
-! 		if (connect(fd, &addr, sizeof(addr)) < 0) {
-  			sprintf(msg+strlen(msg),
-  				"User file %s on host %s: cannot connect\n",
-  				user[u].name, uhost);
---- 165,171 ----
-  		addr.sin_family = AF_INET;
-  		addr.sin_port   = config.net_port;
-  		memcpy(&addr.sin_addr, hent->h_addr, sizeof(hent->h_length));
-! 		if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-  			sprintf(msg+strlen(msg),
-  				"User file %s on host %s: cannot connect\n",
-  				user[u].name, uhost);
+*** 23,29 ****
+  #define regcmp re_comp
+  #define regex re_exec
+  #endif
+! #ifdef linux
+  #define regcmp regcomp
+  #define regex regexec
+  #endif
+--- 23,29 ----
+  #define regcmp re_comp
+  #define regex re_exec
+  #endif
+! #if defined(linux) || defined(freebsd)
+  #define regcmp regcomp
+  #define regex regexec
+  #endif
diff --git a/deskutils/plan/pkg-plist b/deskutils/plan/pkg-plist
index 9d04204b97e..42f830b0c11 100644
--- a/deskutils/plan/pkg-plist
+++ b/deskutils/plan/pkg-plist
@@ -3,7 +3,6 @@ bin/netplan
 bin/notifier
 bin/pland
 bin/Killpland
-share/netplan.dir
 share/doc/plan/Mkdoc
 share/doc/plan/Mkdoc.nawk
 share/doc/plan/plan.help
@@ -25,5 +24,9 @@ share/doc/plan/examples/holiday_us
 share/doc/plan/BlackWhite
 share/doc/plan/Monochrome
 share/doc/plan/README
+man/man1/netplan.1.gz
 man/man1/plan.1.gz
 man/man4/plan.4.gz
+@dirrm share/netplan.dir
+@dirrm share/doc/plan/examples
+@dirrm share/doc/plan