Update to 3.00.24. Ok kim@

CHANGES TO REMIND

* Version 3.0 Patch 24

+ MINOR ENHANCEMENTS

- Permit the DURATION of a reminder to be as high as you like.  Previously,
  DURATIONs could be at most 23:59.  Fix courtesy of Paul Pelzl.

- The "-n" flag can be usefully combined with "-s", "-p" and "-l" now.
  Fix courtesy of Paul Pelzl.

+ BUG FIXES

- The "-k" command escapes all characters except those known to be
  safe, rather than attempting to escape only characters thought to be
  unsafe.

- Removed the crufty code that supported non-ANSI C compilers.

- Removed all support for non-UNIX/non-Linux systems.

- Fixed a bug in the tokenizer that could make Remind segfault.  Fix courtesy
  of Stan Tobias.

* Version 3.0 Patch 23

+ MINOR ENHANCEMENTS

- Added the COLOR special for putting colored reminders in the calendar.
  Supported by the HTML, Tcl/Tk and PostScript back-ends.

- Many minor tweaks to tkremind.

- Added ability to specify paper size in inches or centimetres to rem2ps.

- Added the "-l" option to Remind.  This outputs additional information
  for back-end programs that use the "-p" output format.  Currently
  used only by the "tkremind" back-end.

- Fixed dates for Yom Hazikaron and Yom Ha'atzmaut if 5 Iyar falls on a
  Saturday.  (Hebrew calendar fix.)

- Added support for the Icelandic language, courtesy of Björn Davíðsson.

+ BUG FIXES

- Fixed parser error for unterminated date constant: '2005/01/01

5 files changed, 38 insertions, 35 deletions

diff --git a/time/remind/Makefile b/time/remind/Makefile
index 9d3f154bced..866fc7f78d8 100644
--- a/time/remind/Makefile
+++ b/time/remind/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/01/25 04:23:05 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/07/22 09:25:54 wiz Exp $
 #
 
-DISTNAME=	remind-03.00.22
+DISTNAME=	remind-03.00.24
 PKGNAME=	${DISTNAME:C/0([0-9])/\1/g}
-PKGREVISION=	1
 CATEGORIES=	time
 MASTER_SITES=	http://www.roaringpenguin.com/penguin/
 
@@ -12,20 +11,23 @@ HOMEPAGE=	http://www.roaringpenguin.com/penguin/open_source_remind.php
 COMMENT=	Calendar/alarm program with interpreted input language
 
 GNU_CONFIGURE=	yes
+USE_TOOLS+=	perl:run
+
+REPLACE_PERL=	www/rem2html
 
 # We don't want to require tcl just for one script.
 post-build:
-	@${SED} -e 's,@TCLSH@,tclsh8.0,' \
+	${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,' \
+	${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}; \
+	cd ${WRKSRC}; \
 		${INSTALL_DATA} examples/defs.rem \
 			${PREFIX}/share/examples/remind; \
 		${INSTALL_DATA} examples/remind.vim \
@@ -33,14 +35,16 @@ post-install:
 		${INSTALL_DATA} scripts/remind-all.csh \
 			${PREFIX}/share/examples/remind; \
 		${INSTALL_DATA} scripts/remind-all.sh \
-			${PREFIX}/share/examples/remind)
+			${PREFIX}/share/examples/remind
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/remind
-	(cd ${WRKSRC}; \
+	cd ${WRKSRC}; \
 		${INSTALL_DATA} docs/README.UNIX \
 			${PREFIX}/share/doc/remind; \
 		${INSTALL_DATA} docs/WHATSNEW.30 \
 			${PREFIX}/share/doc/remind; \
 		${INSTALL_DATA} COPYRIGHT \
-			${PREFIX}/share/doc/remind)
+			${PREFIX}/share/doc/remind
+	${INSTALL_SCRIPT} ${WRKSRC}/www/rem2html \
+		${PREFIX}/bin/rem2html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/remind/PLIST b/time/remind/PLIST
index df3b19788bb..bfa5e8e1192 100644
--- a/time/remind/PLIST
+++ b/time/remind/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/22 09:25:54 wiz Exp $
 bin/cm2rem
 bin/kall
 bin/rem
+bin/rem2html
 bin/rem2ps
 bin/remind
 bin/tkremind
diff --git a/time/remind/distinfo b/time/remind/distinfo
index 83cf6e0f90e..ac6f6b9fe36 100644
--- a/time/remind/distinfo
+++ b/time/remind/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 19:14:55 wiz Exp $
+$NetBSD: distinfo,v 1.5 2006/07/22 09:25:54 wiz Exp $
 
-SHA1 (remind-03.00.22.tar.gz) = 064aae86fdaa8d9355dd9c982d3ebf6175d70ab8
-RMD160 (remind-03.00.22.tar.gz) = 12e834b44cc00bec731c9031e9a4b568d2376ad6
-Size (remind-03.00.22.tar.gz) = 319556 bytes
-SHA1 (patch-ab) = 8aa6e4cad20f9dc6aaeb012dc767bde5be78f91b
-SHA1 (patch-ac) = a88c6fe1951d360fd56294c8756139d0935f897d
+SHA1 (remind-03.00.24.tar.gz) = 7fc8823e4e574fd7630b2ff3e2f5d014003fd26b
+RMD160 (remind-03.00.24.tar.gz) = 2f84a240dd28b68e352c6f8d13ed241a2626f0d6
+Size (remind-03.00.24.tar.gz) = 303964 bytes
+SHA1 (patch-ab) = e233064a21aac1a9c25f2d1b2a0cd444e7970f1c
+SHA1 (patch-ac) = 91e11e2e41e7bdfba97629af0f9b305273c6e587
 SHA1 (patch-ad) = 56feacc6f9af5c59197900fe4591e7d54ff9372c
 SHA1 (patch-ae) = 4e90c971a519d9ac46992fe5e5ab70300c352262
diff --git a/time/remind/patches/patch-ab b/time/remind/patches/patch-ab
index 3a34488c175..7c10f8d28eb 100644
--- a/time/remind/patches/patch-ab
+++ b/time/remind/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:11 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2006/07/22 09:25:54 wiz Exp $
 
---- 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 @@
+--- src/Makefile.in.orig	2005-09-30 03:29:32.000000000 +0000
++++ src/Makefile.in
+@@ -15,11 +15,12 @@ VPATH=$(srcdir)
  
  INSTALL=@INSTALL@
  INSTALL_PROGRAM=@INSTALL_PROGRAM@
@@ -16,19 +16,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:11 wiz Exp $
  
  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@
+@@ -50,9 +51,12 @@ remind: $(REMINDOBJS)
  
  install: all
+ 	-mkdir -p $(DESTDIR)$(bindir) || true
 -	for prog in $(PROGS) $(SCRIPTS) ; do \
 +	for prog in $(PROGS) ; do \
- 		$(INSTALL_PROGRAM) $$prog $(bindir) ; \
+ 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
  	done
--	-strip $(bindir)/remind
--	-strip $(bindir)/rem2ps
 +	for prog in $(SCRIPTS) ; do \
-+		$(INSTALL_SCRIPT) $$prog $(bindir) ; \
++		$(INSTALL_SCRIPT) $$prog $(DESTDIR)$(bindir) || exit 1; \
 +	done
- 	for man in $(MANS) ; do  \
- 		$(INSTALL_DATA) $$man $(mandir)/man1 ; \
- 	done
+ 	-strip $(DESTDIR)$(bindir)/remind || true
+ 	-strip $(DESTDIR)$(bindir)/rem2ps || true
+ 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
diff --git a/time/remind/patches/patch-ac b/time/remind/patches/patch-ac
index 7d9ea97aa36..d5ed4d6b8a5 100644
--- a/time/remind/patches/patch-ac
+++ b/time/remind/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/11/24 23:04:41 kim Exp $
+$NetBSD: patch-ac,v 1.3 2006/07/22 09:25:54 wiz Exp $
 
---- src/files.c.orig	2000-02-17 22:45:54.000000000 -0500
-+++ src/files.c	2004-11-24 18:01:56.000000000 -0500
-@@ -19,6 +19,7 @@
+--- src/files.c.orig	2005-09-30 03:29:32.000000000 +0000
++++ src/files.c
+@@ -19,6 +19,7 @@ static char const RCSID[] = "$Id: files.
  
  #include <string.h>
  #include <ctype.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.2 2004/11/24 23:04:41 kim Exp $
  #include <sys/stat.h>
  
  #ifdef TM_IN_SYS_TIME
-@@ -421,16 +422,27 @@
+@@ -365,16 +366,27 @@ int DoInclude(ParsePtr p)
  {     
      DynamicBuffer buf;
      int r, e;