head	1.6;
access;
symbols
	pkgsrc-2026Q1:1.6.0.156
	pkgsrc-2026Q1-base:1.6
	pkgsrc-2025Q4:1.6.0.154
	pkgsrc-2025Q4-base:1.6
	pkgsrc-2025Q3:1.6.0.152
	pkgsrc-2025Q3-base:1.6
	pkgsrc-2025Q2:1.6.0.150
	pkgsrc-2025Q2-base:1.6
	pkgsrc-2025Q1:1.6.0.148
	pkgsrc-2025Q1-base:1.6
	pkgsrc-2024Q4:1.6.0.146
	pkgsrc-2024Q4-base:1.6
	pkgsrc-2024Q3:1.6.0.144
	pkgsrc-2024Q3-base:1.6
	pkgsrc-2024Q2:1.6.0.142
	pkgsrc-2024Q2-base:1.6
	pkgsrc-2024Q1:1.6.0.140
	pkgsrc-2024Q1-base:1.6
	pkgsrc-2023Q4:1.6.0.138
	pkgsrc-2023Q4-base:1.6
	pkgsrc-2023Q3:1.6.0.136
	pkgsrc-2023Q3-base:1.6
	pkgsrc-2023Q2:1.6.0.134
	pkgsrc-2023Q2-base:1.6
	pkgsrc-2023Q1:1.6.0.132
	pkgsrc-2023Q1-base:1.6
	pkgsrc-2022Q4:1.6.0.130
	pkgsrc-2022Q4-base:1.6
	pkgsrc-2022Q3:1.6.0.128
	pkgsrc-2022Q3-base:1.6
	pkgsrc-2022Q2:1.6.0.126
	pkgsrc-2022Q2-base:1.6
	pkgsrc-2022Q1:1.6.0.124
	pkgsrc-2022Q1-base:1.6
	pkgsrc-2021Q4:1.6.0.122
	pkgsrc-2021Q4-base:1.6
	pkgsrc-2021Q3:1.6.0.120
	pkgsrc-2021Q3-base:1.6
	pkgsrc-2021Q2:1.6.0.118
	pkgsrc-2021Q2-base:1.6
	pkgsrc-2021Q1:1.6.0.116
	pkgsrc-2021Q1-base:1.6
	pkgsrc-2020Q4:1.6.0.114
	pkgsrc-2020Q4-base:1.6
	pkgsrc-2020Q3:1.6.0.112
	pkgsrc-2020Q3-base:1.6
	pkgsrc-2020Q2:1.6.0.108
	pkgsrc-2020Q2-base:1.6
	pkgsrc-2020Q1:1.6.0.88
	pkgsrc-2020Q1-base:1.6
	pkgsrc-2019Q4:1.6.0.110
	pkgsrc-2019Q4-base:1.6
	pkgsrc-2019Q3:1.6.0.106
	pkgsrc-2019Q3-base:1.6
	pkgsrc-2019Q2:1.6.0.104
	pkgsrc-2019Q2-base:1.6
	pkgsrc-2019Q1:1.6.0.102
	pkgsrc-2019Q1-base:1.6
	pkgsrc-2018Q4:1.6.0.100
	pkgsrc-2018Q4-base:1.6
	pkgsrc-2018Q3:1.6.0.98
	pkgsrc-2018Q3-base:1.6
	pkgsrc-2018Q2:1.6.0.96
	pkgsrc-2018Q2-base:1.6
	pkgsrc-2018Q1:1.6.0.94
	pkgsrc-2018Q1-base:1.6
	pkgsrc-2017Q4:1.6.0.92
	pkgsrc-2017Q4-base:1.6
	pkgsrc-2017Q3:1.6.0.90
	pkgsrc-2017Q3-base:1.6
	pkgsrc-2017Q2:1.6.0.86
	pkgsrc-2017Q2-base:1.6
	pkgsrc-2017Q1:1.6.0.84
	pkgsrc-2017Q1-base:1.6
	pkgsrc-2016Q4:1.6.0.82
	pkgsrc-2016Q4-base:1.6
	pkgsrc-2016Q3:1.6.0.80
	pkgsrc-2016Q3-base:1.6
	pkgsrc-2016Q2:1.6.0.78
	pkgsrc-2016Q2-base:1.6
	pkgsrc-2016Q1:1.6.0.76
	pkgsrc-2016Q1-base:1.6
	pkgsrc-2015Q4:1.6.0.74
	pkgsrc-2015Q4-base:1.6
	pkgsrc-2015Q3:1.6.0.72
	pkgsrc-2015Q3-base:1.6
	pkgsrc-2015Q2:1.6.0.70
	pkgsrc-2015Q2-base:1.6
	pkgsrc-2015Q1:1.6.0.68
	pkgsrc-2015Q1-base:1.6
	pkgsrc-2014Q4:1.6.0.66
	pkgsrc-2014Q4-base:1.6
	pkgsrc-2014Q3:1.6.0.64
	pkgsrc-2014Q3-base:1.6
	pkgsrc-2014Q2:1.6.0.62
	pkgsrc-2014Q2-base:1.6
	pkgsrc-2014Q1:1.6.0.60
	pkgsrc-2014Q1-base:1.6
	pkgsrc-2013Q4:1.6.0.58
	pkgsrc-2013Q4-base:1.6
	pkgsrc-2013Q3:1.6.0.56
	pkgsrc-2013Q3-base:1.6
	pkgsrc-2013Q2:1.6.0.54
	pkgsrc-2013Q2-base:1.6
	pkgsrc-2013Q1:1.6.0.52
	pkgsrc-2013Q1-base:1.6
	pkgsrc-2012Q4:1.6.0.50
	pkgsrc-2012Q4-base:1.6
	pkgsrc-2012Q3:1.6.0.48
	pkgsrc-2012Q3-base:1.6
	pkgsrc-2012Q2:1.6.0.46
	pkgsrc-2012Q2-base:1.6
	pkgsrc-2012Q1:1.6.0.44
	pkgsrc-2012Q1-base:1.6
	pkgsrc-2011Q4:1.6.0.42
	pkgsrc-2011Q4-base:1.6
	pkgsrc-2011Q3:1.6.0.40
	pkgsrc-2011Q3-base:1.6
	pkgsrc-2011Q2:1.6.0.38
	pkgsrc-2011Q2-base:1.6
	pkgsrc-2011Q1:1.6.0.36
	pkgsrc-2011Q1-base:1.6
	pkgsrc-2010Q4:1.6.0.34
	pkgsrc-2010Q4-base:1.6
	pkgsrc-2010Q3:1.6.0.32
	pkgsrc-2010Q3-base:1.6
	pkgsrc-2010Q2:1.6.0.30
	pkgsrc-2010Q2-base:1.6
	pkgsrc-2010Q1:1.6.0.28
	pkgsrc-2010Q1-base:1.6
	pkgsrc-2009Q4:1.6.0.26
	pkgsrc-2009Q4-base:1.6
	pkgsrc-2009Q3:1.6.0.24
	pkgsrc-2009Q3-base:1.6
	pkgsrc-2009Q2:1.6.0.22
	pkgsrc-2009Q2-base:1.6
	pkgsrc-2009Q1:1.6.0.20
	pkgsrc-2009Q1-base:1.6
	pkgsrc-2008Q4:1.6.0.18
	pkgsrc-2008Q4-base:1.6
	pkgsrc-2008Q3:1.6.0.16
	pkgsrc-2008Q3-base:1.6
	cube-native-xorg:1.6.0.14
	cube-native-xorg-base:1.6
	pkgsrc-2008Q2:1.6.0.12
	pkgsrc-2008Q2-base:1.6
	cwrapper:1.6.0.10
	pkgsrc-2008Q1:1.6.0.8
	pkgsrc-2008Q1-base:1.6
	pkgsrc-2007Q4:1.6.0.6
	pkgsrc-2007Q4-base:1.6
	pkgsrc-2007Q3:1.6.0.4
	pkgsrc-2007Q3-base:1.6
	pkgsrc-2007Q2:1.6.0.2
	pkgsrc-2007Q2-base:1.6
	pkgsrc-2007Q1:1.5.0.10
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.5.0.8
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.5.0.6
	pkgsrc-2006Q3-base:1.5
	pkgsrc-2006Q2:1.5.0.4
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.5.0.2
	pkgsrc-2006Q1-base:1.5
	pkgsrc-2005Q4:1.4.0.14
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.12
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.10
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.8
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.6
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.4
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.4.0.2
	pkgsrc-2004Q2-base:1.4
	pkgsrc-2004Q1:1.3.0.12
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.10
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.3.0.6
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.3.0.8
	netbsd-1-6-RELEASE-base:1.3
	pkgviews:1.3.0.4
	pkgviews-base:1.3
	buildlink2:1.3.0.2
	buildlink2-base:1.3
	netbsd-1-5-PATCH003:1.3
	netbsd-1-5-PATCH001:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.6
date	2007.04.28.15.20.42;	author reed;	state Exp;
branches;
next	1.5;

1.5
date	2006.01.02.22.29.03;	author joerg;	state Exp;
branches;
next	1.4;

1.4
date	2004.06.10.22.42.42;	author jschauma;	state Exp;
branches;
next	1.3;

1.3
date	2001.07.24.09.27.58;	author jlam;	state Exp;
branches;
next	1.2;

1.2
date	2001.07.03.20.35.32;	author jlam;	state Exp;
branches;
next	1.1;

1.1
date	2000.12.17.23.32.23;	author wiz;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.12.17.23.32.23;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Updated plan to 1.9.

This for PR #36216. Thank you Steven for testing.

Sort some of PLIST.

Removed a few patches that were integrated or not needed.

Changes are:

====== 1.8.5 released 16.2.03 =======

FEATURES:
    * plan's FTP home site has a new name: plan.ftp.fu-berlin.de, shown in
      the About popup. The old address will continue to work. (Thanks, Heiko!)
    * set locale to support other character sets such as Czech, by Petr Kristan
      <petr.kristan@@epos.cz>
    * OpenBSD port by Armin Wolfermann <armin.wolfermann@@viscomp.com>
    * new plan2vcs perl script that converts plan appointments to korganizer
      format, by Bert Bos <bert@@w3.org>
    * if there is a ~/.holiday file, don't read LIB/holiday as well.
    * skip junk in entries synced from PalmPilot DateBk4 messages, by Johan
      Vromans <jvromans@@squirrel.nl>
    * allow new holiday syntax "workday before/after <date>", by Ian Holland
      <irh@@statscout.com>
    * Italian language translations by Paolo Panizza <pp@@ieee.org>
    * accept yyyy/mm/dd date input, Brian T. Schellenberger <bts@@babbleon.org>
    * Slovak holidays by Mikulas Sustak <sustak@@kte.sjf.stuba.sk>

BUG FIXES:
    * fixed Debian bug 157425: color selection dropbox always starts on Default
    * Suns apparently still run X11R5 and don't have XtSignalId et. al.
    * configure script had problems with defaults when using bash (Michael
      Mauch <michael.mauch@@gmx.de>
    * fixed configure script problems on Solaris 2.6, by Horst Scheuermann
      <scheuerm@@uni-trier.de>
    * fixed Dutch Driekoningen holiday date, by Johan Vromans
      <JVromans@@squirrel.nl>
    * IBM AIX doesn't have Xt timers and doesn'd compile plan 1.8.4, excluded
      XFree workaround for IBM
    * week number 2 appeared twice in 2001. Fixed by Helmut Jarausch
      <jarausch@@igpm.rwth-aachen.de>
    * Search->One file could not select the "own" file (top menu choice).
    * cleanup: removed remaining K&R varargs and sunkr target
    * fixed '@@' user notation in netplan server, by Gennadi Umanski
      <umanskij@@ti.uni-trier.de>
    * fixed Japanese string converion, by Tomoko Hayashi <tomoko@@u-aizu.ac.jp>
    * other people's .dayplan file references ('L' lines in ~/.dayplan) over-
      wrote own file entries (Heiko Schlichting <heiko@@FU-Berlin.DE>)


====== 1.8.6 released 18.3.03 =======

FEATURES:
    * reversed the change in 1.8.5, at popular demand, that lets a personal
      holiday file replace the system holiday file. plan 1.8.6 again reads
      both, system first. The new "reset" keywords can be used to clear all
      system holidays, following an idea by Heiko Schlichting.

BUG FIXES:
    * the edit menu was broken in 1.8.5, fixed by Heiko Schlichting
      <heiko@@FU-Berlin.DE>


====== 1.8.7 released 30.9.03 =======

FEATURES:
    * deleted support for SCO
    * pland -p pops up all alarms that triggered since the last time pland
      ran, not just those from the past three hours, by Brian L. Shaver
      <shaker.lxxv@@verizon.net>
    * more room for appointments in year overview, moved year to left edge

BUG FIXES:
    * newly entered appointments no longer vanish from the edit menu.
    * fixed errno compiler errors on SMP systems, Thomas Ribbrock
      <emgaron@@gmx.net>
    * Italian language translations by Paolo Panizza <pp@@ieee.org> were
      missing from the 1.8.5 and 1.8.6 distributions, now included


====== 1.9 released 6.2.05 =======

FEATURES:
    * saved space in various calendar views such as the year overview
    * the week view repeats the hour title every few day rows; it was too easy
      to get lost without scrolling all the time
    * remove obsolete warning windows when the next warning or the main alarm
      is reached.
    * Linux: when a lockfile from a previous plan process is found, do not kill
      it if it's dead and some non-plan process now uses the old process ID.
    * if user "netplan" exists on the system, netplan runs as that user instead
      of nobody. Needed for Debian. Petter Reinholdtsen <pere@@hungry.com>
    * added Belgian French holiday file, Nicolas E'vrard <nicoe@@wanadoo.be>
    * command-line option -V: experimental and incomplete vCalendar export.
      File can be read by calendar programs such as Mozilla Calendar.
    * plan is now distributed under the GPL license, at your choice.
    * netplan has a new option -s that sends all messages to syslog.

BUG FIXES:
    * fixed Italian language file, Carlo Mandelli
      <carlo.mandelli@@consulenti.fastweb.it>
    * fixed misspelling in the Italian language file, littledark
      <littledark@@swissinfo.org>
    * "Delete past entries" did not remove repeating entries whose end date is
      in the past, Aaron Kaplan <kaplan@@cs.rochester.edu>
    * fixed choice 1 of configure script on Solaris, Aaron Kaplan
      <kaplan@@cs.rochester.edu>
    * after running a long time (months), alarms stopped triggering. Fixed by
      Aaron Kaplan <kaplan@@cs.rochester.edu>
    * fixed Spanish holiday file, Fernando Tricas "Garci'a"
      <ftricas@@amon.cps.unizar.es>
    * fixed loads of inane gcc warning messages
@
text
@$NetBSD$

--- Makefile.orig	2005-02-06 13:11:34.000000000 -0600
+++ Makefile	2007-04-26 09:15:40.000000000 -0500
@@@@ -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=${PREFIX}/libexec/plan
 #				# help file (plan.help)
-SBIN=/usr/local/bin
+SBIN=${LIB}
 #				# system programs (netplan)
-HELP=/usr/local/lib
+HELP=${PREFIX}/share/plan
 #				# netplan expects netplan.dir/ here
-NETPLANDIR=/usr/local/lib
+NETPLANDIR=${LIB}
 #				# unformatted nroff manpage (plan.[14])
-MAN=/usr/local/man/man
+MAN=${PREFIX}/${PKGMANDIR}/man
 #				# formatted manpage (plan.[14])
-CATMAN=/usr/catman/local/cat
+CATMAN=${PREFIX}/${PKGMANDIR}/cat
 #				# subdirectory in home dir, or empty
 PLANRULE=
 #				# lockfile for plan, %d is uid
@@@@ -34,12 +34,12 @@@@
 #				# 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=39
 # 				# 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
@@@@ -57,7 +57,7 @@@@
 DEBUG=-g
 DEBUG=-O2
 #				# what to do without make arguments
-DEFTARGET=linux
+DEFTARGET=netbsd
 #------------------------- end of configuration section ----------------------
 
 OPT=$(DEBUG) $(PLANRULE) -DPLANLOCK=\"$(PLANLOCK)\" -DPLANDLOCK=\"$(PLANDLOCK)\"
@@@@ -103,7 +103,7 @@@@
 
 SGI4_C	=
 SGI5_C	= -DSYSV -DSVR4 -DDESKTOP
-SGI6_C	= -n32 -mips3 -woff 1167 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
+SGI6_C	= ${CFLAGS} -woff 1167 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
 HP8_C	= -Aa -I/usr/include/Motif1.1 -I/usr/include/X11R4 -I/usr/include\
 	  -D_INCLUDE_HPUX_SOURCE -D_INCLUDE_POSIX_SOURCE\
 	  -D_INCLUDE_XOPEN_SOURCE -DNOREGEX -DFIXMBAR -DRABBITS
@@@@ -137,8 +137,7 @@@@
 USL_C	= -DNOKILL0 -I/usr/X/include
 BSDI_C	= -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi
 BSDIG_C	= -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi 
-NBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
-	  -DNO_MOTIF
+NBSD_C	= ${CFLAGS} -ansi -DBSD -DRABBITS -DNOLOCK -DNOREGEX 
 FBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
 	  -DSTDLIBMALLOC
 OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
@@@@ -217,8 +216,8 @@@@
 BSDI_L2	= -lc
 BSDIG_L1= -L/usr/X11/lib -lXm -lXt -lX11
 BSDIG_L2= -L/usr/X11/lib -lc
-NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
-NBSD_L2	= -L/usr/X11R6/lib -lc
+NBSD_L1	=  ${LDFLAGS} -lXm -lXt -lX11
+NBSD_L2	= ${LDFLAGS} -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
@@@@ -403,8 +402,8 @@@@
 bsdig:
 	env CF="$(BSDIG_C)" L1F="$(BSDIG_L1)" L2F="$(BSDIG_L2)" MYCC=gcc make all
 
-netbsd:
-	env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAKE) all
+netbsd dragonfly:
+	env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=${CC} $(MAKE) all
 
 freebsd:
 	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
@@@@ -556,34 +555,18 @@@@
 
 #---------------------------------------------------------------
 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
+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(DIR)
+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(LIB)
+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(HELP)
+	${BSD_INSTALL_PROGRAM} plan $(DESTDIR)$(DIR)
+	${BSD_INSTALL_PROGRAM} pland notifier netplan $(DESTDIR)$(LIB)
+	${BSD_INSTALL_DATA} ../misc/plan_cal.ps $(DESTDIR)$(LIB)
+	${BSD_INSTALL_DATA} ../language/plan.* $(DESTDIR)$(HELP)
+	-mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
+	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
+	${BSD_INSTALL_MAN} ../misc/plan.1 $(DESTDIR)$(MAN)1/plan.1
+	${BSD_INSTALL_MAN} ../misc/plan.4 $(DESTDIR)$(MAN)4/plan.4
+	${BSD_INSTALL_MAN} ../misc/netplan.1 $(DESTDIR)$(MAN)1/netplan.1
 	@@echo ""
 	@@echo "use ../holiday/* as templates for your ~/.holiday file"
 
@


1.5
log
@Fix errno. DragonFly support.
@
text
@d3 2
a4 2
--- Makefile.orig	2000-07-17 20:07:03.000000000 +0000
+++ Makefile
d15 1
a15 1
-SBIN=/usr/local/lib
d24 2
a25 2
-MAN=/usr/local/man
+MAN=${PREFIX}/man/man
d28 1
a28 1
+CATMAN=${PREFIX}/man/cat
d32 1
a32 1
@@@@ -34,12 +34,12 @@@@ LEX=lex
d48 2
a49 2
@@@@ -55,7 +55,7 @@@@ HOLIDAY=german
 #				# do NOT define -O2 on DEC OSF/1 machines!
d52 1
a52 1
-DEFTARGET=help
d57 1
a57 1
@@@@ -102,7 +102,7 @@@@ DESTDIR=
d61 2
a62 2
-SGI6_C	= -n32 -mips3 -woff 1110,1167,1185 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
+SGI6_C	= ${CFLAGS} -woff 1110,1167,1185 -DSYSV -DSVR4 -DDESKTOP -D_BSD_SIGNALS
d66 1
a66 1
@@@@ -140,8 +140,7 @@@@ NCR_C	= -DNCR -DNOMSEP -DRABBITS
d72 1
a72 1
+NBSD_C	= ${CFLAGS} -ansi -DBSD -DRABBITS -DNOLOCK -DNOREGEX
d75 2
a76 2
 LINUX_C	= -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX
@@@@ -224,8 +223,8 @@@@ BSDI_L1	= -lXm -lXt -lX11
d82 1
a82 1
+NBSD_L1	= ${LDFLAGS} -lXm -lXt -lX11
d86 2
a87 2
 LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
@@@@ -419,8 +418,8 @@@@ bsdi:
d98 1
a98 1
@@@@ -569,34 +568,18 @@@@ g_dbase.o g_dbfile.o g_formfile.o g_form
d118 9
a126 9
-	-(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
@


1.4
log
@Make this compile on Linux and IRIX and increase odds of working on
other non-NetBSD platforms as well (though they may need ALL_TARGET
tweaking):
- apparently some versions of Linux/gcc combinations require
  the header file errno.h included in each file in order for
  it to link (otherwise, it will compile (!?) but bail out
  when linking)
- set ALL_TARGET to LOWER_OPSYS
  this works for netbsd and linux, and should work for the other bsds
  at least.
- set ALL_TARGET differently for IRIX
- use CFLAGS instead of hard-coded ABI flags for IRIX 6
- some install-sh/install can not handle multiple files/directories at
  once.  Newer bootstrapped versions can, but for systems that still
  have the older one we may as well split this for better compatibility.
@
text
@d1 1
a1 1
$NetBSD: $
d3 2
a4 2
--- Makefile.orig	2000-07-17 16:07:03.000000000 -0400
+++ Makefile	2004-06-10 18:02:25.000000000 -0400
d32 1
a32 1
@@@@ -34,12 +34,12 @@@@
d48 1
a48 1
@@@@ -55,7 +55,7 @@@@
d57 1
a57 1
@@@@ -102,7 +102,7 @@@@
d66 1
a66 1
@@@@ -140,8 +140,7 @@@@
d76 1
a76 1
@@@@ -224,8 +223,8 @@@@
d87 2
a88 1
@@@@ -420,7 +419,7 @@@@
d91 1
a91 1
 netbsd:
d93 1
d98 1
a98 1
@@@@ -569,34 +568,18 @@@@
@


1.3
log
@Fix installation by creating directories prior to copying files into them.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- Makefile.orig	Mon Jul 17 13:07:03 2000
+++ Makefile
d57 9
@


1.2
log
@Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
@
text
@d3 1
a3 1
--- Makefile.orig	Mon Jul 17 16:07:03 2000
d87 1
a87 1
@@@@ -569,34 +568,15 @@@@
d119 12
a130 9
+	${BSD_INSTALL_PROGRAM} plan $(DIR)
+	${BSD_INSTALL_PROGRAM} pland notifier netplan ${LIB}
+	${BSD_INSTALL_DATA} ../misc/plan_cal.ps ${LIB}
+	${BSD_INSTALL_DATA} ../language/plan.* $(HELP)
+	-mkdir -p $(NETPLANDIR)/netplan.dir
+	-chmod 700 $(NETPLANDIR)/netplan.dir
+	-(test -d $(MAN)1 && ${BSD_INSTALL_MAN} ../misc/plan.1 $(MAN)1/plan.1) || exit 0
+	-(test -d $(MAN)4 && ${BSD_INSTALL_MAN} ../misc/plan.4 $(MAN)4/plan.4) || exit 0
+	-(test -d $(MAN)1 && ${BSD_INSTALL_MAN} ../misc/netplan.1 $(MAN)1/netplan.1) || exit 0
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.6 2000/09/09 04:49:07 fredb Exp $
d3 1
a3 1
--- Makefile.orig	Mon Jul 17 22:07:03 2000
d63 1
a63 1
+NBSD_C	= ${CFLAGS} -ansi -I${PREFIX}/include -I${X11BASE}/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX
d73 2
a74 2
+NBSD_L1	= -Wl,-rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lXm -lXt -lX11
+NBSD_L2	= -Wl,-rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-rpath ${X11BASE}/lib -L${X11BASE}/lib -lc
@


1.1.1.1
log
@New category: time. Move many packages here:
misc/cal, misc/cardboard-schedule, misc/ical, misc/plan, misc/py-mxDateTime,
misc/remind, sysutils/logtime, and 19 more from x11.
@
text
@@
