5 files changed, 21 insertions, 35 deletions

diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index 5d6d66796474..6cf0f7f6a4e3 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	clearsilver
-PORTVERSION=	0.10.4
+PORTVERSION=	0.10.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.clearsilver.net/downloads/
 
@@ -37,6 +37,7 @@ MAN3=	cBroadcast.3 cCreate.3 cDestroy.3 cSignal.3 cWait.3 \
 	cgi_filehandle.3 cgi_init.3 cgi_neo_error.3 cgi_output.3 cgi_parse.3 \
 	cgi_redirect.3 cgi_redirect_uri.3 cgi_register_parse_cb.3 \
 	cgi_url_escape.3 cgi_url_escape_more.3 cgi_url_unescape.3 \
+	cgi_url_validate.3 \
 	cgi_vredirect.3 cgiwrap_getenv.3 cgiwrap_init_emu.3 cgiwrap_init_std.3 \
 	cgiwrap_iterenv.3 cgiwrap_putenv.3 cgiwrap_read.3 cgiwrap_write.3 \
 	cgiwrap_writef.3 cgiwrap_writevf.3 cs_destroy.3 cs_dump.3 cs_init.3 \
@@ -58,19 +59,10 @@ MAN3=	cBroadcast.3 cCreate.3 cDestroy.3 cSignal.3 cWait.3 \
 	hdf_write_file_atomic.3 hdf_write_string.3 mCreate.3 \
 	mDestroy.3 mLock.3 mUnlock.3 nerr_ignore.3 nerr_error_string.3 \
 	nerr_error_traceback.3 nerr_handle.3 nerr_init.3 nerr_log_error.3 \
-	nerr_match.3 nerr_pass.3 nerr_pass_ctx.3 nerr_raise.3 nerr_register.3 \
+	nerr_match.3 nerr_pass.3 nerr_pass_ctx.3 nerr_register.3 \
 	skipDelete.3 skipFreeList.3 skipInsert.3 skipNewList.3 skipNext.3 \
 	skipRelease.3 skipSearch.3 wdb_keys.3
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-PATCHDIR=	dont-patch
-PLIST_SUB+=	PTHREAD=""
-.else
-PLIST_SUB+=	PTHREAD="@comment "
-.endif
-
 post-patch:
 	@# Remove CFLAGS when building the python module, pydistfile is used
 	@# and will do the right thing.
@@ -83,4 +75,4 @@ post-patch:
 	@${ECHO_CMD} "/* Dummy file */" > ${WRKSRC}/features.h
 	@${ECHO_CMD} "/* Dummy file */" > ${WRKSRC}/cgi/features.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo
index 297e096f3823..2bd86d178e3c 100644
--- a/www/clearsilver/distinfo
+++ b/www/clearsilver/distinfo
@@ -1,3 +1,3 @@
-MD5 (clearsilver-0.10.4.tar.gz) = 9523df7ef17e41a01dbae5032a3e450b
-SHA256 (clearsilver-0.10.4.tar.gz) = 7d8e4addb3478fcaaec62ac874e022502d6f93b899b10b14394170ac443eb42b
-SIZE (clearsilver-0.10.4.tar.gz) = 655730
+MD5 (clearsilver-0.10.5.tar.gz) = b8c0c7fbe0ef5e06e0c935f134304d44
+SHA256 (clearsilver-0.10.5.tar.gz) = 1e9da038deafddd3d0c1c510626c28be5a0f4f17b9091d577fd30e7c5ba88680
+SIZE (clearsilver-0.10.5.tar.gz) = 439190
diff --git a/www/clearsilver/files/patch-configure b/www/clearsilver/files/patch-configure
deleted file mode 100644
index bec430194cb3..000000000000
--- a/www/clearsilver/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Thu Dec 14 19:15:07 2006
-+++ configure	Thu Dec 14 19:16:25 2006
-@@ -4969,14 +4969,6 @@
- fi
- 
- 
--  if test $cs_cv_pthread = yes; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_PTHREADS 1
--_ACEOF
--
--    EXTRA_UTL_SRC="$EXTRA_UTL_SRC skiplist.c dict.c"
--  fi
--
- fi
- 
- 
diff --git a/www/clearsilver/files/patch-cs-Makefile b/www/clearsilver/files/patch-cs-Makefile
new file mode 100644
index 000000000000..a1fd909d7112
--- /dev/null
+++ b/www/clearsilver/files/patch-cs-Makefile
@@ -0,0 +1,11 @@
+--- cs/Makefile.orig	Thu May  3 08:21:03 2007
++++ cs/Makefile	Tue Jul 17 17:01:16 2007
+@@ -33,7 +33,7 @@
+ 	   test_each_array.cs test_name.cs test_with.cs test_numbers.cs \
+ 	   test_splice.cs test_joo.cs test_first_last.cs test_abs_max_min.cs \
+ 	   test_comma.cs test_macro_set.cs test_func.cs test_escape.cs \
+-	   test_uvar.cs test_crc.cs
++	   test_uvar.cs
+ 
+ 
+ all: $(TARGETS)
diff --git a/www/clearsilver/pkg-plist b/www/clearsilver/pkg-plist
index 7575dbc79eee..ea6aa6074ea5 100644
--- a/www/clearsilver/pkg-plist
+++ b/www/clearsilver/pkg-plist
@@ -1,6 +1,6 @@
 bin/cs
-bin/cstest
 bin/cs_static.cgi
+bin/cstest
 include/ClearSilver/ClearSilver.h
 include/ClearSilver/cgi/cgi.h
 include/ClearSilver/cgi/cgiwrap.h
@@ -8,7 +8,7 @@ include/ClearSilver/cgi/date.h
 include/ClearSilver/cgi/html.h
 include/ClearSilver/cs/cs.h
 include/ClearSilver/cs_config.h
-%%PTHREAD%%include/ClearSilver/util/dict.h
+include/ClearSilver/util/dict.h
 include/ClearSilver/util/filter.h
 include/ClearSilver/util/neo_date.h
 include/ClearSilver/util/neo_err.h
@@ -21,7 +21,7 @@ include/ClearSilver/util/neo_rand.h
 include/ClearSilver/util/neo_server.h
 include/ClearSilver/util/neo_str.h
 include/ClearSilver/util/rcfs.h
-%%PTHREAD%%include/ClearSilver/util/skiplist.h
+include/ClearSilver/util/skiplist.h
 include/ClearSilver/util/ulist.h
 include/ClearSilver/util/ulocks.h
 include/ClearSilver/util/wildmat.h