Update to version 1.8.6.

6 files changed, 28 insertions, 34 deletions

diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 0365f11ea756..f6bddb921af9 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -7,10 +7,10 @@
 # Also update	ports/japanese/plan/ (ja-plan) when this port is updated
 
 PORTNAME=	plan
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.6
 CATEGORIES+=	deskutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
-		ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
+		ftp://plan.ftp.fu-berlin.de/
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	deischen@freebsd.org
@@ -26,8 +26,7 @@ post-patch:
 	cd ${WRKSRC} && ${MV} config.h config.h.orig && ${SED} -e 's,%%PREFIX%%,$(PREFIX),' \
 		< config.h.orig > config.h
 do-install:
-	@${MKDIR} ${PREFIX}/share/plan ;\
-	${MKDIR} ${PREFIX}/share/doc/plan/examples ;\
+	@${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 ;\
@@ -40,8 +39,8 @@ do-install:
 		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_spain holiday_swedish holiday_uk holiday_us \
-			${PREFIX}/share/doc/plan/examples
+		holiday_quebec holiday_slovak holiday_spain holiday_swedish holiday_uk \
+			holiday_us ${PREFIX}/share/doc/plan/examples
 
 .if !target(post-install)
 post-install:
diff --git a/deskutils/plan/distinfo b/deskutils/plan/distinfo
index f2ab5e424274..d0c4897c6246 100644
--- a/deskutils/plan/distinfo
+++ b/deskutils/plan/distinfo
@@ -1 +1 @@
-MD5 (plan-1.8.4.tar.gz) = 85f793084fbb88c4bb128c1d835c6b30
+MD5 (plan-1.8.6.tar.gz) = 5750547a2efea21c8d9b77ac7fe151b1
diff --git a/deskutils/plan/files/patch-aa b/deskutils/plan/files/patch-aa
index 90a44a002ee4..c6c34ff1206e 100644
--- a/deskutils/plan/files/patch-aa
+++ b/deskutils/plan/files/patch-aa
@@ -1,11 +1,13 @@
 --- servmenu.c.orig	Tue Mar  2 14:02:17 1999
 +++ servmenu.c	Fri Mar 29 11:24:14 2002
-@@ -8,7 +8,9 @@
+@@ -8,7 +8,11 @@
  
  #include <stdio.h>
  #include <time.h>
 +#ifndef STDLIBMALLOC
  #include <malloc.h>
++#else
++#include <stdlib.h>
 +#endif
  #include <Xm/Xm.h>
  #include <Xm/DialogS.h>
diff --git a/deskutils/plan/files/patch-ab b/deskutils/plan/files/patch-ab
index b24e667fc46c..64d8c1f9288a 100644
--- a/deskutils/plan/files/patch-ab
+++ b/deskutils/plan/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Jul 27 05:37:12 2000
-+++ Makefile	Thu Jul 27 05:37:12 2000
+--- Makefile.orig	Wed Mar 19 16:22:33 2003
++++ Makefile	Sun Mar 23 12:07:44 2003
 @@ -7,18 +7,26 @@
  # path and the #, or you'll get compile errors. DO NOT put blanks before and
  # after "=", this is parsed and rewritten by the configure script.
@@ -45,10 +45,10 @@
  # 				# used by plan to pre-process holiday files,
  #				# plan will check if this file really exists
  CPP_PATH='/lib/cpp -P -I$(HELP)'
-@@ -49,11 +57,16 @@
+@@ -49,12 +57,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'
+ 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\"
@@ -58,45 +58,37 @@
  #				# default holiday locale
  HOLIDAY=german
  #				# do NOT define -O2 on DEC OSF/1 machines!
--DEBUG=-O2
+ #				# use -O instead of -O2 on HP to avoid warning
+-DEBUG=-O
 +DEBUG=${CFLAGS}
  #				# what to do without make arguments
  DEFTARGET=help
  #------------------------- end of configuration section ----------------------
-@@ -226,8 +239,10 @@
+@@ -224,10 +237,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
+-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
-@@ -295,7 +310,8 @@
+@@ -294,7 +307,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 2.x"
+ 	@echo "  make openbsd	OpenBSD"
  	@echo "  make svr4      SVR4 Using gcc"
  	@echo "  make news4     Sony NEWS-OS4.x"
- 	@echo "  make news4g    Sony NEWS-OS4.x with gcc"
-@@ -425,6 +441,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
- 
-@@ -538,7 +557,7 @@
+@@ -538,7 +551,7 @@
  	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
  
  holiday.o: holiday.c $(MAKEFILE)
diff --git a/deskutils/plan/pkg-descr b/deskutils/plan/pkg-descr
index b81ae09e8ced..38a4e706d839 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://www.IN-Berlin.DE/User/bitrot/plan.html
+WWW: http://me.in-Berlin.de/~bitrot/plan.html
diff --git a/deskutils/plan/pkg-plist b/deskutils/plan/pkg-plist
index 8a68462d11e2..71092edb70a0 100644
--- a/deskutils/plan/pkg-plist
+++ b/deskutils/plan/pkg-plist
@@ -27,6 +27,7 @@ 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_slovak
 share/doc/plan/examples/holiday_spain
 share/doc/plan/examples/holiday_swedish
 share/doc/plan/examples/holiday_uk
@@ -38,9 +39,9 @@ share/doc/plan/plan.lang.dutch
 share/doc/plan/plan.lang.english
 share/doc/plan/plan.lang.french
 share/doc/plan/plan.lang.german
+share/doc/plan/plan.lang.italian
 share/doc/plan/plan.lang.spanish
 @exec /bin/mkdir -p %D/share/netplan.dir
 @dirrm share/netplan.dir
 @dirrm share/doc/plan/examples
 @dirrm share/doc/plan
-@dirrm share/plan