Upgrade plan from 1.7.2 to 1.8.1; portlint.

PR:	12293
Submitted by:	Cy Schubert <cschuber@uumail.gov.bc.ca>

5 files changed, 152 insertions, 197 deletions

diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 1186754ba564..df37f606fe90 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -1,14 +1,13 @@
 # New ports collection makefile for:	plan
-# Version required:			1.7.2
+# Version required:			1.8.1
 # Date created:				14 April 1996
 # Whom:	Daniel Eischen <deischen@iworks.InterWorks.org>
 #
-# $Id: Makefile,v 1.13 1998/10/13 23:58:33 jseger Exp $
+# $Id: Makefile,v 1.14 1998/11/02 03:57:44 steve Exp $
 #
-
 #	Also update	ports/japanese/plan/ (ja-plan) when this port is updated
 
-DISTNAME=	plan-1.7.2
+DISTNAME=	plan-1.8.1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
@@ -17,7 +16,7 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	deischen@iworks.InterWorks.org
 
 REQUIRES_MOTIF=	yes
-WRKSRC=		${WRKDIR}/src
+WRKSRC=		${WRKDIR}/plan-1.8.1/src
 ALL_TARGET=	freebsd
 MAN1=		netplan.1 plan.1
 MAN4=		plan.4
diff --git a/deskutils/plan/distinfo b/deskutils/plan/distinfo
index 0027ba7b09b6..c9bb569d26d6 100644
--- a/deskutils/plan/distinfo
+++ b/deskutils/plan/distinfo
@@ -1 +1 @@
-MD5 (plan-1.7.2.tar.gz) = 0dac73da57e85d101d6060cb222a938f
+MD5 (plan-1.8.1.tar.gz) = 236c51f213b23aa60251cf553a4807b9
diff --git a/deskutils/plan/files/patch-ab b/deskutils/plan/files/patch-ab
index 1bbb5f79f9ac..c59a3d80650a 100644
--- a/deskutils/plan/files/patch-ab
+++ b/deskutils/plan/files/patch-ab
@@ -1,187 +1,141 @@
-*** Makefile.orig	Sat May  9 16:21:09 1998
---- Makefile	Sun Oct 25 17:48:20 1998
-***************
-*** 6,34 ****
-  # 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)
-  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 = /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
-  # LENTOASCII			# length of ESCTOASCII
-  # LOCALE_SJIS, LOCALE_EUC	# locale names for Japanese
-  # JAPAN				# uncomment this for Japanese version of plan
-! #JAPAN = -DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \
-! #        -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
-  #				# JAPAN requires X11R5 and a Japanese env.
-  
-! DEBUG = -g
-  #DEBUG = -O2#			# do NOT define -O2 on DEC OSF/1 machines!
-  #DEBUG =
-  
---- 6,40 ----
-  # DO NOT put a blank between the path and the #, or you'll get compile errors.
-  #
-  
-! DOCBASE = $(PREFIX)/share/doc/plan#
-! 
-! DIR  = $(PREFIX)/bin#	      # user-callable executable (plan)
-! LIB  = $(PREFIX)/share# 	      # 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 = $(PREFIX)/man/man#      # for linux and freebsd
-  NETPLANDIR = $(LIB)#		# netplan expects netplan.dir/ here
-  # NETPLANDIR = "/var/lib/plan"#	# use this for Debian Linux
-  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$(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
-  # LENTOASCII			# length of ESCTOASCII
-  # LOCALE_SJIS, LOCALE_EUC	# locale names for Japanese
-  # JAPAN				# uncomment this for Japanese version of plan
-! .if defined(JAPANESE)
-! JAPAN = -DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \
-! 	-DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
-! .endif
-  #				# JAPAN requires X11R5 and a Japanese env.
-  
-! DEBUG = -O2 -g
-  #DEBUG = -O2#			# do NOT define -O2 on DEC OSF/1 machines!
-  #DEBUG =
-  
-***************
-*** 197,204 ****
-  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 -lXm -lXt -lX11 -lXext
-! 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
-  LINUX_L2= -lc
-  SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
---- 203,212 ----
-  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$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc
-! FBSD_L2 = -lc
-! OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc
-! OBSD_L2 = -lc
-  LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
-  LINUX_L2= -lc
-  SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
-***************
-*** 263,268 ****
---- 271,277 ----
-  	@echo "  make bsdi      BSDI/386"
-  	@echo "  make bsdig     BSDI/386 with gcc"
-  	@echo "  make netbsd	NetBSD/i386 1.0A (maybe others too)"
-+ 	@echo "  make openbsd   OpenBSD 2.x"
-  	@echo "  make freebsd   FreeBSD 2.x"
-  	@echo "  make svr4      SVR4 Using gcc"
-  	@echo "  make news4     Sony NEWS-OS4.x"
-***************
-*** 391,396 ****
---- 400,408 ----
-  freebsd:
-  	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
-  
-+ openbsd:
-+ 	env CF="$(OBSD_C)" L1F="$(OBSD_L1)" L2F="$(OBSD_L2)" MYCC=${CC} make all
+--- Makefile.orig	Sat May 22 01:19:06 1999
++++ Makefile	Thu Jun 17 11:41:07 1999
+@@ -7,16 +7,22 @@
+ # DO NOT put blanks before and after "=", this is parsed and rewritten by the
+ # configure script.
+ #
++DOCBASE = $(PREFIX)/share/doc/plan
++#
+ #				# user-callable executable (plan)
+-DIR=/usr/local/lib
++DIR=$(PREFIX)/bin
+ #				# auxiliary programs (pland, notifier, netplan)
+-LIB=/usr/local/lib
++LIB=$(PREFIX)/share
++#				# Example holiday files
++EXAMPLES=$(DOCBASE)/examples
++#				# doc files
++DOCS=$(DOCBASE)
+ #				# help file (plan.help)
+-HELP=/usr/local/lib
++HELP=$(DOCBASE)
+ #				# netplan expects netplan.dir/ here
+-NETPLANDIR=/usr/local/lib
++NETPLANDIR=$(LIB)
+ #				# unformatted nroff manpage (plan.[14])
+-MAN=/usr/man/local/man
++MAN=$(PREFIX)/man/man
+ #				# formatted manpage (plan.[14])
+ CATMAN=/usr/catman/local/cat
+ #				# subdirectory in home dir, or empty
+@@ -32,9 +38,9 @@
+ #				# standard Unix compiler generator
+ YACC=yacc
+ #				# numerical user ID of <nobody> account
+-NOB_UID=60001
++NOB_UID=65534
+ #				# default numerical group ID of <nobody>
+-NOB_GID=60001
++NOB_GID=65534
+ # 				# used by plan to pre-process holiday files,
+ #				# plan will check if this file really exists
+ CPP_PATH="/lib/cpp -P -I$(HELP)"
+@@ -45,6 +51,10 @@
+ #				# uncomment this for Japanese version of plan
+ #				# JAPAN requires X11R5 and a Japanese env.
+ JAPANDEFS="-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS='ja_JP.SJIS' -DLOCALE_EUC='ja_JP.EUC'"
++.if defined(JAPANESE)
++JAPAN = -DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \
++	-DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
++.endif
+ JAPAN=
+ #				# default holiday locale
+ HOLIDAY=german
+@@ -218,8 +228,10 @@
+ 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 -lXm -lXt -lX11 -lXext -lSM -lICE -lXpm
+-FBSD_L2	= -L/usr/X11R6/lib -lc
++FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc
++FBSD_L2 = -lc
++OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc
++OBSD_L2 = -lc
+ LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
+ LINUX_L2= -lc
+ SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
+@@ -285,7 +297,8 @@
+ 	@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 freebsd   FreeBSD 3.x"
++	@echo "  make openbsd   OpenBSD 2.x"
+ 	@echo "  make svr4      SVR4 Using gcc"
+ 	@echo "  make news4     Sony NEWS-OS4.x"
+ 	@echo "  make news4g    Sony NEWS-OS4.x with gcc"
+@@ -414,6 +427,9 @@
+ freebsd:
+ 	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
+ 
++openbsd:
++	env CF="$(OBSD_C)" L1F="$(OBSD_L1)" L2F="$(OBSD_L2)" MYCC=${CC} make all
 + 
-  svr4:
-  	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
-  
-***************
-*** 497,503 ****
-  	$(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)\" $<
-  
-  util.o: util.c $(MAKEFILE)
-  	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
---- 509,515 ----
-  	$(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)\" $<
-  
-  util.o: util.c $(MAKEFILE)
-  	$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
-***************
-*** 528,558 ****
-  
-  #---------------------------------------------------------------
-  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)) || exit 0
-! 	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) || exit 0
-  	-mkdir $(LIB)/netplan.dir
-  	-chmod 700 $(LIB)/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 `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
-! 	@echo ""
-! 	@echo "use ../holiday/* as templates for your ~/.holiday file"
-  
-  clean:
-  	-rm -f *.o
---- 540,563 ----
-  
-  #---------------------------------------------------------------
-  install:
-! 	${INSTALL} -d $(DOCBASE)
-! 	${INSTALL} -d $(EXAMPLES)
-! 	${BSD_INSTALL_PROGRAM} pland $(DIR)
-! 	${BSD_INSTALL_PROGRAM} notifier netplan plan $(DIR)
-! 	${BSD_INSTALL_SCRIPT} ../misc/Killpland $(DIR)
-! 	${BSD_INSTALL_MAN} ../misc/plan.help ../misc/plan_cal.ps \
-! 	  ../misc/Monochrome ../misc/BlackWhite $(DOCS)
-! 	${BSD_INSTALL_SCRIPT} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
-! 	-test x$(JAPAN) != x && ${BSD_INSTALL_MAN} ../misc/plan_calSJ.ps $(DOCS)
-  	-mkdir $(LIB)/netplan.dir
-  	-chmod 700 $(LIB)/netplan.dir
-  	-(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
-! 	${BSD_INSTALL_MAN} ../README $(DOCBASE)
-! 	${BSD_INSTALL_DATA} ../holiday/holiday_* $(EXAMPLES)
-! 	${ECHO} ""
-! 	${ECHO} "Use " $(EXAMPLES)"/holiday/* as templates for your ~/.holiday file"
-  
-  clean:
-  	-rm -f *.o
+ svr4:
+ 	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
+ 
+@@ -522,7 +538,7 @@
+ 	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
+ 
+ holiday.o: holiday.c $(MAKEFILE)
+-	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
++	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(DOCS)\" $<
+ 
+ util.o: util.c $(MAKEFILE)
+ 	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
+@@ -553,31 +569,25 @@
+ 
+ #---------------------------------------------------------------
+ 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
++	${INSTALL} -d $(DOCBASE)
++	${INSTALL} -d $(EXAMPLES)
++	${BSD_INSTALL_PROGRAM} pland $(DIR)
++	${BSD_INSTALL_PROGRAM} notifier netplan plan $(DIR)
++	${BSD_INSTALL_SCRIPT} ../misc/Killpland $(DIR)
++	${BSD_INSTALL_MAN} ../language/plan.help ../misc/plan_cal.ps \
++	  ../misc/Monochrome ../misc/BlackWhite $(DOCS)
++	${BSD_INSTALL_SCRIPT} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
++	-test x$(JAPAN) != x && ${BSD_INSTALL_MAN} ../misc/plan_calSJ.ps $(DOCS)
++
+ 	-mkdir $(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_$(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
+-	@echo ""
+-	@echo "use ../holiday/* as templates for your ~/.holiday file"
++	${BSD_INSTALL_MAN} ../README $(DOCBASE)
++	${BSD_INSTALL_DATA} ../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 0572fbd53c20..a6f2f9518c88 100644
--- a/deskutils/plan/files/patch-ag
+++ b/deskutils/plan/files/patch-ag
@@ -1,11 +1,11 @@
---- sublist.c.orig	Sat Oct 19 06:00:32 1996
-+++ sublist.c	Sat Jan 31 10:55:57 1998
+--- sublist.c.orig	Sun May  2 12:23:15 1999
++++ sublist.c	Thu Jun 17 13:09:05 1999
 @@ -23,7 +23,7 @@
  #define regcmp re_comp
  #define regex re_exec
  #endif
--#ifdef linux
-+#if defined(linux) || defined(POSIX_REGEX)
+-#if defined(linux) || defined(__EMX__)
++#if defined(linux) || defined(__EMX__) || defined(POSIX_REGEX)
  #define regcmp regcomp
  #define regex regexec
  #endif
diff --git a/deskutils/plan/pkg-plist b/deskutils/plan/pkg-plist
index 6d426ebfd532..cc867c03f5b1 100644
--- a/deskutils/plan/pkg-plist
+++ b/deskutils/plan/pkg-plist
@@ -12,17 +12,19 @@ share/doc/plan/examples/holiday_austria
 share/doc/plan/examples/holiday_bavarian
 share/doc/plan/examples/holiday_belgium
 share/doc/plan/examples/holiday_canada
+share/doc/plan/examples/holiday_combi
+share/doc/plan/examples/holiday_czech
 share/doc/plan/examples/holiday_denmark
 share/doc/plan/examples/holiday_dutch
 share/doc/plan/examples/holiday_finnish
 share/doc/plan/examples/holiday_french
 share/doc/plan/examples/holiday_frswiss
 share/doc/plan/examples/holiday_german
-share/doc/plan/examples/holiday_german.orig
 share/doc/plan/examples/holiday_hungary
 share/doc/plan/examples/holiday_italy
 share/doc/plan/examples/holiday_japan
 share/doc/plan/examples/holiday_norway
+share/doc/plan/examples/holiday_portugal
 share/doc/plan/examples/holiday_quebec
 share/doc/plan/examples/holiday_spain
 share/doc/plan/examples/holiday_swedish