- Update to 0.99.2

- Add mirrors

4 files changed, 62 insertions, 23 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 8ddd05708fb..900ba335413 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,11 +6,20 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.11.6
-PORTREVISION=	3
+PORTVERSION=	0.99.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/0.11/${PORTVERSION}/ \
-		LOCAL/beech
+MASTER_SITES=	http://www.cherokee-project.com/download/0.99/${PORTVERSION}/ \
+		http://cherokee.osuosl.org/0.99/${PORTVERSION}/ \
+		ftp://mirrors.secution.com/cherokee/0.99/${PORTVERSION}/ \
+		ftp://ftp.easynet.be/cherokee/0.99/${PORTVERSION}/ \
+		http://ftp.heanet.ie/mirrors/cherokee/0.99/${PORTVERSION}/ \
+		http://www.ftp.ne.jp/infosystems/cherokee/0.99/${PORTVERSION}/ \
+		http://www.ring.gr.jp/archives/net/cherokee/0.99/${PORTVERSION}/ \
+		http://cherokee-project.pl/mirror/cherokee/0.99/${PORTVERSION}/ \
+		http://ftp.nluug.nl/pub/internet/cherokee/0.99/${PORTVERSION}/ \
+		http://ftp.surfnet.nl/pub/internet/cherokee/0.99/${PORTVERSION}/ \
+		http://ftp.saix.net/Cherokee/0.99/${PORTVERSION}/ \
+		http://mirror.is.co.za/mirrors/cherokee/0.99/${PORTVERSION}/
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Extremely fast and flexible web server
@@ -24,6 +33,7 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	cherokee.sh
 USE_BISON=	build
 USE_PYTHON=	2.4+
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -35,7 +45,7 @@ CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www/cherokee \
 DEFCONFS=	cherokee.conf
 CONFSUBDIRS=	ssl mods-available mods-enabled sites-available sites-enabled
 MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee-admin.1 \
-		spawn-fcgi.1 cherokee-tweak.1 cherokee-worker.1
+		cherokee-tweak.1 cherokee-worker.1
 PORTDOCS=	*
 
 OPTIONS=	OPENSSL	"TLS/SSL support via openssl"	on \
@@ -62,19 +72,19 @@ CONFIGURE_ARGS+=--disable-ipv6
 .ifdef WITH_MYSQL
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=yes
-PLIST_SUB+=     MYSQL=""
+PLIST_SUB+=	MYSQL=""
 .else
 CONFIGURE_ARGS+=--with-mysql=no
-PLIST_SUB+=     MYSQL="@comment "
+PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .ifdef WITH_LDAP
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=yes
-PLIST_SUB+=     LDAP=""
+PLIST_SUB+=	LDAP=""
 .else
 CONFIGURE_ARGS+=--with-ldap=no
-PLIST_SUB+=     LDAP="@comment "
+PLIST_SUB+=	LDAP="@comment "
 .endif
 
 post-patch:
@@ -107,6 +117,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/contrib/09to010.py
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
+		${WRKSRC}/contrib/011to098.py
+	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
+		${WRKSRC}/contrib/098to099.py
+	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/qa/fcgi.py
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
 		${WRKSRC}/qa/run-tests.py
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index 6d5a82485ba..5eff2a8380e 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.11.6.tar.gz) = 6dde47f7685991c54996fc71314e23d7
-SHA256 (cherokee-0.11.6.tar.gz) = c3409be1e15807fc17470952e14fd70166cb35fec52b910e1d54f60ff7fb99bb
-SIZE (cherokee-0.11.6.tar.gz) = 2857892
+MD5 (cherokee-0.99.2.tar.gz) = 8b1930985e1c9ccf3dd6be0fd46c78af
+SHA256 (cherokee-0.99.2.tar.gz) = 8eb6f8e45a8312a117a8fc6686097ba876abf0457f134e6ceeffbcd1af71a8b7
+SIZE (cherokee-0.99.2.tar.gz) = 4207758
diff --git a/www/cherokee/files/patch-cherokee-handler_cgi_base.c b/www/cherokee/files/patch-cherokee-handler_cgi_base.c
index 29b5f24a660..786ab196c32 100644
--- a/www/cherokee/files/patch-cherokee-handler_cgi_base.c
+++ b/www/cherokee/files/patch-cherokee-handler_cgi_base.c
@@ -1,10 +1,9 @@
---- cherokee/handler_cgi_base.c.orig	Mon Dec 11 11:44:26 2006
-+++ cherokee/handler_cgi_base.c	Thu Dec 14 10:09:38 2006
-@@ -21,7 +21,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  * USA
-  */
--
+--- cherokee/handler_cgi_base.c.orig	2009-02-26 00:07:37.000000000 -0900
++++ cherokee/handler_cgi_base.c	2009-03-02 15:03:03.000000000 -0900
+@@ -22,6 +22,8 @@
+  * 02110-1301, USA.
+  */ 
+ 
 +#include <stdlib.h>
 +#include <limits.h>
  #include "common-internal.h"
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 85e7f8ea22c..c74d48ef93a 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -2,7 +2,6 @@ bin/cget
 bin/cherokee-config
 bin/cherokee-panic
 bin/cherokee-tweak
-bin/spawn-fcgi
 @unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done
 @unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done
 etc/cherokee/cherokee.conf.default
@@ -56,6 +55,8 @@ lib/cherokee/libplugin_and.la
 lib/cherokee/libplugin_and.so
 lib/cherokee/libplugin_authlist.la
 lib/cherokee/libplugin_authlist.so
+lib/cherokee/libplugin_bind.la
+lib/cherokee/libplugin_bind.so
 lib/cherokee/libplugin_cgi.la
 lib/cherokee/libplugin_cgi.so
 lib/cherokee/libplugin_combined.la
@@ -98,6 +99,8 @@ lib/cherokee/libplugin_htpasswd.la
 lib/cherokee/libplugin_htpasswd.so
 %%LDAP%%lib/cherokee/libplugin_ldap.la
 %%LDAP%%lib/cherokee/libplugin_ldap.so
+lib/cherokee/libplugin_ip_hash.la
+lib/cherokee/libplugin_ip_hash.so
 lib/cherokee/libplugin_libssl.la
 lib/cherokee/libplugin_libssl.so
 lib/cherokee/libplugin_method.la
@@ -132,6 +135,8 @@ lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_server_info.so
 lib/cherokee/libplugin_ssi.la
 lib/cherokee/libplugin_ssi.so
+lib/cherokee/libplugin_streaming.la
+lib/cherokee/libplugin_streaming.so
 lib/cherokee/libplugin_w3c.la
 lib/cherokee/libplugin_w3c.so
 lib/libcherokee-base.la
@@ -167,6 +172,8 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/ModuleAuthlist.pyc
 %%DATADIR%%/admin/ModuleBalancer.py
 %%DATADIR%%/admin/ModuleBalancer.pyc
+%%DATADIR%%/admin/ModuleBind.py
+%%DATADIR%%/admin/ModuleBind.pyc
 %%DATADIR%%/admin/ModuleCgi.py
 %%DATADIR%%/admin/ModuleCgi.pyc
 %%DATADIR%%/admin/ModuleCommon.py
@@ -203,6 +210,8 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/ModuleHtdigest.pyc
 %%DATADIR%%/admin/ModuleHtpasswd.py
 %%DATADIR%%/admin/ModuleHtpasswd.pyc
+%%DATADIR%%/admin/ModuleIpHash.py
+%%DATADIR%%/admin/ModuleIpHash.pyc
 %%DATADIR%%/admin/ModuleLdap.py
 %%DATADIR%%/admin/ModuleLdap.pyc
 %%DATADIR%%/admin/ModuleMethod.py
@@ -229,6 +238,8 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/ModuleServerInfo.pyc
 %%DATADIR%%/admin/ModuleSsi.py
 %%DATADIR%%/admin/ModuleSsi.pyc
+%%DATADIR%%/admin/ModuleStreaming.py
+%%DATADIR%%/admin/ModuleStreaming.pyc
 %%DATADIR%%/admin/Page.py
 %%DATADIR%%/admin/Page.pyc
 %%DATADIR%%/admin/PageAdvanced.py
@@ -546,17 +557,26 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/static/images/macFFBgHack.png
 %%DATADIR%%/admin/static/images/menu-active.png
 %%DATADIR%%/admin/static/images/menu-highlight.png
+%%DATADIR%%/admin/static/images/menu-sep.png
 %%DATADIR%%/admin/static/images/offline.png
 %%DATADIR%%/admin/static/images/online.png
+%%DATADIR%%/admin/static/images/tab.png
+%%DATADIR%%/admin/static/images/top-bar.png
+%%DATADIR%%/admin/static/images/web_proud.jpg
 %%DATADIR%%/admin/static/images/workarea.png
 %%DATADIR%%/admin/static/js/common.js
 %%DATADIR%%/admin/static/js/icons.js
-%%DATADIR%%/admin/static/js/jquery-1.2.3.min.js
-%%DATADIR%%/admin/static/js/jquery.accordion.js
+%%DATADIR%%/admin/static/js/jquery-1.2.6.min.js
+%%DATADIR%%/admin/static/js/jquery.cookie.js
 %%DATADIR%%/admin/static/js/jquery.dimensions.js
 %%DATADIR%%/admin/static/js/jquery.easing.js
 %%DATADIR%%/admin/static/js/jquery.tablednd.js
 %%DATADIR%%/admin/static/js/thickbox.js
+%%DATADIR%%/admin/static/js/ui.core.js
+%%DATADIR%%/admin/static/js/ui.dialog.js
+%%DATADIR%%/admin/static/js/ui.draggable.js
+%%DATADIR%%/admin/static/js/ui.resizable.js
+%%DATADIR%%/admin/static/js/ui.tabs.js
 %%DATADIR%%/admin/status.template.html
 %%DATADIR%%/admin/validations.py
 %%DATADIR%%/admin/validations.pyc
@@ -568,6 +588,7 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/deps/fcgi.deps
 %%DATADIR%%/deps/phpcgi.deps
 %%DATADIR%%/deps/scgi.deps
+%%DATADIR%%/deps/streaming.deps
 %%DATADIR%%/icons/README.txt
 %%DATADIR%%/icons/arrow_turn_left.png
 %%DATADIR%%/icons/blank.png
@@ -596,7 +617,6 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/printer.png
 %%DATADIR%%/icons/ruby.png
 %%DATADIR%%/icons/script.png
-%%DATADIR%%/mime_types.txt
 %%DATADIR%%/themes/default/entry.html
 %%DATADIR%%/themes/default/footer.html
 %%DATADIR%%/themes/default/header.html
@@ -606,12 +626,18 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/themes/firefox3/footer.html
 %%DATADIR%%/themes/firefox3/header.html
 %%DATADIR%%/themes/firefox3/theme.css
+%%DATADIR%%/themes/plain/entry.html
+%%DATADIR%%/themes/plain/footer.html
+%%DATADIR%%/themes/plain/header.html
+%%DATADIR%%/themes/plain/theme.css
 www/cherokee/images/cherokee-logo.png
 www/cherokee/images/default-bg.png
+www/cherokee/images/favicon.ico
 www/cherokee/images/powered_by_cherokee.png
 www/cherokee/index.html
 @dirrm www/cherokee/images
 @dirrm www/cherokee
+@dirrm %%DATADIR%%/themes/plain
 @dirrm %%DATADIR%%/themes/firefox3
 @dirrm %%DATADIR%%/themes/default
 @dirrm %%DATADIR%%/themes