cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update plan to 1.10.1

Browse Source 
* Among fixes, is read-only ical/vcal support.
This commit is contained in:
jasper 2010-03-21 10:52:21 +00:00
parent ec5fe3484c
commit ba0d311c2a
7 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/plan/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.21 2009/12/16 14:20:48 kili Exp $
# $OpenBSD: Makefile,v 1.22 2010/03/21 10:52:21 jasper Exp $
COMMENT= X11/Motif schedule planner with calendar
DISTNAME= plan-1.9
PKGNAME= ${DISTNAME}p3
DISTNAME= plan-1.10.1
CATEGORIES= misc
HOMEPAGE= http://www.bitrot.de/plan.html
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

10
misc/plan/distinfo
View File

@ -1,5 +1,5 @@
MD5 (plan-1.9.tar.gz) = q55rZ8ewh/EwwDCqd57wHQ==
RMD160 (plan-1.9.tar.gz) = e+0/KcYjQcJkye3rYGZtgwkhOeo=
SHA1 (plan-1.9.tar.gz) = Za//lh+AH4iHFJk6ntbkKpWy2Vg=
SHA256 (plan-1.9.tar.gz) = CAks2s3BXseL3PteUaWY6bMsUsk8l5Bc7FePEXHhTPM=
SIZE (plan-1.9.tar.gz) = 441599
MD5 (plan-1.10.1.tar.gz) = DegLUHTKd7IIAe1onoKlqA==
RMD160 (plan-1.10.1.tar.gz) = uE/7qQWMFKm8F960XMb4eWGRaz4=
SHA1 (plan-1.10.1.tar.gz) = LFL/DwCwN02EyvhpKVua1dUlDZM=
SHA256 (plan-1.10.1.tar.gz) = Baqq2hjzSUncOOIHMAqPl1wetguTUC4Q22iCK1m0GE8=
SIZE (plan-1.10.1.tar.gz) = 462560

34
misc/plan/patches/patch-src_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile,v 1.3 2009/12/16 14:20:48 kili Exp $
--- src/Makefile.orig Sun Feb 6 20:11:34 2005
+++ src/Makefile Wed Dec 16 15:12:17 2009
$OpenBSD: patch-src_Makefile,v 1.4 2010/03/21 10:52:21 jasper Exp $
--- src/Makefile.orig Thu Feb 4 19:16:02 2010
+++ src/Makefile Thu Feb 4 19:22:36 2010
@@ -7,20 +7,21 @@
# 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.
@ -23,7 +23,7 @@ $OpenBSD: patch-src_Makefile,v 1.3 2009/12/16 14:20:48 kili Exp $
+NETPLANDIR=/var
# # unformatted nroff manpage (plan.[14])
-MAN=/usr/local/man/man
+MAN=$(PLANBASE)/man
+MAN=$(PLANBASE)/man/
# # formatted manpage (plan.[14])
-CATMAN=/usr/catman/local/cat
+CATMAN=NONE
@ -69,19 +69,19 @@ $OpenBSD: patch-src_Makefile,v 1.3 2009/12/16 14:20:48 kili Exp $
- -DNO_MOTIF -DSTDLIBMALLOC
+OBSD_C = -ansi -I${X11BASE}/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
+ -DSTDLIBMALLOC -I${LOCALBASE}/include
LINUX_C = -W -Wall -I/usr/X11R6/include -DNOLOCK -DLINUX
LINUX_C = -W -Wall -m32 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
NEWS_C = -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DNGROUPS_MAX=16\
@@ -221,7 +223,7 @@ NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11
@@ -223,7 +225,7 @@ 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_L1 = ${MOTIFLIB} -L${X11BASE}/lib -lXt -lX11 -lXpm -lc -lm -lXext
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_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext -lICE -lX11
LINUX_L2= -lc
@@ -510,7 +512,7 @@ notifier: $(N_OBJ)
@@ -527,7 +529,7 @@ notifier: $(N_OBJ)
netplan: $(S_OBJ) $(MAKEFILE)
$(CCLINE) -o netplan $(S_OBJ) \
@ -90,7 +90,7 @@ $OpenBSD: patch-src_Makefile,v 1.3 2009/12/16 14:20:48 kili Exp $
.c.o:
$(CCLINE) -c $<
@@ -556,36 +558,24 @@ g_dbase.o g_dbfile.o g_formfile.o g_formop.o: grok.h f
@@ -573,36 +575,24 @@ g_dbase.o g_dbfile.o g_formfile.o g_formop.o: grok.h f
#---------------------------------------------------------------
install:
@ -98,7 +98,7 @@ $OpenBSD: patch-src_Makefile,v 1.3 2009/12/16 14:20:48 kili Exp $
- mkdir -p $(DESTDIR)$(DIR)
- cp plan $(DESTDIR)$(DIR)
- mkdir -p $(DESTDIR)$(LIB)
- cp pland notifier ../misc/plan_cal.ps ../language/* $(DESTDIR)$(LIB)
- cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
- mkdir -p $(DESTDIR)$(SBIN)
- cp netplan $(DESTDIR)$(SBIN)
- -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
@ -113,12 +113,12 @@ $OpenBSD: patch-src_Makefile,v 1.3 2009/12/16 14:20:48 kili Exp $
- -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
- -(test x'$(MAN)' != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan) || exit 0
- -(test x'$(MAN)' != xNONE -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan) || exit 0
- -(test x'$(MAN)' != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan) || exit 0
- -(test x'$(MAN)' != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/plan.1 $(DESTDIR)$(MAN)1/plan.1) || exit 0
- -(test x'$(MAN)' != xNONE -a -d $(DESTDIR)$(MAN)4 && cp ../misc/plan.4 $(DESTDIR)$(MAN)4/plan.4) || exit 0
- -(test x'$(MAN)' != xNONE -a -d $(DESTDIR)$(MAN)1 && cp ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan.1) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
- -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(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

12
misc/plan/patches/patch-src_popup_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_popup_c,v 1.1 2005/08/10 07:53:44 mbalmer Exp $
--- src/popup.c.orig Tue Aug 9 23:40:41 2005
+++ src/popup.c Tue Aug 9 23:40:53 2005
@@ -206,7 +206,7 @@ void run_daemon(
#endif
#endif
detach_from_network();
- execl(path, DAEMON_FN, 0);
+ execl(path, DAEMON_FN, (void *)NULL);
}
fprintf(stderr, _("%s: WARNING: can't start %s: "), progname,
DAEMON_FN);

16
misc/plan/patches/patch-src_servmenu_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_servmenu_c,v 1.1 2005/08/10 07:53:44 mbalmer Exp $
--- src/servmenu.c.orig Mon Aug 8 18:58:58 2005
+++ src/servmenu.c Mon Aug 8 18:59:07 2005
$OpenBSD: patch-src_servmenu_c,v 1.2 2010/03/21 10:52:21 jasper Exp $
--- src/servmenu.c.orig Wed May 18 21:01:40 2005
+++ src/servmenu.c Thu Feb 4 19:25:21 2010
@@ -8,7 +8,7 @@
#include <stdio.h>
#include <time.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <Xm/Xm.h>
#include <Xm/DialogS.h>
#include <Xm/Form.h>
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(__OpenBSD__)
#include <malloc.h>
#else
#include <stdlib.h>

8
misc/plan/patches/patch-src_time_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_time_c,v 1.1 2005/08/10 07:53:44 mbalmer Exp $
--- src/time.c.orig Sun Jan 9 10:59:09 2005
+++ src/time.c Sun Jun 12 19:37:47 2005
@@ -252,7 +252,8 @@ void guess_tzone(void)
$OpenBSD: patch-src_time_c,v 1.2 2010/03/21 10:52:21 jasper Exp $
--- src/time.c.orig Tue May 17 21:31:50 2005
+++ src/time.c Thu Feb 4 19:22:46 2010
@@ -254,7 +254,8 @@ void guess_tzone(void)
tm = localtime(&now);
zone = -tm->tm_gmtoff;
#else

11
misc/plan/pkg/PLIST
View File

@ -1,13 +1,13 @@
@comment $OpenBSD: PLIST,v 1.7 2005/12/22 08:33:34 mbalmer Exp $
@comment $OpenBSD: PLIST,v 1.8 2010/03/21 10:52:21 jasper Exp $
@newgroup _netplan:549
@newuser _netplan:549:549:daemon:Plan:/nonexistent:/sbin/nologin
bin/plan
bin/pland
@bin bin/plan
@bin bin/pland
@man man/man1/plan.1
@man man/man5/plan.5
@man man/man8/netplan.8
sbin/netplan
sbin/notifier
@bin sbin/netplan
@bin sbin/notifier
share/doc/plan/
share/doc/plan/HISTORY
share/doc/plan/README
@ -46,6 +46,7 @@ share/plan/plan.lang.english
share/plan/plan.lang.french
share/plan/plan.lang.german
share/plan/plan.lang.italian
share/plan/plan.lang.polish
share/plan/plan.lang.spanish
@mode 770
@owner _netplan