Update clearsilver packages to 0.10.5.

Changes:
- GCC printf attributes for all printf like functions for better
  compiler time warnings (Nikolai Kondrashov)
- Better support for other compilers for handling CPP variable
  argument macros (Raphaël HUCK)
- Fix for some symlinking/hdf_get_obj bugs (Nikolai Kondrashov)
- Performance improvements to Perl wrapper (Sergey Skvortsov)
- New url_validate Clearsilver method (Mugdha Bendre @ Google)
- Quick Hello World example for using with FastCGI (Mike Tsao @ Google)
- Updates to the Ruby wrapper (Dan Janowski)
- Updates to the Java wrapper (Joe Walnes @ Google)
- Add support to Java wrapper for hooking the file loader
- Add string.crc builtin-function
- Make it easier to write XSS free clearsilver code
- Ability to setup file load hooks for cs and hdf files
- fix for non-thread safe nerr_init call (causes java jni wrapper to
  core dump when server is started under heavy load)
- python egg support (if you have the egg version of distutils
  installed)
- some parser edge case fixes.
- some cleanups to cgiwrap that make it easier to use with
  fastcgi.  fastcgi wrapper to come in the future.

11 files changed, 17 insertions, 104 deletions

diff --git a/www/clearsilver-base/Makefile b/www/clearsilver-base/Makefile
index 812640c80fa..6bc2edd4042 100644
--- a/www/clearsilver-base/Makefile
+++ b/www/clearsilver-base/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:20 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/06 01:04:29 minskim Exp $
 
 PKGNAME=		${CLEARSILVER_BASE}
-PKGREVISION=		1
 
 .include "../../www/clearsilver/Makefile.common"
 
diff --git a/www/clearsilver-base/PLIST b/www/clearsilver-base/PLIST
index 87a382e1802..813925e3f6c 100644
--- a/www/clearsilver-base/PLIST
+++ b/www/clearsilver-base/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/06 05:28:40 epg Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/10/06 01:04:29 minskim Exp $
+bin/cs
+bin/cs_static.cgi
 bin/cstest
-bin/static.cgi
 include/ClearSilver/ClearSilver.h
 include/ClearSilver/cgi/cgi.h
 include/ClearSilver/cgi/cgiwrap.h
@@ -52,6 +53,7 @@ man/man3/cgi_register_parse_cb.3
 man/man3/cgi_url_escape.3
 man/man3/cgi_url_escape_more.3
 man/man3/cgi_url_unescape.3
+man/man3/cgi_url_validate.3
 man/man3/cgi_vredirect.3
 man/man3/cgiwrap_getenv.3
 man/man3/cgiwrap_init_emu.3
@@ -67,6 +69,8 @@ man/man3/cs_dump.3
 man/man3/cs_init.3
 man/man3/cs_parse_file.3
 man/man3/cs_parse_string.3
+man/man3/cs_register_esc_strfunc.3
+man/man3/cs_register_fileload.3
 man/man3/cs_register_strfunc.3
 man/man3/cs_render.3
 man/man3/dictCleanup.3
@@ -109,6 +113,7 @@ man/man3/hdf_obj_top.3
 man/man3/hdf_obj_value.3
 man/man3/hdf_read_string.3
 man/man3/hdf_read_string_ignore.3
+man/man3/hdf_register_fileload.3
 man/man3/hdf_remove_tree.3
 man/man3/hdf_search_path.3
 man/man3/hdf_set_attr.3
@@ -135,7 +140,6 @@ man/man3/nerr_log_error.3
 man/man3/nerr_match.3
 man/man3/nerr_pass.3
 man/man3/nerr_pass_ctx.3
-man/man3/nerr_raise.3
 man/man3/nerr_register.3
 man/man3/skipDelete.3
 man/man3/skipFreeList.3
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index 2bbb20fc292..496eacb9ebf 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/10/25 22:01:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/06 01:04:28 minskim Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
-
 DEPENDS+=${CLEARSILVER_BASE}{,nb[0-9]*}:../../www/clearsilver-base
 DEPENDS+=${PYPKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/py-clearsilver
 DEPENDS+=${RUBY_PKGPREFIX}-${DISTNAME}{,nb[0-9]*}:../../www/ruby-clearsilver
diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common
index 9403ebc62da..4f7624f2213 100644
--- a/www/clearsilver/Makefile.common
+++ b/www/clearsilver/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.9 2008/08/18 00:55:48 epg Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/10/06 01:04:28 minskim Exp $
 
-DISTNAME=		clearsilver-0.10.1
+DISTNAME=		clearsilver-0.10.5
 CLEARSILVER_BASE=	${DISTNAME:S/-/-base-/}
 CATEGORIES=		www
 MASTER_SITES=		http://www.clearsilver.net/downloads/
diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo
index cd044f4eb60..2fc7c2a7203 100644
--- a/www/clearsilver/distinfo
+++ b/www/clearsilver/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.12 2008/08/17 08:40:50 dholland Exp $
+$NetBSD: distinfo,v 1.13 2008/10/06 01:04:28 minskim Exp $
 
-SHA1 (clearsilver-0.10.1.tar.gz) = d18d2b65b8a8f0e7077feb8b6c358519c4113e97
-RMD160 (clearsilver-0.10.1.tar.gz) = de13a6a58d80b896fe245b5d2d0a0f391390dfd3
-Size (clearsilver-0.10.1.tar.gz) = 563655 bytes
-SHA1 (patch-aa) = a336841bb190e179842b88694791303bcde211de
-SHA1 (patch-ab) = c42eb7f6d113464d8619a73d16b1048ee2bc08aa
-SHA1 (patch-ac) = fde24cd5f749180da01217d793e7f7feec86df35
+SHA1 (clearsilver-0.10.5.tar.gz) = 138865dc91e27328fe29fcaaac1bc6558f19dd75
+RMD160 (clearsilver-0.10.5.tar.gz) = bd5c616f326b544df8a74eec71a98a474b408249
+Size (clearsilver-0.10.5.tar.gz) = 439190 bytes
 SHA1 (patch-ad) = 59ae45b8f42d5ffd15f18e071d600ed59837b49a
-SHA1 (patch-ae) = d26dace3b34654ed4f63a2d49519b844edff025c
diff --git a/www/clearsilver/patches/patch-aa b/www/clearsilver/patches/patch-aa
deleted file mode 100644
index a981c6a7d00..00000000000
--- a/www/clearsilver/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/11/29 00:08:57 epg Exp $
-
---- Makefile.orig	Wed Sep 29 21:09:41 2004
-+++ Makefile
-@@ -35,7 +35,7 @@ cs: output_dir
- 	  fi; \
- 	done
- 
--install: all man
-+install: all
- 	./mkinstalldirs $(DESTDIR)$(cs_includedir)
- 	./mkinstalldirs $(DESTDIR)$(bindir)
- 	./mkinstalldirs $(DESTDIR)$(libdir)
diff --git a/www/clearsilver/patches/patch-ab b/www/clearsilver/patches/patch-ab
deleted file mode 100644
index ceee6db2714..00000000000
--- a/www/clearsilver/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/08/17 08:40:50 dholland Exp $
-
-We don't need the dependencies for building the package once.
-Additionally, not every compiler understands the -MG option.
-
-Also, add -fPIC to CFLAGS. It is apparently not (always?) used from
-CPPFLAGS and that breaks the build.
-
---- rules.mk.in.orig	2005-07-02 20:13:51.000000000 -0400
-+++ rules.mk.in	2008-08-17 03:30:01.000000000 -0400
-@@ -73,7 +73,7 @@ PYTHON     = @PYTHON@
- PERL	   = @PERL@
- RUBY       = @RUBY@
- 
--CFLAGS     = @CFLAGS@ -Wall -I$(NEOTONIC_ROOT) @CPPFLAGS@
-+CFLAGS     = @CFLAGS@ -Wall -I$(NEOTONIC_ROOT) -fPIC @CPPFLAGS@
- CPPFLAGS   = -I$(NEOTONIC_ROOT) -fPIC @CPPFLAGS@
- OUTPUT_OPTION = -o $@
- LD         = $(CC) -o
-@@ -141,9 +141,6 @@ Makefile.depends: $(NEOTONIC_ROOT)/rules
- 	@echo "** OSNAME: $(OSTYPE)"
- 	@rm -f Makefile.depends
- 	@touch Makefile.depends
--	@for II in `find . -maxdepth 1 -name "*.c" -print`; do \
--		gcc -M -MG ${CFLAGS} $$II >> Makefile.depends; \
--	done;
- 	@echo "** (done) "
- 
- DEPEND_FILE := $(shell find . -name Makefile.depends -print)
diff --git a/www/clearsilver/patches/patch-ac b/www/clearsilver/patches/patch-ac
deleted file mode 100644
index f979319f33f..00000000000
--- a/www/clearsilver/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/28 12:26:18 rillig Exp $
-
-__PRETTY_FUNCTION__ is a GNUism.
-
---- util/neo_err.h.orig	2005-06-30 20:59:37.000000000 +0200
-+++ util/neo_err.h	2006-07-28 13:22:03.890389580 +0200
-@@ -54,6 +54,14 @@ typedef struct _neo_err 
- } NEOERR;
- 
- 
-+#if defined(__GNUC__)
-+/* GNU C provides __PRETTY_FUNCTION__ */
-+#elif defined(__SUNPRO_C)
-+#  define __PRETTY_FUNCTION__ __func__
-+#else
-+#  define __PRETTY_FUNCTION__ "(function name)"
-+#endif
-+
- /*
-  * function: nerr_raise
-  * description: Use this method to create an error "exception" for
diff --git a/www/clearsilver/patches/patch-ae b/www/clearsilver/patches/patch-ae
deleted file mode 100644
index b5c9be60f87..00000000000
--- a/www/clearsilver/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/08/17 08:40:50 dholland Exp $
-
-Fix type mismatch through va_arg() and resulting nasal demons.
-
---- cs/csparse.c.orig	2005-06-30 21:04:34.000000000 -0400
-+++ cs/csparse.c	2008-08-17 04:36:18.000000000 -0400
-@@ -3359,9 +3359,9 @@ static NEOERR * _builtin_str_slice (CSPA
-   NEOERR *err;
-   char *s = NULL;
-   char *slice;
--  int b = 0;
--  int e = 0;
--  int len;
-+  long int b = 0;
-+  long int e = 0;
-+  long int len;
- 
-   result->op_type = CS_TYPE_STRING;
-   result->s = "";
diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile
index 59b9e65d1e1..9163d40619f 100644
--- a/www/py-clearsilver/Makefile
+++ b/www/py-clearsilver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2008/06/12 02:14:56 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/06 01:04:29 minskim Exp $
 
 PKGNAME=			${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=			1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/ruby-clearsilver/Makefile b/www/ruby-clearsilver/Makefile
index 77ca933c24b..65aa68e2664 100644
--- a/www/ruby-clearsilver/Makefile
+++ b/www/ruby-clearsilver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2008/06/19 15:19:25 taca Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/06 01:04:29 minskim Exp $
 
 PKGNAME=			${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=			4
 
 .include "../../www/clearsilver/Makefile.common"