- Update to 0.7.2

- Install docs

3 files changed, 62 insertions, 36 deletions

diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 9f61dc78f39a..d3a5fda7dbd8 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	cherokee
-DISTVERSION=	0.7.0b1330
+PORTVERSION=	0.7.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/trunk/ \
-		LOCAL/beech \
-		http://www.alaskaparadise.com/freebsd/
+MASTER_SITES=	http://www.cherokee-project.com/download/0.7/0.7.2/ \
+		LOCAL/beech
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	beech@FreeBSD.org
@@ -35,7 +34,9 @@ CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www/cherokee \
 		--disable-static
 DEFCONFS=	cherokee.conf
 CONFSUBDIRS=	ssl mods-available mods-enabled sites-available sites-enabled
-MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
+MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_tweak.1 \
+		cherokee-admin.1 spawn-fcgi.1
+PORTDOCS=	*
 
 OPTIONS=	OPENSSL	"TLS/SSL support via openssl"	on \
 		GNUTLS	"TLS/SSL support via gnutls"	off \
@@ -87,4 +88,8 @@ post-install:
 	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\
 		if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done
 
+.if !defined(NOPORTDOCS)
+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/www/cherokee-devel/distinfo b/www/cherokee-devel/distinfo
index 144fb97190ce..073e24bc2f5e 100644
--- a/www/cherokee-devel/distinfo
+++ b/www/cherokee-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.7.0b1330.tar.gz) = cd25c37a08101bcd124a280d868315bb
-SHA256 (cherokee-0.7.0b1330.tar.gz) = 3c300de2c193b686d6a81d35109df256db7fc91a0077b68657c5409bf97b6340
-SIZE (cherokee-0.7.0b1330.tar.gz) = 2504023
+MD5 (cherokee-0.7.2.tar.gz) = 989d3a7ebe363ce4069e8d05a59c161f
+SHA256 (cherokee-0.7.2.tar.gz) = 55178338db38effa01ca3e02091c59696549e60c229a7b2a6b07028d38f79e7d
+SIZE (cherokee-0.7.2.tar.gz) = 2593067
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index 015add5264dd..7dd5e59543a2 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -1,8 +1,8 @@
 bin/cget
 bin/cherokee-config
 bin/cherokee-panic
+bin/cherokee-tweak
 bin/spawn-fcgi
-bin/cherokee_tweak
 @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
@@ -11,16 +11,15 @@ etc/cherokee/mods-enabled/.empty
 etc/cherokee/sites-available/.empty
 etc/cherokee/sites-enabled/.empty
 etc/cherokee/ssl/.empty
-@exec for i in `find %D/etc/cherokee -name \*.default`;do if [ ! -f ${i%%.default} ];then cp $i ${i%%.default};fi;done
-@exec for i in `find %D/etc/cherokee -name \*.sample`;do if [ ! -f ${i%%.sample} ];then cp $i ${i%%.sample};fi;done
 include/cherokee/admin_client.h
 include/cherokee/avl.h
 include/cherokee/avl_r.h
 include/cherokee/buffer.h
 include/cherokee/cherokee-config.h
-include/cherokee/config_node.h
 include/cherokee/cherokee.h
 include/cherokee/common.h
+include/cherokee/config_entry.h
+include/cherokee/config_node.h
 include/cherokee/connection.h
 include/cherokee/connection_info.h
 include/cherokee/downloader.h
@@ -29,6 +28,7 @@ include/cherokee/fdpoll.h
 include/cherokee/handler.h
 include/cherokee/header.h
 include/cherokee/http.h
+include/cherokee/init.h
 include/cherokee/list.h
 include/cherokee/logger.h
 include/cherokee/macros.h
@@ -40,22 +40,31 @@ include/cherokee/plugin.h
 include/cherokee/plugin_loader.h
 include/cherokee/post.h
 include/cherokee/resolv_cache.h
+include/cherokee/rule.h
 include/cherokee/server.h
+include/cherokee/trace.h
 include/cherokee/url.h
 include/cherokee/util.h
+include/cherokee/validator.h
 include/cherokee/version.h
 lib/cherokee/libplugin_admin.la
 lib/cherokee/libplugin_admin.so
+lib/cherokee/libplugin_and.la
+lib/cherokee/libplugin_and.so
 lib/cherokee/libplugin_cgi.la
 lib/cherokee/libplugin_cgi.so
 lib/cherokee/libplugin_combined.la
 lib/cherokee/libplugin_combined.so
 lib/cherokee/libplugin_common.la
 lib/cherokee/libplugin_common.so
+lib/cherokee/libplugin_directory.la
+lib/cherokee/libplugin_directory.so
 lib/cherokee/libplugin_dirlist.la
 lib/cherokee/libplugin_dirlist.so
 lib/cherokee/libplugin_error_redir.la
 lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_extensions.la
+lib/cherokee/libplugin_extensions.so
 lib/cherokee/libplugin_fastcgi.la
 lib/cherokee/libplugin_fastcgi.so
 lib/cherokee/libplugin_fcgi.la
@@ -64,30 +73,36 @@ lib/cherokee/libplugin_file.la
 lib/cherokee/libplugin_file.so
 lib/cherokee/libplugin_gzip.la
 lib/cherokee/libplugin_gzip.so
+lib/cherokee/libplugin_header.la
+lib/cherokee/libplugin_header.so
 lib/cherokee/libplugin_htdigest.la
 lib/cherokee/libplugin_htdigest.so
 lib/cherokee/libplugin_htpasswd.la
 lib/cherokee/libplugin_htpasswd.so
 lib/cherokee/libplugin_ldap.la
 lib/cherokee/libplugin_ldap.so
-lib/cherokee/libplugin_mirror.so
 lib/cherokee/libplugin_mirror.la
-lib/cherokee/libplugin_mysql.so
+lib/cherokee/libplugin_mirror.so
 lib/cherokee/libplugin_mysql.la
+lib/cherokee/libplugin_mysql.so
 lib/cherokee/libplugin_ncsa.la
 lib/cherokee/libplugin_ncsa.so
 lib/cherokee/libplugin_nn.la
 lib/cherokee/libplugin_nn.so
-lib/cherokee/libplugin_pam.so
+lib/cherokee/libplugin_not.la
+lib/cherokee/libplugin_not.so
+lib/cherokee/libplugin_or.la
+lib/cherokee/libplugin_or.so
 lib/cherokee/libplugin_pam.la
+lib/cherokee/libplugin_pam.so
 lib/cherokee/libplugin_phpcgi.la
 lib/cherokee/libplugin_phpcgi.so
 lib/cherokee/libplugin_plain.la
 lib/cherokee/libplugin_plain.so
-lib/cherokee/libplugin_proxy.so
-lib/cherokee/libplugin_proxy.la
 lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_request.la
+lib/cherokee/libplugin_request.so
 lib/cherokee/libplugin_round_robin.la
 lib/cherokee/libplugin_round_robin.so
 lib/cherokee/libplugin_scgi.la
@@ -109,8 +124,8 @@ lib/libcherokee-server.la
 lib/libcherokee-server.so
 lib/libcherokee-server.so.0
 libdata/pkgconfig/cherokee.pc
-sbin/cherokee-admin
 sbin/cherokee
+sbin/cherokee-admin
 sbin/cherokee-guardian
 share/aclocal/cherokee.m4
 %%DATADIR%%/admin/CherokeeManagement.py
@@ -122,8 +137,11 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/ModuleBalancer.py
 %%DATADIR%%/admin/ModuleCgi.py
 %%DATADIR%%/admin/ModuleCommon.py
+%%DATADIR%%/admin/ModuleDefault.py
+%%DATADIR%%/admin/ModuleDirectory.py
 %%DATADIR%%/admin/ModuleDirlist.py
 %%DATADIR%%/admin/ModuleErrorRedir.py
+%%DATADIR%%/admin/ModuleExtensions.py
 %%DATADIR%%/admin/ModuleFcgi.py
 %%DATADIR%%/admin/ModuleFile.py
 %%DATADIR%%/admin/ModuleHtdigest.py
@@ -134,6 +152,7 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/ModulePam.py
 %%DATADIR%%/admin/ModulePlain.py
 %%DATADIR%%/admin/ModuleRedir.py
+%%DATADIR%%/admin/ModuleRequest.py
 %%DATADIR%%/admin/ModuleRoundRobin.py
 %%DATADIR%%/admin/ModuleScgi.py
 %%DATADIR%%/admin/ModuleServerInfo.py
@@ -151,9 +170,9 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/admin/PageVServer.py
 %%DATADIR%%/admin/PageVServers.py
 %%DATADIR%%/admin/Post.py
+%%DATADIR%%/admin/RuleList.py
 %%DATADIR%%/admin/Table.py
 %%DATADIR%%/admin/Theme.py
-%%DATADIR%%/admin/VirtualServer.py
 %%DATADIR%%/admin/advanced.help.html
 %%DATADIR%%/admin/config.py
 %%DATADIR%%/admin/configured.py
@@ -195,7 +214,9 @@ share/aclocal/cherokee.m4
 %%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.dimensions.js
 %%DATADIR%%/admin/static/js/jquery.easing.js
+%%DATADIR%%/admin/static/js/jquery.tablednd.js
 %%DATADIR%%/admin/validations.py
 %%DATADIR%%/admin/vserver.help.html
 %%DATADIR%%/admin/vservers.help.html
@@ -233,37 +254,37 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/ruby.png
 %%DATADIR%%/icons/script.png
 %%DATADIR%%/mime_types.txt
-%%DATADIR%%/themes/default/logo.png
 %%DATADIR%%/themes/default/entry.html
 %%DATADIR%%/themes/default/footer.html
 %%DATADIR%%/themes/default/header.html
+%%DATADIR%%/themes/default/logo.png
 %%DATADIR%%/themes/default/theme.css
-%%DATADIR%%/themes/firefox3/header.html
-%%DATADIR%%/themes/firefox3/footer.html
 %%DATADIR%%/themes/firefox3/entry.html
+%%DATADIR%%/themes/firefox3/footer.html
+%%DATADIR%%/themes/firefox3/header.html
 %%DATADIR%%/themes/firefox3/theme.css
 www/cherokee/images/cherokee-logo.png
 www/cherokee/images/default-bg.png
 www/cherokee/images/powered_by_cherokee.png
 www/cherokee/index.html
-@dirrm %%DATADIR%%/admin/static/css
-@dirrm %%DATADIR%%/admin/static/images
+@dirrm www/cherokee/images
+@dirrm www/cherokee
+@dirrm %%DATADIR%%/themes/firefox3
+@dirrm %%DATADIR%%/themes/default
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/deps
 @dirrm %%DATADIR%%/admin/static/js
+@dirrm %%DATADIR%%/admin/static/images
+@dirrm %%DATADIR%%/admin/static/css
 @dirrm %%DATADIR%%/admin/static
 @dirrm %%DATADIR%%/admin
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/deps
-@dirrm %%DATADIR%%/themes/default
-@dirrm %%DATADIR%%/themes/firefox3
-@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-@dirrm include/cherokee
 @dirrm lib/cherokee
-@dirrmtry etc/cherokee/mods-available
-@dirrmtry etc/cherokee/mods-enabled
-@dirrmtry etc/cherokee/sites-available
-@dirrmtry etc/cherokee/sites-enabled
+@dirrm include/cherokee
 @dirrmtry etc/cherokee/ssl
+@dirrmtry etc/cherokee/sites-enabled
+@dirrmtry etc/cherokee/sites-available
+@dirrmtry etc/cherokee/mods-enabled
+@dirrmtry etc/cherokee/mods-available
 @dirrmtry etc/cherokee
-@dirrmtry www/cherokee/images
-@dirrmtry www/cherokee