Updated remind to version 3.0.21:

- adds "cm2rem" to convert from CDE's "cm" calendar manager to remind format.
  [needs tcl-8.0, but the pkg does not require it for just this small script.]
- adds "remind.vim" file for Vim syntax highlighting of Remind files.
  [installed in ${PREFIX}/share/examples/remind.]
- new "dusk" and "dawn" built-in functions.

The distribution site has changed, which is what primarily prompted for this
package upgrade.  The old distributions don't seem to be available anymore.

8 files changed, 93 insertions, 31 deletions

diff --git a/misc/remind/Makefile b/misc/remind/Makefile
index 3a4f40c1900..bc567a36307 100644
--- a/misc/remind/Makefile
+++ b/misc/remind/Makefile
@@ -1,20 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2000/03/02 00:02:49 kim Exp $
+# $NetBSD: Makefile,v 1.6 2000/03/17 20:48:55 kim Exp $
 
-DISTNAME=	remind-03.00.20
+DISTNAME=	remind-03.00.21
 PKGNAME=	${DISTNAME:C/0([0-9])/\1/g}
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.doe.carleton.ca/pub/remind-3.0/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.roaringpenguin.com/
 
 MAINTAINER=	kim@tac.nyc.ny.us
+HOMEPAGE=	http://www.roaringpenguin.com/remind.html
 
 GNU_CONFIGURE=	yes
 
+# We don't want to require tcl just for one script.
+post-build:
+	@${SED} -e 's,@TCLSH@,tclsh8.0,' \
+		< ${WRKSRC}/scripts/cm2rem.tcl \
+		> ${WRKSRC}/scripts/cm2rem
+	@mv ${WRKSRC}/man/cm2rem.1 ${WRKSRC}/man/cm2rem.1.bak
+	@${SED} -e 's,@TCLSH@,tclsh8.0,' \
+		< ${WRKSRC}/man/cm2rem.1.bak \
+		> ${WRKSRC}/man/cm2rem.1
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/remind
 	(cd ${WRKSRC}; \
 		${INSTALL_DATA} -p examples/defs.rem \
 			${PREFIX}/share/examples/remind; \
+		${INSTALL_DATA} -p examples/remind.vim \
+			${PREFIX}/share/examples/remind; \
 		${INSTALL_DATA} -p scripts/remind-all.csh \
 			${PREFIX}/share/examples/remind; \
 		${INSTALL_DATA} -p scripts/remind-all.sh \
diff --git a/misc/remind/files/md5 b/misc/remind/files/md5
index a2c194f26b6..954deb1276a 100644
--- a/misc/remind/files/md5
+++ b/misc/remind/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/03/02 00:02:49 kim Exp $
+$NetBSD: md5,v 1.3 2000/03/17 20:48:56 kim Exp $
 
-MD5 (remind-03.00.20.tgz) = 483099eaf6c12ec2d5be7e1c9029d304
+MD5 (remind-03.00.21.tar.gz) = f70e2bca2b73dad27c52148017a8615b
diff --git a/misc/remind/files/patch-sum b/misc/remind/files/patch-sum
index be1e792fcb1..951f90139c6 100644
--- a/misc/remind/files/patch-sum
+++ b/misc/remind/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/03/02 00:56:44 kim Exp $
+$NetBSD: patch-sum,v 1.4 2000/03/17 20:48:56 kim Exp $
 
-MD5 (patch-aa) = 80e1d0f1d5681b5c1c2d35cbb4ee0106
-MD5 (patch-ab) = e158ffaddff04a20d0452f32f2b62cd3
+MD5 (patch-ab) = d8077f40b413b94299bc6fcc1e52d8d8
 MD5 (patch-ac) = 5e27d2f4831041bea2886f8dfac8a60a
+MD5 (patch-ad) = 58593ef50f9d20b57f76189fc0ec9179
+MD5 (patch-ae) = c07a1cace7f1cf070bb6064823c0fe7b
diff --git a/misc/remind/patches/patch-aa b/misc/remind/patches/patch-aa
deleted file mode 100644
index bf97270bf41..00000000000
--- a/misc/remind/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/03/02 00:09:17 kim Exp $
-
---- src/custom.h.orig	Mon Apr 12 21:49:05 1999
-+++ src/custom.h	Wed Mar  1 19:07:50 2000
-@@ -229,7 +229,7 @@
- #define PUBLIC
- #define PRIVATE static
- 
--#ifdef UNIX
-+#if defined(UNIX) && !defined(__NetBSD__)
- #define _POSIX_SOURCE
- #define _SVID_SOURCE
- #endif
diff --git a/misc/remind/patches/patch-ab b/misc/remind/patches/patch-ab
index df21c32f0e2..b8700ee74fd 100644
--- a/misc/remind/patches/patch-ab
+++ b/misc/remind/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/03/02 06:14:48 kim Exp $
+$NetBSD: patch-ab,v 1.2 2000/03/17 20:48:56 kim Exp $
 
---- src/Makefile.in.orig	Sat May  9 22:19:20 1998
-+++ src/Makefile.in	Tue Mar  2 01:07:31 1999
-@@ -15,6 +15,7 @@
+--- src/Makefile.in.orig	Wed Mar 15 11:03:39 2000
++++ src/Makefile.in	Fri Mar 17 15:13:31 2000
+@@ -15,11 +15,12 @@
  
  INSTALL=@INSTALL@
  INSTALL_PROGRAM=@INSTALL_PROGRAM@
@@ -10,7 +10,13 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/02 06:14:48 kim Exp $
  INSTALL_DATA=@INSTALL_DATA@
  
  PROGS=		remind rem2ps
-@@ -48,11 +49,12 @@
+ SCRIPTS=	$(srcdir)/../scripts/kall $(srcdir)/../scripts/rem \
+-		$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem.tcl
++		$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem
+ 
+ MANS=		$(srcdir)/../man/kall.1 $(srcdir)/../man/rem.1 \
+ 		$(srcdir)/../man/rem2ps.1 $(srcdir)/../man/remind.1 \
+@@ -49,11 +50,12 @@
  	@CC@ @LDFLAGS@ -o remind $(REMINDOBJS) @LIBS@
  
  install: all
diff --git a/misc/remind/patches/patch-ad b/misc/remind/patches/patch-ad
new file mode 100644
index 00000000000..03d90bc7620
--- /dev/null
+++ b/misc/remind/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2000/03/17 20:48:56 kim Exp $
+
+--- scripts/cm2rem.tcl.orig	Thu Feb 17 22:45:38 2000
++++ scripts/cm2rem.tcl	Fri Mar 17 15:09:08 2000
+@@ -16,7 +16,7 @@
+ # $Id: patch-ad,v 1.1 2000/03/17 20:48:56 kim Exp $
+ 
+ # the next line restarts using tclsh \
+-exec tclsh "$0" "$@"
++exec @TCLSH@ "$0" "$@"
+ 
+ set i 0
+ foreach month {January February March April May June
diff --git a/misc/remind/patches/patch-ae b/misc/remind/patches/patch-ae
new file mode 100644
index 00000000000..521f7581f97
--- /dev/null
+++ b/misc/remind/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1 2000/03/17 20:48:56 kim Exp $
+
+--- man/cm2rem.1.orig	Wed Mar 15 10:51:36 2000
++++ man/cm2rem.1	Fri Mar 17 15:18:27 2000
+@@ -2,27 +2,27 @@
+ .TH CM2REM 1 "18 October 1999"
+ .UC4
+ .SH NAME
+-cm2rem.tcl \- Convert Sun's "cm" input file to Remind format
++cm2rem \- Convert Sun's "cm" input file to Remind format
+ .SH SYNOPSIS
+-.B cm2rem.tcl < cm_file > remind_file
++.B cm2rem < cm_file > remind_file
+ .SH DESCRIPTION
+-\fBcm2rem.tcl\fR reads the Sun calendar manager data file and converts
+-it into a \fBRemind\fR script.  Note that \fBcm2rem.tcl\fR can convert
++\fBcm2rem\fR reads the Sun calendar manager data file and converts
++it into a \fBRemind\fR script.  Note that \fBcm2rem\fR can convert
+ \fIonly\fR version 3 calendar manager files.  If you are using version 4
+ files, there should be a system utility to convert them to version 3 files.
+ .SH AUTHOR
+-\fBcm2rem.tcl\fR is supported by Roaring Penguin Software
++\fBcm2rem\fR is supported by Roaring Penguin Software
+ Inc. (http://www.roaringpenguin.com)
+ .PP
+-\fBcm2rem.tcl\fR was written by David F. Skoll <dfs@roaringpenguin.com>.
++\fBcm2rem\fR was written by David F. Skoll <dfs@roaringpenguin.com>.
+ .SH BUGS
+ Not all of the Sun calendar manager options are respected.  In particular,
+ nothing is done for e-mail actions.  Also, the resulting Remind script
+ is not editable with \fBTkRemind\fR; you can only edit it with a text
+ editor.
+ .PP
+-\fBcm2rem.tcl\fR requires Tcl/Tk version 8.0 or higher.  The
+-\fBtclsh\fR interpreter must be on your \fBpath\fR.
++\fBcm2rem\fR requires Tcl/Tk version 8.0 or higher.  The
++\fB@TCLSH@\fR interpreter must be on your \fBpath\fR.
+ 
+ .SH SEE ALSO
+ \fBremind(1)\fR, \fBtkremind(1)\fR
diff --git a/misc/remind/pkg/PLIST b/misc/remind/pkg/PLIST
index c384c49611c..415add2d57a 100644
--- a/misc/remind/pkg/PLIST
+++ b/misc/remind/pkg/PLIST
@@ -1,19 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2000/01/09 23:49:55 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/03/17 20:48:57 kim Exp $
+bin/cm2rem
 bin/kall
 bin/rem
 bin/rem2ps
 bin/remind
 bin/tkremind
+man/man1/cm2rem.1
 man/man1/kall.1
 man/man1/rem.1
 man/man1/rem2ps.1
 man/man1/remind.1
 man/man1/tkremind.1
+share/doc/remind/COPYRIGHT
+share/doc/remind/README.UNIX
+share/doc/remind/WHATSNEW.30
 share/examples/remind/defs.rem
 share/examples/remind/remind-all.csh
 share/examples/remind/remind-all.sh
-share/doc/remind/README.UNIX
-share/doc/remind/WHATSNEW.30
-share/doc/remind/COPYRIGHT
+share/examples/remind/remind.vim
 @dirrm share/examples/remind
 @dirrm share/doc/remind