Update misc/plan to version 1.9
ok?
diff -urN -x CVS misc/plan/Makefile
/usr/ports/mystuff/ports/misc/plan/Makefile
--- misc/plan/Makefile Fri Jun 10 12:18:06 2005
+++ /usr/ports/mystuff/ports/misc/plan/Makefile Mon Aug 8 10:59:38 2005
@@ -2,24 +2,26 @@
COMMENT= "X11/Motif schedule planner with calendar"
-DISTNAME= plan-1.6.1
-PKGNAME= ${DISTNAME}p1
+DISTNAME= plan-1.9
CATEGORIES= misc
+MAINTAINER= Marc Balmer <[EMAIL PROTECTED]>
+
PERMIT_PACKAGE_CDROM= "license requests a copy of the cd"
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= "license requests a copy of the cd"
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xt c
+WANTLIB= X11 Xext Xt c Xpm
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES= ftp://plan.ftp.fu-berlin.de/
USE_MOTIF= any
WRKSRC= ${WRKDIST}/src
ALL_TARGET= openbsd
MAKE_FLAGS= PLANBASE=${PREFIX} EXAMPLES=${PREFIX}/share/examples/plan
-FAKE_FLAGS= PLANBASE=${WRKINST}${PREFIX}
EXAMPLES=${WRKINST}${PREFIX}/share/examples/plan
+FAKE_FLAGS= PLANBASE=${WRKINST}${PREFIX} \
+ EXAMPLES=${WRKINST}${PREFIX}/share/examples/plan
NO_REGRESS= Yes
diff -urN -x CVS misc/plan/distinfo
/usr/ports/mystuff/ports/misc/plan/distinfo
--- misc/plan/distinfo Fri Jun 10 12:18:06 2005
+++ /usr/ports/mystuff/ports/misc/plan/distinfo Sun Jun 12 09:50:40 2005
@@ -1,4 +1,4 @@
-MD5 (plan-1.6.1.tar.gz) = 0003e582b34a80c1250cf7d3c476e7c2
-RMD160 (plan-1.6.1.tar.gz) = eb00c07be28ac7d2302986ae80b6b916e7e35263
-SHA1 (plan-1.6.1.tar.gz) = 4184602e997ac53f99b3d9b44c5925ad8e11cc3c
-SIZE (plan-1.6.1.tar.gz) = 303965
+MD5 (plan-1.9.tar.gz) = ab9e6b67c7b087f130c030aa779ef01d
+RMD160 (plan-1.9.tar.gz) = 7bed3f29c62341c264c9edeb60666d83092139ea
+SHA1 (plan-1.9.tar.gz) = 65afff961f801f888714993a9ed6e42a95b2d958
+SIZE (plan-1.9.tar.gz) = 441599
diff -urN -x CVS misc/plan/patches/patch-src-Makefile
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-Makefile
--- misc/plan/patches/patch-src-Makefile Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-Makefile Thu
Jan 1 01:00:00 1970
@@ -1,152 +0,0 @@
---- src/Makefile.orig Sun Apr 13 13:50:29 1997
-+++ src/Makefile Sat Apr 15 01:02:14 2000
-@@ -6,16 +6,22 @@
- # 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)
--MAN = /usr/man/local/man# # unformatted nroff manpage (plan.[14])
--# MAN = /usr/local/man/man# # for linux
-+PLANBASE = /usr/local#
-+DOCBASE = $(PLANBASE)/share/doc/plan#
-+NETPLAN = $(PLANBASE)/share# # netplan directory
-+ECHO = echo
-+DIR = $(PLANBASE)/bin# # user-callable executable (plan)
-+LIB = $(DIR)# # 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 = $(PLANBASE)/man/man# # for linux and freebsd
- 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,
-+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$(DOCS)"# 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
-@@ -26,9 +32,9 @@
- # -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
- # # JAPAN requires X11R5 and a Japanese env.
-
--DEBUG = -s
-+#DEBUG = -s
- #DEBUG = -g
--#DEBUG = -O2 -s # do NOT define -O2 on DEC OSF/1
machines!
-+DEBUG = -O2 -s # do NOT define -O2 on DEC OSF/1
machines!
-
- #DEFTARGET = sgi
- DEFTARGET = help
-@@ -55,6 +61,8 @@
- # -DVARARGS use pre-ANSI varargs instead of stdargs
- # -DDESTROYBUG fixes Linux XtDestroyWidget bug that kills plan when a
- # Done button is used. WARNING: introduces a memory leak
-+# -DSTDLIBMALLOC do not include <malloc.h>, use <stdlib.h> instead,
-+# (FreeBSD)
- #
- # Note for HP systems: if you have the PROG-AUX option, remove -DNOREGEX
- # from HP_C, and add -lPW to HP_L1. On Suns, try removing -DNOREGEX (and
-@@ -105,6 +113,9 @@
- BSDIG_C = -ansi -I/usr/X11/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX
-Dbsdi
- NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
- -DNO_MOTIF
-+OBSD_C = $(CFLAGS) -ansi -I/usr/local/include -I/usr/X11R6/include
-DBSD -DFLOCK -DRABBITS -Dopenbsd -DSTDLIBMALLOC
-+IBM_C = -O -I/usr/include/X11 -D_ALL_SOURCE -DIBM -DAIXV3 -DNOMSEP
-DRABBITS
-+PS2_C = -O -I/usr/include/X11 -D_POSIX_SOURCE\
- LINUX_C = -D_POSIX_SOURCE -DNOLOCK -DLINUX
- SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
- NEWS_C = -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DPID_T="int"
-Dconst=""
-@@ -181,6 +192,8 @@
- BSDIG_L2= -L/usr/X11/lib -lc
- NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11
- NBSD_L2 = -L/usr/X11R6/lib -lc
-+OBSD_L1 = -L /usr/local/lib -L/usr/X11R6/lib ${MOTIFLIB} -lXt -lX11
-lXext -lc
-+OBSD_L2 = -lc
- LINUX_L1= -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext
- LINUX_L2= -lc
- SVR4_L1 = -lXm -lXt -lX11 -lgen -lsocket -lnsl
-@@ -240,6 +253,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 svr4 SVR4 Using gcc"
- @echo " make news4 Sony NEWS-OS4.x"
- @echo " make news4g Sony NEWS-OS4.x with gcc"
-@@ -349,6 +363,9 @@
- netbsd:
- env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(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
-
-@@ -451,13 +468,13 @@
- $(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)\" $<
-+ $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\"
-c -DLIB=\"$(DOCS)\" $<
-
- util.o: util.c
- $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c
-DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
-
- netplan.o: netplan.c netplan_if.h
-- $(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=$(NOB_UID)
-DNOBODY_GID=$(NOB_GID) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-+ $(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=$(NOB_UID)
-DNOBODY_GID=$(NOB_GID) $(INCDIR) -c -DLIB=\"$(NETPLAN)\" $<
- # $(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=`grep nobody /etc/passwd | head
-1 | awk -F: '{print $$3}'` -DNOBODY_GID=`grep nobody /etc/passwd | head
-1 | awk -F: '{print $$4}'` $(INCDIR) -c -DLIB=\"$(LIB)\" $<
-
- parser.c: parser.y
-@@ -480,31 +497,25 @@
-
- #---------------------------------------------------------------
- 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)
-- 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
-- -mkdir $(LIB)/netplan.dir
-- -chmod 777 $(LIB)/netplan.dir
-+ ${INSTALL} -d $(DOCBASE)
-+ ${INSTALL} -d $(EXAMPLES)
-+ ${INSTALL} -c pland $(DIR)
-+ ${INSTALL} -c -m 755 notifier netplan plan ../misc/Killpland $(LIB)
-+ ${INSTALL} -c -m 644 ../misc/plan.help ../misc/plan_cal.ps \
-+ ../misc/Monochrome ../misc/BlackWhite $(DOCS)
-+ ${INSTALL} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
-+ ${INSTALL} -d $(NETPLAN)/netplan.dir
-+ -chmod 777 $(NETPLAN)/netplan.dir
- -test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat
- -test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat
- -test -x `which nroff` && nroff -man ../misc/netplan.1
>../misc/netplan.1cat
- -test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1
- -test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4
- -test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan.1
-- -test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1
-- -test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4
-- -test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan.1
-- -test -f ${HOME}/.holiday || cp ../holiday/holiday_german
${HOME}/.holiday
-- -test `uname` = IRIX && mkdir $$HOME/.icons
-- -test `uname` = IRIX && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon
-- @echo ""
-- @echo "use ../holiday/* as templates for your ~/.holiday file"
-+ ${INSTALL} -c -m 644 ../README $(DOCBASE)
-+ ${INSTALL} -c -m 644 ../holiday/holiday_* $(EXAMPLES)
-+ ${ECHO} ""
-+ ${ECHO} "Use " $(EXAMPLES)"/holiday/* as templates for your
~/.holiday file"
-
- clean:
- -rm -f *.o
diff -urN -x CVS misc/plan/patches/patch-src-daemon_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-daemon_c
--- misc/plan/patches/patch-src-daemon_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-daemon_c Thu
Jan 1 01:00:00 1970
@@ -1,50 +0,0 @@
---- src/daemon.c.orig Tue Apr 1 14:40:28 1997
-+++ src/daemon.c Sun Jun 22 14:17:04 1997
-@@ -68,6 +68,14 @@
- void *toplevel = 0; /* dummy for formfile.c */
- #endif
-
-+#if (defined BSD && !defined OSF)
-+typedef union wait wait_type;
-+#define WAIT_STATUS(x) (x.w_status)
-+#else
-+typedef int wait_type;
-+#define WAIT_STATUS(x) (x)
-+#endif
-+
- static void popup_window(), send_mail(), write_script(), exec_program();
- static char *get_subject(), *get_subtitle(), *get_icontitle();
- #ifdef MIPS
-@@ -210,6 +218,7 @@
- sleep(twait);
- #endif
- refresh_lock(LOCK_PATH);
-+#ifndef RABBITS
- #ifdef SUN
- if (pw) {
- struct utmp ut;
-@@ -259,6 +268,7 @@
- }
- }
- #endif
-+#endif
- total_wait -= twait;
- }
- }
-@@ -411,12 +421,10 @@
- int sig;
- {
- char path[40]; /* script to delete */
--#if (defined BSD && !defined OSF)
-- union wait dummy;
--#else
-- int dummy;
--#endif
-- sprintf(path, "/tmp/pland%d", wait(&dummy));
-+ wait_type dummy;
-+
-+ sprintf(path, "/tmp/pland%d", wait(&WAIT_STATUS(dummy)));
-+
- if (debug)
- printf("%s: deleting script \"%s\"\n", progname, path);
- (void)unlink(path);
diff -urN -x CVS misc/plan/patches/patch-src-daycalc_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-daycalc_c
--- misc/plan/patches/patch-src-daycalc_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-daycalc_c Thu
Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-*** src/daycalc.c.orig Wed Apr 2 16:51:43 1997
---- src/daycalc.c Wed Apr 2 16:52:23 1997
-***************
-*** 9,14 ****
---- 9,18 ----
- #include <stdio.h>
- #include <stdlib.h>
-+ #ifdef STDLIBMALLOC
-+ #include <stdlib.h>
-+ #else
- #ifndef NEWSOS4
- #include <malloc.h>
-+ #endif
- #endif
- #include <time.h>
diff -urN -x CVS misc/plan/patches/patch-src-help_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-help_c
--- misc/plan/patches/patch-src-help_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-help_c Thu Jan
1 01:00:00 1970
@@ -1,25 +0,0 @@
-*** src/help.c.orig Sun Apr 21 21:21:57 1996
---- src/help.c Wed Jul 31 19:23:30 1996
-***************
-*** 15,22 ****
- */
-
- #include <stdio.h>
-! #ifndef NEWSOS4
- #include <malloc.h>
- #endif
- #include <Xm/Xm.h>
- #include <Xm/DialogS.h>
---- 15,26 ----
- */
-
- #include <stdio.h>
-! #ifdef STDLIBMALLOC
-! #include <stdlib.h>
-! #else
-! #ifndef NEWSOS4
- #include <malloc.h>
-+ #endif
- #endif
- #include <Xm/Xm.h>
- #include <Xm/DialogS.h>
diff -urN -x CVS misc/plan/patches/patch-src-holiday_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-holiday_c
--- misc/plan/patches/patch-src-holiday_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-holiday_c Thu
Jan 1 01:00:00 1970
@@ -1,25 +0,0 @@
---- src/holiday.c.orig Thu Apr 3 21:51:40 1997
-+++ src/holiday.c Thu Jun 19 14:13:49 1997
-@@ -17,9 +17,13 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <time.h>
-+#ifdef STDLIBMALLOC
-+#include <stdlib.h>
-+#else
- #ifndef NEWSOS4
- #include <malloc.h>
- #endif
-+#endif
- #ifdef CPP_PATH
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -43,7 +47,7 @@
-
- static int calc_easter();
-
--#if defined(bsdi) || defined(linux) || defined(__NetBSD__)
-+#if defined(bsdi) || defined(linux) || defined(__NetBSD__) ||
defined(__FreeBSD__) || defined(__OpenBSD__)
- int yylineno;
- #else
- extern int yylineno; /* current line # being parsed */
diff -urN -x CVS misc/plan/patches/patch-src-netplan_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-netplan_c
--- misc/plan/patches/patch-src-netplan_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-netplan_c Thu
Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
-*** src/netplan.c.orig Sun Apr 14 19:54:00 1996
---- src/netplan.c Sun Apr 14 19:57:23 1996
-***************
-*** 197,203 ****
-
- if (FD_ISSET(fd_inet, &rd)) { /* connect */
- n = sizeof(addr);
-! if ((fd = accept(fd_inet, &addr, &n)) < 0)
- perror(progname);
- FD_SET(fd, &rd0);
- setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, 4);
---- 197,204 ----
-
- if (FD_ISSET(fd_inet, &rd)) { /* connect */
- n = sizeof(addr);
-! fd = accept(fd_inet, (struct sockaddr *)&addr, &n);
-! if (fd < 0)
- perror(progname);
- FD_SET(fd, &rd0);
- setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, 4);
-***************
-*** 277,283 ****
- addr.sin_family = AF_INET;
- addr.sin_port = serv ? serv->s_port : PORT;
- addr.sin_addr.s_addr = INADDR_ANY;
-! if (bind(fd, &addr, sizeof(addr)))
- fatal("cannot bind to port %d, is another daemon running?",
- addr.sin_port);
- if (listen(fd, 100))
---- 278,284 ----
- addr.sin_family = AF_INET;
- addr.sin_port = serv ? serv->s_port : PORT;
- addr.sin_addr.s_addr = INADDR_ANY;
-! if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)))
- fatal("cannot bind to port %d, is another daemon running?",
- addr.sin_port);
- if (listen(fd, 100))
diff -urN -x CVS misc/plan/patches/patch-src-sublist_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-sublist_c
--- misc/plan/patches/patch-src-sublist_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-sublist_c Thu
Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
-*** src/sublist.c.orig Sun Apr 14 16:38:13 1996
---- src/sublist.c Sun Apr 14 16:38:34 1996
-***************
-*** 23,29 ****
- #define regcmp re_comp
- #define regex re_exec
- #endif
-! #ifdef linux
- #define regcmp regcomp
- #define regex regexec
- #endif
---- 23,29 ----
- #define regcmp re_comp
- #define regex re_exec
- #endif
-! #if defined(linux) || defined(freebsd) || defined(openbsd)
- #define regcmp regcomp
- #define regex regexec
- #endif
diff -urN -x CVS misc/plan/patches/patch-src-weekcalc_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-weekcalc_c
--- misc/plan/patches/patch-src-weekcalc_c Fri Apr 21 23:26:18 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-weekcalc_c Thu
Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-*** src/weekcalc.c.orig Thu Feb 6 16:08:42 1997
---- src/weekcalc.c Wed Apr 2 16:19:42 1997
-***************
-*** 9,14 ****
---- 9,18 ----
- #include <stdio.h>
- #include <stdlib.h>
-+ #ifdef STDLIBMALLOC
-+ #include <stdlib.h>
-+ #else
- #ifndef NEWSOS4
- #include <malloc.h>
-+ #endif
- #endif
- #include <time.h>
diff -urN -x CVS misc/plan/patches/patch-src-yovcalc_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src-yovcalc_c
--- misc/plan/patches/patch-src-yovcalc_c Fri Apr 21 23:26:19 2000
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src-yovcalc_c Thu
Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-*** src/yovcalc.c.orig Thu Feb 6 16:08:47 1997
---- src/yovcalc.c Wed Apr 2 16:22:30 1997
-***************
-*** 9,14 ****
---- 9,18 ----
- #include <stdio.h>
- #include <stdlib.h>
-+ #ifdef STDLIBMALLOC
-+ #include <stdlib.h>
-+ #else
- #ifndef NEWSOS4
- #include <malloc.h>
-+ #endif
- #endif
- #include <time.h>
diff -urN -x CVS misc/plan/patches/patch-src_Makefile
/usr/ports/mystuff/ports/misc/plan/patches/patch-src_Makefile
--- misc/plan/patches/patch-src_Makefile Thu Jan 1 01:00:00 1970
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src_Makefile Mon
Aug 8 11:02:07 2005
@@ -0,0 +1,132 @@
+$OpenBSD$
+--- src/Makefile.orig Sun Feb 6 20:11:34 2005
++++ src/Makefile Mon Aug 8 11:01:41 2005
+@@ -7,20 +7,23 @@
+ # 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.
+ #
++PLANBASE=/usr/local
++DOCBASE=$(PLANBASE)/share/doc/plan
+ # # user-callable executable (plan)
+-DIR=/usr/local/bin
++DIR=$(PLANBASE)/bin
+ # # auxiliary programs (pland, notifier, PS)
+-LIB=/usr/local/lib
++LIB=$(DIR)
++EXAMPLES=$(PLANBASE)/share/examples/plan
+ # # help file (plan.help)
+-SBIN=/usr/local/bin
++SBIN=$(PLANBASE)/sbin
+ # # system programs (netplan)
+-HELP=/usr/local/lib
++HELP=$(DOCBASE)
+ # # netplan expects netplan.dir/ here
+-NETPLANDIR=/usr/local/lib
++NETPLANDIR=$(PLANBASE)/share
+ # # unformatted nroff manpage (plan.[14])
+-MAN=/usr/local/man/man
++MAN=$(PLANBASE)/man
+ # # formatted manpage (plan.[14])
+-CATMAN=/usr/catman/local/cat
++CATMAN=NONE
+ # # subdirectory in home dir, or empty
+ PLANRULE=
+ # # lockfile for plan, %d is uid
+@@ -34,12 +37,12 @@ LEX=lex
+ # # standard Unix compiler generator
+ YACC=yacc
+ # # numerical user ID of <nobody> account
+-NOB_UID=60001
++NOB_UID=32767
+ # # default numerical group ID of <nobody>
+-NOB_GID=60001
++NOB_GID=32767
+ # # used by plan to pre-process holiday files,
+ # # plan will check if this file really exists
+-CPP_PATH='/lib/cpp -P -I$(HELP)'
++CPP_PATH='/usr/bin/cpp -P -I$(HELP)'
+ # # by default, fork on startup? TRUE or FALSE
+ DOFORK=TRUE
+ # # switching to ISO8859-1
+@@ -55,9 +58,9 @@ 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=-O2 -s
+ # # what to do without make arguments
+-DEFTARGET=linux
++DEFTARGET=openbsd
+ #------------------------- end of configuration section
----------------------
+
+ OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\"
-DPLANDLOCK=\"$(PLANDLOCK)\"
+@@ -142,7 +145,7 @@ NBSD_C = -ansi -I/usr/X11R6/include -DBS
+ FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
+ -DSTDLIBMALLOC
+ OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
+- -DNO_MOTIF -DSTDLIBMALLOC
++ -DSTDLIBMALLOC -I/usr/local/include
+ LINUX_C = -W -Wall -I/usr/X11R6/include -DNOLOCK -DLINUX
+ SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
+ NEWS_C = -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DNGROUPS_MAX=16\
+@@ -221,7 +224,7 @@ NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX
+ 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 = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11 -lXpm -lc
-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_L2= -lc
+@@ -556,34 +559,23 @@ g_dbase.o g_dbfile.o g_formfile.o g_form
+
+ #---------------------------------------------------------------
+ install:
+- -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier
$(DESTDIR)$(LIB)/netplan
+- mkdir -p $(DESTDIR)$(DIR)
+- cp plan $(DESTDIR)$(DIR)
+- mkdir -p $(DESTDIR)$(LIB)
+- cp pland notifier ../misc/plan_cal.ps ../language/* $(DESTDIR)$(LIB)
+- mkdir -p $(DESTDIR)$(SBIN)
+- cp netplan $(DESTDIR)$(SBIN)
+- -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB))
|| exit 0
+- mkdir -p $(DESTDIR)$(HELP)
+- cp ../language/plan.help $(DESTDIR)$(HELP)
+- -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland
$(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
+- -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland
$(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
+- -chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps
$(DESTDIR)$(LIB)/plan.lang.*
+- -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps)
|| exit 0
+- mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
+- -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
+- -(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 -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
++ ${INSTALL} -d $(DOCBASE)
++ ${INSTALL} -d $(EXAMPLES)
++ ${INSTALL} -d $(MAN)/man1
++ ${INSTALL} -d $(MAN)/man4
++ ${INSTALL} -d $(MAN)/man8
++ ${INSTALL} -c -m 755 plan pland $(DIR)
++ ${INSTALL} -c -m 755 notifier netplan $(SBIN)
++ ${INSTALL} -c -m 644 ../language/plan.lang.* $(LIB)
++ ${INSTALL} -c -m 644 ../misc/plan_cal.ps ../language/plan.help $(HELP)
++ ${INSTALL} -d $(NETPLANDIR)/netplan.dir
++ ${INSTALL} -c -m 644 ../README ../HISTORY $(HELP)
++ ${INSTALL} -c -m 644 ../holiday/holiday_* $(EXAMPLES)
++ ${INSTALL} -c -m 644 ../misc/plan.1 $(MAN)/man1
++ ${INSTALL} -c -m 644 ../misc/plan.4 $(MAN)/man4
++ ${INSTALL} -c -m 644 ../misc/netplan.1 $(MAN)/man8
++ mv $(MAN)/man8/netplan.1 $(MAN)/man8/netplan.8
++
+ @echo ""
+ @echo "use ../holiday/* as templates for your ~/.holiday file"
+
diff -urN -x CVS misc/plan/patches/patch-src_netplan_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src_netplan_c
--- misc/plan/patches/patch-src_netplan_c Thu Jan 1 01:00:00 1970
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src_netplan_c Sun
Jun 12 10:26:16 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/netplan.c.orig Sun Jun 12 11:57:26 2005
++++ src/netplan.c Sun Jun 12 11:57:42 2005
+@@ -136,7 +136,7 @@ int main(
+ time_t t;
+ struct stat st;
+ static const char nobody[] = "anonymous";
+- static const char nobody_name1[] = "netplan";
++ static const char nobody_name1[] = "_netplan";
+ static const char nobody_name2[] = "nobody";
+ uid_t nobody_uid = NOBODY_UID;
+ gid_t nobody_gid = NOBODY_GID;
diff -urN -x CVS misc/plan/patches/patch-src_time_c
/usr/ports/mystuff/ports/misc/plan/patches/patch-src_time_c
--- misc/plan/patches/patch-src_time_c Thu Jan 1 01:00:00 1970
+++ /usr/ports/mystuff/ports/misc/plan/patches/patch-src_time_c Mon Aug
8 11:13:46 2005
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- 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)
+ tm = localtime(&now);
+ zone = -tm->tm_gmtoff;
+ #else
+-#if defined(__FreeBSD__) /* by Stefan `Sec` Zehl <[EMAIL PROTECTED]> */
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
++/* by Stefan `Sec` Zehl <[EMAIL PROTECTED]> */
+ time_t now = time(0);
+ struct tm *tm = localtime(&now);
+ config.tzone = tm->tm_gmtoff;
diff -urN -x CVS misc/plan/pkg/PLIST
/usr/ports/mystuff/ports/misc/plan/pkg/PLIST
--- misc/plan/pkg/PLIST Fri Jun 10 12:18:06 2005
+++ /usr/ports/mystuff/ports/misc/plan/pkg/PLIST Mon Aug 8 11:20:37 2005
@@ -1,35 +1,52 @@
@comment $OpenBSD: PLIST,v 1.5 2004/09/15 17:54:16 espie Exp $
-bin/Killpland
-bin/netplan
-bin/notifier
[EMAIL PROTECTED] _netplan:549
[EMAIL PROTECTED] _netplan:549:549:daemon:Plan:/nonexistent:/sbin/nologin
bin/plan
+bin/plan.lang.dutch
+bin/plan.lang.english
+bin/plan.lang.french
+bin/plan.lang.german
+bin/plan.lang.italian
+bin/plan.lang.spanish
bin/pland
[EMAIL PROTECTED] man/man1/netplan.1
@man man/man1/plan.1
@man man/man4/plan.4
[EMAIL PROTECTED] man/man8/netplan.8
+sbin/netplan
+sbin/notifier
share/doc/plan/
-share/doc/plan/BlackWhite
-share/doc/plan/Mkdoc
-share/doc/plan/Mkdoc.nawk
-share/doc/plan/Monochrome
+share/doc/plan/HISTORY
share/doc/plan/README
share/doc/plan/plan.help
share/doc/plan/plan_cal.ps
share/examples/plan/
share/examples/plan/holiday_australia
+share/examples/plan/holiday_austria
share/examples/plan/holiday_bavarian
share/examples/plan/holiday_belgium
+share/examples/plan/holiday_belgium_french
share/examples/plan/holiday_canada
+share/examples/plan/holiday_combi
+share/examples/plan/holiday_czech
+share/examples/plan/holiday_denmark
share/examples/plan/holiday_dutch
share/examples/plan/holiday_finnish
share/examples/plan/holiday_french
share/examples/plan/holiday_frswiss
share/examples/plan/holiday_german
+share/examples/plan/holiday_greek
+share/examples/plan/holiday_hungary
share/examples/plan/holiday_italy
share/examples/plan/holiday_japan
+share/examples/plan/holiday_norway
+share/examples/plan/holiday_portugal
share/examples/plan/holiday_quebec
+share/examples/plan/holiday_slovak
share/examples/plan/holiday_spain
share/examples/plan/holiday_swedish
share/examples/plan/holiday_uk
share/examples/plan/holiday_us
[EMAIL PROTECTED] 770
[EMAIL PROTECTED] _netplan
[EMAIL PROTECTED] _netplan
share/netplan.dir/
