- Update to 1.10.1

PR:		139430
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>

7 files changed, 33 insertions, 36 deletions

diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 69e51853b521..c03f8ecba7e8 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -7,8 +7,7 @@
 # Also update	ports/japanese/plan/ (ja-plan) when this port is updated
 
 PORTNAME=	plan
-PORTVERSION=	1.9
-PORTREVISION=	1
+PORTVERSION=	1.10.1
 CATEGORIES+=	deskutils
 MASTER_SITES=	ftp://plan.ftp.fu-berlin.de/
 MASTER_SITE_SUBDIR=	applications
diff --git a/deskutils/plan/distinfo b/deskutils/plan/distinfo
index 51e360b5c197..14cfc06a9a1a 100644
--- a/deskutils/plan/distinfo
+++ b/deskutils/plan/distinfo
@@ -1,3 +1,3 @@
-MD5 (plan-1.9.tar.gz) = ab9e6b67c7b087f130c030aa779ef01d
-SHA256 (plan-1.9.tar.gz) = 08092cdacdc15ec78bdcfb5e51a598e9b32c52c93c97905cec578f1171e14cf3
-SIZE (plan-1.9.tar.gz) = 441599
+MD5 (plan-1.10.1.tar.gz) = 0de80b5074ca77b20801ed689e82a5a8
+SHA256 (plan-1.10.1.tar.gz) = 05aaaada18f34949dc38e207300a8f975c1eb60b93502e10db68822b59b4184f
+SIZE (plan-1.10.1.tar.gz) = 462560
diff --git a/deskutils/plan/files/patch-Makefile b/deskutils/plan/files/patch-Makefile
index eef5dceab0d9..45ae58d1e2c4 100644
--- a/deskutils/plan/files/patch-Makefile
+++ b/deskutils/plan/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Feb  7 03:11:34 2005
-+++ Makefile	Mon Dec 11 16:30:57 2006
+--- Makefile.orig	2007-07-03 15:08:52.000000000 -0300
++++ Makefile	2009-10-05 22:12:11.000000000 -0300
 @@ -8,19 +8,19 @@
  # after "=", this is parsed and rewritten by the configure script.
  #
@@ -45,7 +45,7 @@
  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\"
++	-DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
 +.else
  JAPAN=
 +.endif
@@ -68,7 +68,7 @@
  	  -DSTDLIBMALLOC
  OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
  	  -DNO_MOTIF -DSTDLIBMALLOC
-@@ -219,10 +223,10 @@
+@@ -221,10 +225,10 @@
  BSDIG_L2= -L/usr/X11/lib -lc
  NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
  NBSD_L2	= -L/usr/X11R6/lib -lc
@@ -76,14 +76,14 @@
 -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$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
-+FBSD_L2 =
-+OBSD_L1 = -L$(LOCALBASE)/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
++FBSD_L1	= -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
++FBSD_L2	=
++OBSD_L1	= -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
++OBSD_L2	=
+ LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext -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 @@
+@@ -291,7 +295,7 @@
  	@echo "  make bsdi      BSDI/386"
  	@echo "  make bsdig     BSDI/386 with gcc"
  	@echo "  make netbsd    NetBSD/i386 1.0A (maybe others too)"
@@ -92,7 +92,7 @@
  	@echo "  make openbsd	OpenBSD"
  	@echo "  make svr4      SVR4 Using gcc"
  	@echo "  make news4     Sony NEWS-OS4.x"
-@@ -525,7 +529,7 @@
+@@ -542,7 +546,7 @@
  	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
  
  holiday.o: holiday.c $(MAKEFILE)
@@ -101,16 +101,16 @@
  
  util.o: util.c $(MAKEFILE)
  	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
-@@ -600,10 +604,10 @@
- LIST	= README HISTORY holiday/* language/* misc/* src/resources.h.bigfonts web/*
+@@ -617,10 +621,10 @@
+ LIST	= README HISTORY plan.spec holiday/* language/* misc/* src/resources.h.bigfonts web/*
  SRC	= Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure
  
 -LDIR	= /usr/X11R6/lib
 +LDIR	= $(LOCALBASE)/lib
  BINDIR	= plan-$(VERSION)
  gMYCC	= gcc
--gCF	= -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX
-+gCF	= -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX
- gL1F	= -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11
+-gCF	= -m32 -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
++gCF	= -m32 -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
+ gL1F	= -L$(LDIR) $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lICE -lXp -lX11
  gL2F	= -lc
-
+ 
diff --git a/deskutils/plan/files/patch-aa b/deskutils/plan/files/patch-aa
deleted file mode 100644
index c6c34ff1206e..000000000000
--- a/deskutils/plan/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- servmenu.c.orig	Tue Mar  2 14:02:17 1999
-+++ servmenu.c	Fri Mar 29 11:24:14 2002
-@@ -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>
- #include <Xm/Form.h>
diff --git a/deskutils/plan/files/patch-servmenu.c b/deskutils/plan/files/patch-servmenu.c
new file mode 100644
index 000000000000..341e159c9b9c
--- /dev/null
+++ b/deskutils/plan/files/patch-servmenu.c
@@ -0,0 +1,11 @@
+--- servmenu.c.orig	2005-05-18 16:01:40.000000000 -0300
++++ servmenu.c	2009-10-05 22:16:45.000000000 -0300
+@@ -8,7 +8,7 @@
+ 
+ #include <stdio.h>
+ #include <time.h>
+-#ifndef MACOSX
++#ifndef STDLIBMALLOC
+ #include <malloc.h>
+ #else
+ #include <stdlib.h>
diff --git a/deskutils/plan/files/patch-ag b/deskutils/plan/files/patch-sublist.c
index a6f2f9518c88..a6f2f9518c88 100644
--- a/deskutils/plan/files/patch-ag
+++ b/deskutils/plan/files/patch-sublist.c
diff --git a/deskutils/plan/pkg-plist b/deskutils/plan/pkg-plist
index 5e7d31d8f407..2829675f8555 100644
--- a/deskutils/plan/pkg-plist
+++ b/deskutils/plan/pkg-plist
@@ -40,6 +40,7 @@ bin/Killpland
 %%PORTDOCS%%%%DOCSDIR%%/plan.lang.french
 %%PORTDOCS%%%%DOCSDIR%%/plan.lang.german
 %%PORTDOCS%%%%DOCSDIR%%/plan.lang.italian
+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.polish
 %%PORTDOCS%%%%DOCSDIR%%/plan.lang.spanish
 @exec /bin/mkdir -p %D/%%DATADIR%%/netplan.dir
 @dirrmtry %%DATADIR%%/netplan.dir