- Update plan to 1.9

- Respect NOPORTDOCS
- Use DOCSDIR, EXAMPLESDIR, DATADIR macros
- Update WWW line in pkg-descr
- Rename patches to new scheme
- Pass maintainership to submiter

PR:		ports/97155
Submitted by:	Shaun Amott <shaun@inerd.com>
Approved by:	lawrance (mentor)

5 files changed, 170 insertions, 67 deletions

diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 1be70c6e2903..f714a76dabd7 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -7,12 +7,12 @@
 # Also update	ports/japanese/plan/ (ja-plan) when this port is updated
 
 PORTNAME=	plan
-PORTVERSION=	1.8.7
+PORTVERSION=	1.9
 CATEGORIES+=	deskutils
 MASTER_SITES=	ftp://plan.ftp.fu-berlin.de/
 MASTER_SITE_SUBDIR=	applications
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	shaun@inerd.com
 COMMENT=	An X/Motif schedule planner with calendar
 
 USE_MOTIF=	yes
@@ -21,29 +21,37 @@ ALL_TARGET=	freebsd
 MAN1=		netplan.1 plan.1
 MAN4=		plan.4
 
-post-patch:
-	cd ${WRKSRC} && ${MV} config.h config.h.orig && ${SED} -e 's,%%PREFIX%%,${PREFIX},' \
-		< config.h.orig > config.h
+MAKE_ENV+=	DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
+
 do-install:
-	@${MKDIR} ${PREFIX}/share/doc/plan/examples ;\
-	cd ${WRKSRC} ; ${INSTALL_PROGRAM} plan pland netplan notifier ${PREFIX}/bin ;\
-	${INSTALL_SCRIPT}  ../misc/Killpland ${PREFIX}/bin ;\
-	${INSTALL_MAN} ../misc/netplan.1 ../misc/plan.1 ${MAN1PREFIX}/man/man1 ;\
-	${INSTALL_MAN} ../misc/plan.4 ${MAN4PREFIX}/man/man4 ;\
-	${INSTALL_DATA} ../misc/plan_cal.ps ../language/* ../misc/Mkdoc ../misc/Mkdoc.nawk \
-			 ../misc/BlackWhite ../misc/Monochrome ../README \
-		${PREFIX}/share/doc/plan ;\
-	cd ${WRKSRC}/../holiday ; ${INSTALL_DATA} \
-		holiday_australia holiday_austria holiday_bavarian holiday_belgium \
-		holiday_canada holiday_combi holiday_czech holiday_denmark holiday_dutch \
-		holiday_finnish holiday_french holiday_frswiss holiday_german holiday_greek \
-		holiday_hungary holiday_italy holiday_japan holiday_norway holiday_portugal \
-		holiday_quebec holiday_slovak holiday_spain holiday_swedish holiday_uk \
-			holiday_us ${PREFIX}/share/doc/plan/examples
+	@${MKDIR} ${EXAMPLESDIR}
+
+	cd ${WRKSRC} \
+	   && ${INSTALL_PROGRAM} plan pland netplan notifier ${PREFIX}/bin		\
+	   && ${INSTALL_SCRIPT}  ../misc/Killpland ${PREFIX}/bin			\
+	   && ${INSTALL_MAN} ../misc/netplan.1 ../misc/plan.1 ${MAN1PREFIX}/man/man1	\
+	   && ${INSTALL_MAN} ../misc/plan.4 ${MAN4PREFIX}/man/man4
+
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/.. \
+	   && ${INSTALL_DATA} misc/plan_cal.ps language/* misc/Mkdoc misc/Mkdoc.nawk	\
+	                      misc/BlackWhite misc/Monochrome README			\
+	                      ${DOCSDIR}
+.endif
+
+	cd ${WRKSRC}/../holiday \
+	   && ${INSTALL_DATA}   \
+	      holiday_australia holiday_austria holiday_bavarian holiday_belgium		\
+	      holiday_canada holiday_combi holiday_czech holiday_denmark holiday_dutch		\
+	      holiday_finnish holiday_french holiday_frswiss holiday_german holiday_greek	\
+	      holiday_hungary holiday_italy holiday_japan holiday_norway holiday_portugal	\
+	      holiday_quebec holiday_slovak holiday_spain holiday_swedish holiday_uk		\
+	      holiday_us ${EXAMPLESDIR}
 
 .if !target(post-install)
 post-install:
-	@${MKDIR} ${PREFIX}/share/netplan.dir
+	@${MKDIR} ${DATADIR}/netplan.dir
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/plan/distinfo b/deskutils/plan/distinfo
index 1351821ac6c9..51e360b5c197 100644
--- a/deskutils/plan/distinfo
+++ b/deskutils/plan/distinfo
@@ -1,3 +1,3 @@
-MD5 (plan-1.8.7.tar.gz) = 76f7f522bb7e03de73d581b8b647fb3b
-SHA256 (plan-1.8.7.tar.gz) = bf646f59911b4f66965ef7ffe243edb080eae22862b49e1d2e4b6bb689f2e326
-SIZE (plan-1.8.7.tar.gz) = 436792
+MD5 (plan-1.9.tar.gz) = ab9e6b67c7b087f130c030aa779ef01d
+SHA256 (plan-1.9.tar.gz) = 08092cdacdc15ec78bdcfb5e51a598e9b32c52c93c97905cec578f1171e14cf3
+SIZE (plan-1.9.tar.gz) = 441599
diff --git a/deskutils/plan/files/patch-Makefile b/deskutils/plan/files/patch-Makefile
new file mode 100644
index 000000000000..da65ee582ea8
--- /dev/null
+++ b/deskutils/plan/files/patch-Makefile
@@ -0,0 +1,94 @@
+--- Makefile.orig	Sun Feb  6 19:11:34 2005
++++ Makefile	Thu May 11 03:00:53 2006
+@@ -8,19 +8,19 @@
+ # after "=", this is parsed and rewritten by the configure script.
+ #
+ #				# user-callable executable (plan)
+-DIR=/usr/local/bin
++DIR=${PREFIX}/bin
+ #				# auxiliary programs (pland, notifier, PS)
+-LIB=/usr/local/lib
++LIB=${DATADIR}
+ #				# help file (plan.help)
+-SBIN=/usr/local/bin
++SBIN=${PREFIX}/bin
+ #				# system programs (netplan)
+-HELP=/usr/local/lib
++HELP=${DOCSDIR}
+ #				# netplan expects netplan.dir/ here
+-NETPLANDIR=/usr/local/lib
++NETPLANDIR=${DATADIR}
+ #				# unformatted nroff manpage (plan.[14])
+-MAN=/usr/local/man/man
++MAN=${MANPREFIX}/man/man
+ #				# formatted manpage (plan.[14])
+-CATMAN=/usr/catman/local/cat
++CATMAN=${MANPREFIX}/man/cat
+ #				# subdirectory in home dir, or empty
+ PLANRULE=
+ #				# lockfile for plan, %d is uid
+@@ -34,9 +34,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)'
+@@ -49,13 +49,17 @@
+ #				# 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\"
++.else
+ JAPAN=
++.endif
+ #				# default holiday locale
+ HOLIDAY=german
+ #				# do NOT define -O2 on DEC OSF/1 machines!
+ #				# use -O instead of -O2 on HP and Solaris
+-DEBUG=-g
+-DEBUG=-O2
++DEBUG=${CFLAGS}
+ #				# what to do without make arguments
+ DEFTARGET=linux
+ #------------------------- end of configuration section ----------------------
+@@ -219,10 +223,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
+-OBSD_L1	= -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11
+-OBSD_L2	= -lc
++FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
++FBSD_L2 =
++OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
++OBSD_L2 =
+ 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
+@@ -287,7 +291,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 freebsd   FreeBSD"
+ 	@echo "  make openbsd	OpenBSD"
+ 	@echo "  make svr4      SVR4 Using gcc"
+ 	@echo "  make news4     Sony NEWS-OS4.x"
+@@ -525,7 +529,7 @@
+ 	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
+ 
+ holiday.o: holiday.c $(MAKEFILE)
+-	$(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
++	$(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(DOCS)\" $<
+ 
+ util.o: util.c $(MAKEFILE)
+ 	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(EXAMPLESDIR)\" $<
diff --git a/deskutils/plan/pkg-descr b/deskutils/plan/pkg-descr
index 38a4e706d839..de620df24d27 100644
--- a/deskutils/plan/pkg-descr
+++ b/deskutils/plan/pkg-descr
@@ -5,4 +5,4 @@ listed and edited.
 
 This port requires Motif or equivalent to build.
 
-WWW: http://me.in-Berlin.de/~bitrot/plan.html
+WWW: http://www.bitrot.de/plan.html
diff --git a/deskutils/plan/pkg-plist b/deskutils/plan/pkg-plist
index 5b230180260b..5e7d31d8f407 100644
--- a/deskutils/plan/pkg-plist
+++ b/deskutils/plan/pkg-plist
@@ -3,45 +3,46 @@ bin/pland
 bin/netplan
 bin/notifier
 bin/Killpland
-%%DOCSDIR%%/Mkdoc
-%%DOCSDIR%%/Mkdoc.nawk
-%%DOCSDIR%%/plan.help
-%%DOCSDIR%%/plan_cal.ps
-%%DOCSDIR%%/examples/holiday_australia
-%%DOCSDIR%%/examples/holiday_austria
-%%DOCSDIR%%/examples/holiday_bavarian
-%%DOCSDIR%%/examples/holiday_belgium
-%%DOCSDIR%%/examples/holiday_canada
-%%DOCSDIR%%/examples/holiday_combi
-%%DOCSDIR%%/examples/holiday_czech
-%%DOCSDIR%%/examples/holiday_denmark
-%%DOCSDIR%%/examples/holiday_dutch
-%%DOCSDIR%%/examples/holiday_finnish
-%%DOCSDIR%%/examples/holiday_french
-%%DOCSDIR%%/examples/holiday_frswiss
-%%DOCSDIR%%/examples/holiday_german
-%%DOCSDIR%%/examples/holiday_greek
-%%DOCSDIR%%/examples/holiday_hungary
-%%DOCSDIR%%/examples/holiday_italy
-%%DOCSDIR%%/examples/holiday_japan
-%%DOCSDIR%%/examples/holiday_norway
-%%DOCSDIR%%/examples/holiday_portugal
-%%DOCSDIR%%/examples/holiday_quebec
-%%DOCSDIR%%/examples/holiday_slovak
-%%DOCSDIR%%/examples/holiday_spain
-%%DOCSDIR%%/examples/holiday_swedish
-%%DOCSDIR%%/examples/holiday_uk
-%%DOCSDIR%%/examples/holiday_us
-%%DOCSDIR%%/BlackWhite
-%%DOCSDIR%%/Monochrome
-%%DOCSDIR%%/README
-%%DOCSDIR%%/plan.lang.dutch
-%%DOCSDIR%%/plan.lang.english
-%%DOCSDIR%%/plan.lang.french
-%%DOCSDIR%%/plan.lang.german
-%%DOCSDIR%%/plan.lang.italian
-%%DOCSDIR%%/plan.lang.spanish
-@exec /bin/mkdir -p %D/share/netplan.dir
-@dirrm share/netplan.dir
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/Mkdoc
+%%PORTDOCS%%%%DOCSDIR%%/Mkdoc.nawk
+%%PORTDOCS%%%%DOCSDIR%%/plan.help
+%%PORTDOCS%%%%DOCSDIR%%/plan_cal.ps
+%%EXAMPLESDIR%%/holiday_australia
+%%EXAMPLESDIR%%/holiday_austria
+%%EXAMPLESDIR%%/holiday_bavarian
+%%EXAMPLESDIR%%/holiday_belgium
+%%EXAMPLESDIR%%/holiday_canada
+%%EXAMPLESDIR%%/holiday_combi
+%%EXAMPLESDIR%%/holiday_czech
+%%EXAMPLESDIR%%/holiday_denmark
+%%EXAMPLESDIR%%/holiday_dutch
+%%EXAMPLESDIR%%/holiday_finnish
+%%EXAMPLESDIR%%/holiday_french
+%%EXAMPLESDIR%%/holiday_frswiss
+%%EXAMPLESDIR%%/holiday_german
+%%EXAMPLESDIR%%/holiday_greek
+%%EXAMPLESDIR%%/holiday_hungary
+%%EXAMPLESDIR%%/holiday_italy
+%%EXAMPLESDIR%%/holiday_japan
+%%EXAMPLESDIR%%/holiday_norway
+%%EXAMPLESDIR%%/holiday_portugal
+%%EXAMPLESDIR%%/holiday_quebec
+%%EXAMPLESDIR%%/holiday_slovak
+%%EXAMPLESDIR%%/holiday_spain
+%%EXAMPLESDIR%%/holiday_swedish
+%%EXAMPLESDIR%%/holiday_uk
+%%EXAMPLESDIR%%/holiday_us
+%%PORTDOCS%%%%DOCSDIR%%/BlackWhite
+%%PORTDOCS%%%%DOCSDIR%%/Monochrome
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.dutch
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.english
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.french
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.german
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.italian
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.spanish
+@exec /bin/mkdir -p %D/%%DATADIR%%/netplan.dir
+@dirrmtry %%DATADIR%%/netplan.dir
+@dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%