- Update to 0.6.1

- Many changes since 0.5. See http://www.cherokee-project.com

4 files changed, 171 insertions, 132 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index bf7f113a6d0c..ec662d29cb00 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.5.6
-PORTREVISION=	7
+PORTVERSION=	0.6.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/${PORTVERSION:R}/${PORTVERSION}/ \
-		CENKES LOCAL/beech
+MASTER_SITES=	http://www.cherokee-project.com/download/0.6/${DISTVERSION}/
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Extremely fast and flexible web server
@@ -23,6 +21,8 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	cherokee.sh
 USE_GCC=	3.4+
 USE_BISON=	build
+USE_MYSQL=	yes
+USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -30,7 +30,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www/cherokee \
 		--enable-readdir_r \
 		--disable-static
-DEFCONFS=	advanced.conf cherokee.conf icons.conf mime.compression.types mime.types
+DEFCONFS=	cherokee.conf mime.compression.types mime.types
 CONFSUBDIRS=	ssl mods-available mods-enabled sites-available sites-enabled
 MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
 
@@ -57,7 +57,8 @@ post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
 		${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR} --|g'
 	@${REINPLACE_CMD} -e '/cherokee_replace.*%sysconfdir%/d;/^SUBDIRS/s|doc ||;\
-		/^install-data-am/s|install-data-local|install-data-local-config|'\
+		/^install-data-am/s|install-data-local|install-data-local-config|;\
+		/^SUBDIRS/s|windows||'\
 		${WRKSRC}/Makefile.in
 	@for i in ${BUILD_WRKSRC}/*.sample.pre;do ${SED} -e \
 		's:%sysconfdir%:${PREFIX}/etc:g; \
@@ -73,24 +74,14 @@ post-install:
 	@${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|}
 	@for i in ${DEFCONFS};do\
 		${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done
-	@for i in ${WRKSRC}/mods-*.sample;do\
-		${INSTALL_DATA} $$i ${PREFIX}/etc/cherokee/mods-available/$${i#*mods-};done
-	@for i in ${WRKSRC}/sites-*.sample;do\
-		${INSTALL_DATA} $$i ${PREFIX}/etc/cherokee/sites-available/$${i#*sites-};done
+	@${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample
 	@:>${PREFIX}/etc/cherokee/mods-enabled/.empty
+	@:>${PREFIX}/etc/cherokee/sites-available/.empty
+	@:>${PREFIX}/etc/cherokee/sites-enabled/.empty
 	@:>${PREFIX}/etc/cherokee/ssl/.empty
 	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\
 		if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done
 	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\
 		if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done
-	@if [ -z "`${LS} ${PREFIX}/etc/cherokee/sites-enabled/`" ];then\
-		${LN} -sf ../sites-available/default ${PREFIX}/etc/cherokee/sites-enabled/;fi
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}/images/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/images/
-	@${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DOCSDIR}/
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index ecafe009b942..6a5e4528378a 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.5.6.tar.gz) = 0c5ae67c296f7e080900b23e533efd0b
-SHA256 (cherokee-0.5.6.tar.gz) = d19ac8a85c252ccfe04c06ce0ec9b03d036b27d07c6db4601ce7d6b33c4e9cc8
-SIZE (cherokee-0.5.6.tar.gz) = 1392282
+MD5 (cherokee-0.6.1.tar.gz) = 49044d6c9c50a6726a4e6c3c7f8ea544
+SHA256 (cherokee-0.6.1.tar.gz) = 44f5ba40435b1dc8855d6c7ae4d52927eefd6f0ce4c2afb598aecba5e9ba576a
+SIZE (cherokee-0.6.1.tar.gz) = 2496364
diff --git a/www/cherokee/files/patch-cherokee-socket.c b/www/cherokee/files/patch-cherokee-socket.c
deleted file mode 100644
index c3d2ffb49222..000000000000
--- a/www/cherokee/files/patch-cherokee-socket.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- cherokee/socket.c.orig	Thu Dec  7 09:46:29 2006
-+++ cherokee/socket.c	Thu Dec 14 10:35:48 2006
-@@ -1153,13 +1153,17 @@
- cherokee_socket_init_client_tls (cherokee_socket_t *socket)
- {
- #ifdef HAVE_TLS
--	int re;
--
- # ifdef HAVE_GNUTLS
-+
- 	const int                        kx_priority[] = {GNUTLS_KX_ANON_DH, 0};
- 	gnutls_anon_client_credentials   anoncred;
--	
-+
-+#endif
-+
-+	int re;	
- 	socket->is_tls = TLS;
-+
-+# ifdef HAVE_GNUTLS
- 
- 	/* Acredentials
- 	 */
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 112903b5220d..b409330ff000 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -1,28 +1,26 @@
 bin/cget
 bin/cherokee-config
 bin/cherokee-panic
-bin/cherokee_logrotate
+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
-@unexec cd %D/etc/cherokee/sites-enabled/&&if [ -L default -a -z "`ls|grep -vx default`" ];then rm -f default;fi
-etc/cherokee/advanced.conf.default
 etc/cherokee/cherokee.conf.default
-etc/cherokee/icons.conf.default
+etc/cherokee/cherokee.conf.perf_sample
 etc/cherokee/mime.compression.types.default
 etc/cherokee/mime.types.default
-etc/cherokee/mods-available/admin.sample
-etc/cherokee/mods-available/ssl.sample
 etc/cherokee/mods-enabled/.empty
-etc/cherokee/sites-available/default.sample
-etc/cherokee/sites-available/example.sample
+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
-@exec if [ ! -d %D/etc/cherokee/sites-enabled ];then mkdir %D/etc/cherokee/sites-enabled;fi
-@exec cd %D/etc/cherokee/sites-enabled/&&if [ -z "`ls`" ];then ln -sf ../sites-available/default;fi
 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/connection.h
@@ -34,20 +32,20 @@ include/cherokee/handler.h
 include/cherokee/header.h
 include/cherokee/http.h
 include/cherokee/list.h
-include/cherokee/list_merge_sort.h
 include/cherokee/logger.h
 include/cherokee/macros.h
 include/cherokee/mime.h
 include/cherokee/mime_entry.h
 include/cherokee/module.h
-include/cherokee/module_loader.h
 include/cherokee/nonce.h
+include/cherokee/plugin.h
+include/cherokee/plugin_loader.h
+include/cherokee/post.h
 include/cherokee/resolv_cache.h
 include/cherokee/server.h
-include/cherokee/table.h
-include/cherokee/typed_table.h
 include/cherokee/url.h
 include/cherokee/util.h
+include/cherokee/version.h
 lib/cherokee/libplugin_admin.la
 lib/cherokee/libplugin_admin.so
 lib/cherokee/libplugin_cgi.la
@@ -70,18 +68,28 @@ lib/cherokee/libplugin_gzip.la
 lib/cherokee/libplugin_gzip.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_mysql.la
 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_pam.la
 lib/cherokee/libplugin_phpcgi.la
 lib/cherokee/libplugin_phpcgi.so
 lib/cherokee/libplugin_plain.la
 lib/cherokee/libplugin_plain.so
-lib/cherokee/libplugin_read_config.la
-lib/cherokee/libplugin_read_config.so
 lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_round_robin.la
+lib/cherokee/libplugin_round_robin.so
 lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_scgi.so
 lib/cherokee/libplugin_server_info.la
@@ -101,98 +109,161 @@ lib/libcherokee-server.la
 lib/libcherokee-server.so
 lib/libcherokee-server.so.0
 libdata/pkgconfig/cherokee.pc
+sbin/cherokee-admin
 sbin/cherokee
+sbin/cherokee-guardian
 share/aclocal/cherokee.m4
+%%DATADIR%%/admin/CherokeeManagement.py
+%%DATADIR%%/admin/Entry.py
+%%DATADIR%%/admin/Form.py
+%%DATADIR%%/admin/Module.py
+%%DATADIR%%/admin/ModuleAdmin.py
+%%DATADIR%%/admin/ModuleAuth.py
+%%DATADIR%%/admin/ModuleBalancer.py
+%%DATADIR%%/admin/ModuleCgi.py
+%%DATADIR%%/admin/ModuleCommon.py
+%%DATADIR%%/admin/ModuleDirlist.py
+%%DATADIR%%/admin/ModuleErrorRedir.py
+%%DATADIR%%/admin/ModuleFcgi.py
+%%DATADIR%%/admin/ModuleFile.py
+%%DATADIR%%/admin/ModuleHtdigest.py
+%%DATADIR%%/admin/ModuleHtpasswd.py
+%%DATADIR%%/admin/ModuleLdap.py
+%%DATADIR%%/admin/ModuleMirror.py
+%%DATADIR%%/admin/ModuleMysql.py
+%%DATADIR%%/admin/ModulePam.py
+%%DATADIR%%/admin/ModulePlain.py
+%%DATADIR%%/admin/ModuleRedir.py
+%%DATADIR%%/admin/ModuleRoundRobin.py
+%%DATADIR%%/admin/ModuleScgi.py
+%%DATADIR%%/admin/ModuleServerInfo.py
+%%DATADIR%%/admin/Page.py
+%%DATADIR%%/admin/PageAdvanced.py
+%%DATADIR%%/admin/PageAjaxUpdate.py
+%%DATADIR%%/admin/PageEncoders.py
+%%DATADIR%%/admin/PageEntry.py
+%%DATADIR%%/admin/PageError.py
+%%DATADIR%%/admin/PageFeedback.py
+%%DATADIR%%/admin/PageGeneral.py
+%%DATADIR%%/admin/PageIcon.py
+%%DATADIR%%/admin/PageMain.py
+%%DATADIR%%/admin/PageMime.py
+%%DATADIR%%/admin/PageVServer.py
+%%DATADIR%%/admin/PageVServers.py
+%%DATADIR%%/admin/Post.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
+%%DATADIR%%/admin/consts.py
+%%DATADIR%%/admin/default.template.html
+%%DATADIR%%/admin/encoder.help.html
+%%DATADIR%%/admin/entry.help.html
+%%DATADIR%%/admin/error_couldnt_launch.template.html
+%%DATADIR%%/admin/error_icons_dir_missing.template.html
+%%DATADIR%%/admin/error_not_found.template.html
+%%DATADIR%%/admin/error_not_writable.template.html
+%%DATADIR%%/admin/feedback.help.html
+%%DATADIR%%/admin/general.help.html
+%%DATADIR%%/admin/icon.help.html
+%%DATADIR%%/admin/main.help.html
+%%DATADIR%%/admin/main.template.html
+%%DATADIR%%/admin/mime.help.html
+%%DATADIR%%/admin/pyscgi.py
+%%DATADIR%%/admin/server.py
+%%DATADIR%%/admin/static/css/cherokee.css
+%%DATADIR%%/admin/static/css/reset-min.css
+%%DATADIR%%/admin/static/images/background.png
+%%DATADIR%%/admin/static/images/bin.png
+%%DATADIR%%/admin/static/images/button-left.png
+%%DATADIR%%/admin/static/images/button-right.png
+%%DATADIR%%/admin/static/images/cherokee-logo-bar.png
+%%DATADIR%%/admin/static/images/collapsed.gif
+%%DATADIR%%/admin/static/images/dialog-error.png
+%%DATADIR%%/admin/static/images/dialog-information.png
+%%DATADIR%%/admin/static/images/dialog-warning.png
+%%DATADIR%%/admin/static/images/expanded.gif
+%%DATADIR%%/admin/static/images/help.png
+%%DATADIR%%/admin/static/images/menu-active.png
+%%DATADIR%%/admin/static/images/menu-highlight.png
+%%DATADIR%%/admin/static/images/offline.png
+%%DATADIR%%/admin/static/images/online.png
+%%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.easing.js
+%%DATADIR%%/admin/validations.py
+%%DATADIR%%/admin/vserver.help.html
+%%DATADIR%%/admin/vservers.help.html
 %%DATADIR%%/deps/combined.deps
 %%DATADIR%%/deps/common.deps
 %%DATADIR%%/deps/error_redir.deps
 %%DATADIR%%/deps/nn.deps
 %%DATADIR%%/deps/phpcgi.deps
-%%DATADIR%%/icons/back.png
-%%DATADIR%%/icons/binary.png
+%%DATADIR%%/icons/README.txt
+%%DATADIR%%/icons/arrow_turn_left.png
 %%DATADIR%%/icons/blank.png
 %%DATADIR%%/icons/bomb.png
-%%DATADIR%%/icons/compressed.png
+%%DATADIR%%/icons/camera.png
+%%DATADIR%%/icons/cd.png
+%%DATADIR%%/icons/color_wheel.png
+%%DATADIR%%/icons/control_play.png
+%%DATADIR%%/icons/css.png
+%%DATADIR%%/icons/cup.png
+%%DATADIR%%/icons/email.png
+%%DATADIR%%/icons/film.png
 %%DATADIR%%/icons/folder.png
-%%DATADIR%%/icons/image.png
-%%DATADIR%%/icons/iso.png
-%%DATADIR%%/icons/java.png
-%%DATADIR%%/icons/movie.png
-%%DATADIR%%/icons/pdf.png
-%%DATADIR%%/icons/ps.png
-%%DATADIR%%/icons/readme.png
+%%DATADIR%%/icons/font.png
+%%DATADIR%%/icons/html.png
+%%DATADIR%%/icons/music.png
+%%DATADIR%%/icons/package.png
+%%DATADIR%%/icons/page_white.png
+%%DATADIR%%/icons/page_white_acrobat.png
+%%DATADIR%%/icons/page_white_actionscript.png
+%%DATADIR%%/icons/page_white_c.png
+%%DATADIR%%/icons/page_white_go.png
+%%DATADIR%%/icons/page_white_office.png
+%%DATADIR%%/icons/page_white_php.png
+%%DATADIR%%/icons/page_white_text.png
+%%DATADIR%%/icons/printer.png
+%%DATADIR%%/icons/ruby.png
 %%DATADIR%%/icons/script.png
-%%DATADIR%%/icons/sound.png
-%%DATADIR%%/icons/tex.png
-%%DATADIR%%/icons/text.png
-%%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
-%%PORTDOCS%%%%DOCSDIR%%/Authentication.html
-%%PORTDOCS%%%%DOCSDIR%%/Authors.html
-%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
-%%PORTDOCS%%%%DOCSDIR%%/Cget.html
-%%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html
-%%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html
-%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
-%%PORTDOCS%%%%DOCSDIR%%/Comparison_servers.html
-%%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html
-%%PORTDOCS%%%%DOCSDIR%%/Configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/Copying_and_license.html
-%%PORTDOCS%%%%DOCSDIR%%/Current_events.html
-%%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html
-%%PORTDOCS%%%%DOCSDIR%%/Encoders.html
-%%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/FastCGI.html
-%%PORTDOCS%%%%DOCSDIR%%/File_sending.html
-%%PORTDOCS%%%%DOCSDIR%%/Frequently_asked_questions.html
-%%PORTDOCS%%%%DOCSDIR%%/Gzip_encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/How_to_generate_SSL_keys.html
-%%PORTDOCS%%%%DOCSDIR%%/How_to_manage_Virtual_Host.html
-%%PORTDOCS%%%%DOCSDIR%%/Htdigest_validator.html
-%%PORTDOCS%%%%DOCSDIR%%/Htpasswd_validator.html
-%%PORTDOCS%%%%DOCSDIR%%/Icons_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/Intro.txt
-%%PORTDOCS%%%%DOCSDIR%%/Jaws_and_Cherokee_with_FastCGI.html
-%%PORTDOCS%%%%DOCSDIR%%/Logging_system.html
-%%PORTDOCS%%%%DOCSDIR%%/Mime_types_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/NCSA_logger.html
-%%PORTDOCS%%%%DOCSDIR%%/NCSA_logs.html
-%%PORTDOCS%%%%DOCSDIR%%/PAM_validator.html
-%%PORTDOCS%%%%DOCSDIR%%/PHP_execution.html
-%%PORTDOCS%%%%DOCSDIR%%/Plain_validator.html
-%%PORTDOCS%%%%DOCSDIR%%/Redirections.html
-%%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html
-%%PORTDOCS%%%%DOCSDIR%%/SCGI.html
-%%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html
-%%PORTDOCS%%%%DOCSDIR%%/Validators.html
-%%PORTDOCS%%%%DOCSDIR%%/W3C_logger.html
-%%PORTDOCS%%%%DOCSDIR%%/W3C_logs.html
-%%PORTDOCS%%%%DOCSDIR%%/WebApplications.html
-%%PORTDOCS%%%%DOCSDIR%%/cherokee.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/images/Cherokee-icono.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Exquisite-khelpcenter.png
-%%PORTDOCS%%%%DOCSDIR%%/images/Server-conf-small.png
+%%DATADIR%%/themes/default/cherokee-logo.png
+%%DATADIR%%/themes/default/entry.html
+%%DATADIR%%/themes/default/footer.html
+%%DATADIR%%/themes/default/header.html
+%%DATADIR%%/themes/default/theme.css
+%%DATADIR%%/themes/firefox3/header.html
+%%DATADIR%%/themes/firefox3/footer.html
+%%DATADIR%%/themes/firefox3/entry.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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/admin/static/css
+@dirrm %%DATADIR%%/admin/static/images
+@dirrm %%DATADIR%%/admin/static/js
+@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 lib/cherokee
 @dirrm include/cherokee
-@dirrmtry etc/cherokee/ssl
-@dirrmtry etc/cherokee/sites-enabled
-@dirrmtry etc/cherokee/sites-available
-@dirrmtry etc/cherokee/mods-enabled
+@dirrm lib/cherokee
 @dirrmtry etc/cherokee/mods-available
+@dirrmtry etc/cherokee/mods-enabled
+@dirrmtry etc/cherokee/sites-available
+@dirrmtry etc/cherokee/sites-enabled
+@dirrmtry etc/cherokee/ssl
 @dirrmtry etc/cherokee
 @dirrmtry www/cherokee/images
 @dirrmtry www/cherokee