Move plan to category misc per PR pkg/6909 by Klaus Klein.

15 files changed, 8 insertions, 217 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 4d77616777f..2c53018c9ef 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 1999/01/26 23:28:01 hubertf Exp $
+#	$NetBSD: Makefile,v 1.29 1999/01/29 19:48:34 tron Exp $
 # FreeBSD Id: Makefile,v 1.117 1997/10/13 04:41:07 max Exp
 
     SUBDIR += amanda
@@ -37,6 +37,7 @@
     SUBDIR += p5-Business-CreditCard
     SUBDIR += p5-Locale-Codes
     SUBDIR += p5-Search
+    SUBDIR += plan
     SUBDIR += py-readline
     SUBDIR += qterm
     SUBDIR += rpm
diff --git a/misc/plan/Makefile b/misc/plan/Makefile
index 92d184d4212..a3929560c2e 100644
--- a/misc/plan/Makefile
+++ b/misc/plan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/12/30 10:02:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/01/29 19:49:11 tron Exp $
 #
 
 DISTNAME=	plan-1.7.2
diff --git a/misc/plan/files/md5 b/misc/plan/files/md5
index 29c13d08a99..9c15771fd9a 100644
--- a/misc/plan/files/md5
+++ b/misc/plan/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1998/09/04 08:09:53 frueauf Exp $
+$NetBSD: md5,v 1.2 1999/01/29 19:49:26 tron Exp $
 
 MD5 (plan-1.7.2.tar.gz) = 0dac73da57e85d101d6060cb222a938f
diff --git a/misc/plan/patches/patch-aa b/misc/plan/patches/patch-aa
index 15b10bacd35..1c4f940a261 100644
--- a/misc/plan/patches/patch-aa
+++ b/misc/plan/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/11/12 14:53:31 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/01/29 19:49:45 tron Exp $
 
 --- Makefile.orig	Sat May  9 22:21:09 1998
 +++ Makefile	Thu Sep  3 23:15:04 1998
diff --git a/misc/plan/patches/patch-ab b/misc/plan/patches/patch-ab
index ddc1e2d186e..eade3d69e0b 100644
--- a/misc/plan/patches/patch-ab
+++ b/misc/plan/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 1998/12/30 10:02:33 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 1999/01/29 19:49:45 tron Exp $
 
 --- time.c-orig	Wed Jan 14 21:36:09 1998
 +++ time.c	Wed Dec 30 10:48:35 1998
diff --git a/misc/plan/pkg/PLIST b/misc/plan/pkg/PLIST
index cf8300f0892..d7c49b365f1 100644
--- a/misc/plan/pkg/PLIST
+++ b/misc/plan/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/09/04 08:09:53 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/01/29 19:49:59 tron Exp $
 bin/plan
 libexec/plan/pland
 libexec/plan/notifier
diff --git a/x11/Makefile b/x11/Makefile
index 08cd375be31..7d148e4d6f8 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 1999/01/29 19:31:12 tron Exp $
+# $NetBSD: Makefile,v 1.75 1999/01/29 19:48:34 tron Exp $
 # FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
 #
 
@@ -57,7 +57,6 @@
 #    SUBDIR += p5-Tcl-Tk
     SUBDIR += p5-Tk
 #    SUBDIR += piewm
-    SUBDIR += plan
 #    SUBDIR += pythonqt
     SUBDIR += py-Tk
     SUBDIR += qt
diff --git a/x11/plan/Makefile b/x11/plan/Makefile
deleted file mode 100644
index 92d184d4212..00000000000
--- a/x11/plan/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 1998/12/30 10:02:33 frueauf Exp $
-#
-
-DISTNAME=	plan-1.7.2
-WRKSRC=		${WRKDIR}/src
-CATEGORIES=	misc x11
-MASTER_SITES=	ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.in-berlin.de/User/bitrot/plan.html
-
-USE_MOTIF=	YES
-
-ALL_TARGET=	netbsd
-
-pre-install:
-	${MKDIR} ${X11BASE}/libexec/plan ${X11BASE}/share/plan \
-		${X11BASE}/share/plan/holiday
-	${INSTALL_DATA} ${WRKDIR}/holiday/holiday_* ${X11BASE}/share/plan/holiday
-.for file in HISTORY README
-	${INSTALL_DATA} ${WRKDIR}/${file} ${X11BASE}/share/plan
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/plan/files/md5 b/x11/plan/files/md5
deleted file mode 100644
index 29c13d08a99..00000000000
--- a/x11/plan/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.1 1998/09/04 08:09:53 frueauf Exp $
-
-MD5 (plan-1.7.2.tar.gz) = 0dac73da57e85d101d6060cb222a938f
diff --git a/x11/plan/patches/patch-aa b/x11/plan/patches/patch-aa
deleted file mode 100644
index 15b10bacd35..00000000000
--- a/x11/plan/patches/patch-aa
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/11/12 14:53:31 agc Exp $
-
---- Makefile.orig	Sat May  9 22:21:09 1998
-+++ Makefile	Thu Sep  3 23:15:04 1998
-@@ -6,18 +6,18 @@
- # 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)
-+DIR  = ${X11BASE}/bin#		# user-callable executable (plan)
-+LIB  = ${X11BASE}/libexec/plan#	# auxiliary programs (pland, notifier, netplan)
-+HELP = ${X11BASE}/share/plan#	# help file (plan.help)
- NETPLANDIR = $(LIB)#		# netplan expects netplan.dir/ here
- # NETPLANDIR = "/var/lib/plan"#	# use this for Debian Linux
--MAN  = /usr/man/local/man#	# unformatted nroff manpage (plan.[14])
-+MAN  = ${X11BASE}/man/man#		# unformatted nroff manpage (plan.[14])
- # MAN = /usr/local/man/man#	# for linux
--CATMAN = /usr/catman/local/cat#	# formatted manpage (plan.[14])
-+CATMAN = ${X11BASE}/cat/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 = 39#			# numerical user ID of <nobody> account
-+NOB_GID = 39#			# default numerical group ID of <nobody> account
-+CPP_PATH="/usr/bin/cpp -P -I$(HELP)"# 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
-@@ -28,7 +28,7 @@
- #        -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
- #				# JAPAN requires X11R5 and a Japanese env.
- 
--DEBUG = -g
-+#DEBUG = -g
- #DEBUG = -O2#			# do NOT define -O2 on DEC OSF/1 machines!
- #DEBUG =
- 
-@@ -113,8 +113,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 -I${X11BASE}/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX
- FBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
- 	  -DSTDLIBMALLOC
- LINUX_C	= -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX
-@@ -195,8 +194,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	= -L${X11BASE}/lib -lXm -lXt -lX11
-+NBSD_L2	= -L${X11BASE}/lib -lc
- FBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext
- FBSD_L2	= -L/usr/X11R6/lib -lc
- LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
-@@ -528,31 +527,19 @@
- 
- #---------------------------------------------------------------
- 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)) || exit 0
--	cp ../misc/plan.help $(HELP)
--	-strip $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
-+	${BSD_INSTALL_PROGRAM} plan $(DIR)
-+	${BSD_INSTALL_PROGRAM} pland notifier netplan $(LIB)
-+	${BSD_INSTALL_DATA} ../misc/plan_cal.ps $(LIB)
-+	${BSD_INSTALL_DATA} ../misc/plan.help $(HELP)
- 	-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) || exit 0
--	-mkdir $(LIB)/netplan.dir
-+	-mkdir -p $(LIB)/netplan.dir
- 	-chmod 700 $(LIB)/netplan.dir
--	-(test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
--	-(test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
--	-(test -x `which nroff` && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
--	-(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1) || exit 0
--	-(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4) || exit 0
--	-(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan.1) || exit 0
--	-(test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1) || exit 0
--	-(test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4) || exit 0
--	-(test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan.1) || exit 0
--	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_german ${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
-+	-(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
- 	@echo ""
--	@echo "use ../holiday/* as templates for your ~/.holiday file"
-+	@echo "Use " ${X11BASE}"/share/plan/holiday/* as templates for your ~/.holiday file."
- 
- clean:
- 	-rm -f *.o
diff --git a/x11/plan/patches/patch-ab b/x11/plan/patches/patch-ab
deleted file mode 100644
index ddc1e2d186e..00000000000
--- a/x11/plan/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/12/30 10:02:33 frueauf Exp $
-
---- time.c-orig	Wed Jan 14 21:36:09 1998
-+++ time.c	Wed Dec 30 10:48:35 1998
-@@ -232,7 +232,7 @@
- 		dst  = zone - 3600;
- 		dst  = 0;	/* jmorriso@bogomips.ee.ubc.ca 28.8.94 */
- #else
--#if defined(bsdi) || defined(SUN) || defined(SVR4) || defined(convex)
-+#if defined(bsdi) || defined(SUN) || defined(SVR4) || defined(convex) || defined(__NetBSD__)
- 		time_t now;
- 		struct tm *tm;
- 		tzset();
diff --git a/x11/plan/pkg/COMMENT b/x11/plan/pkg/COMMENT
deleted file mode 100644
index 1eeafccc6db..00000000000
--- a/x11/plan/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-a schedule planner based on X/Motif.
diff --git a/x11/plan/pkg/DESCR b/x11/plan/pkg/DESCR
deleted file mode 100644
index 8e777afb89f..00000000000
--- a/x11/plan/pkg/DESCR
+++ /dev/null
@@ -1,26 +0,0 @@
-Plan is a schedule planner based on X/Motif. It displays a month calendar
-similar to xcal, but every day box is large enough to show appointments in
-small print. By pressing on a day box, the appointments for that day can be
-listed and edited. Appointments are entered with the following information
-(everything except the time is optional):
-
-- the date, time, and length (time and days) of the appointment,
-- an optional text message to be printed,
-- an optional script to be executed,
-- early-warn and late-warn triggers that precede the alarm time
-- repetitions: [n-th] weekdays, days-of-the-month, every n days, yearly
-- optional fast command-line appointment entry
-- flexible ways to specify holidays and vacations
-- extensive context help
-- multiuser capability using an IP server program (with access lists),
-- grouping of appointments into files, per-user, private, and others
-
-The action being taken when a warn or alarm time is reached is programmable;
-by default a window pops up. In addition, a program can be executed, or mail
-can be sent. Other methods of listing appointments (today, this week, next
-week, or a keyword search for regular expressions) are also available. Plan
-can be configured to display times in 12-hour or 24-hour formats, mmddyy and
-ddmmyy date formats, and can show either Monday or Sunday in the leftmost
-column. Four view modes are supported: month, year, week, day, and a 365-day
-overview. The day, week, and overview plot appointments as colored and
-labeled bars on a time chart.
diff --git a/x11/plan/pkg/MESSAGE b/x11/plan/pkg/MESSAGE
deleted file mode 100644
index e97cd2b781e..00000000000
--- a/x11/plan/pkg/MESSAGE
+++ /dev/null
@@ -1,2 +0,0 @@
-You can use one of the ${X11BASE}/share/plan/holiday/holiday_* files
-as example for your ~/.holiday. See `man plan` for details.
diff --git a/x11/plan/pkg/PLIST b/x11/plan/pkg/PLIST
deleted file mode 100644
index cf8300f0892..00000000000
--- a/x11/plan/pkg/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 1998/09/04 08:09:53 frueauf Exp $
-bin/plan
-libexec/plan/pland
-libexec/plan/notifier
-libexec/plan/netplan
-libexec/plan/plan_cal.ps
-@exec mkdir -p %D/libexec/plan/netplan.dir ; chmod 700 %D/libexec/plan/netplan.dir
-@unexec rm -rf %D/libexec/plan/netplan.dir
-man/man1/plan.1
-man/man1/netplan.1
-man/man4/plan.4
-share/plan/HISTORY
-share/plan/README
-share/plan/holiday/holiday_australia
-share/plan/holiday/holiday_austria
-share/plan/holiday/holiday_bavarian
-share/plan/holiday/holiday_belgium
-share/plan/holiday/holiday_canada
-share/plan/holiday/holiday_denmark
-share/plan/holiday/holiday_dutch
-share/plan/holiday/holiday_finnish
-share/plan/holiday/holiday_french
-share/plan/holiday/holiday_frswiss
-share/plan/holiday/holiday_german
-share/plan/holiday/holiday_german.orig
-share/plan/holiday/holiday_hungary
-share/plan/holiday/holiday_italy
-share/plan/holiday/holiday_japan
-share/plan/holiday/holiday_norway
-share/plan/holiday/holiday_quebec
-share/plan/holiday/holiday_spain
-share/plan/holiday/holiday_swedish
-share/plan/holiday/holiday_uk
-share/plan/holiday/holiday_us
-share/plan/plan.help
-@dirrm share/plan/holiday
-@dirrm share/plan
-@dirrm libexec/plan