Update cherokee to 1.0.5.

Based on PR#43557 by Wen Heping.

Bump to 1.x release.

9 files changed, 1020 insertions, 235 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 6fd563f2140..ad574147f08 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,85 +1,49 @@
-# $NetBSD: Makefile,v 1.14 2010/06/28 10:49:51 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/07/11 12:18:55 obache Exp $
 #
 
-DISTNAME=	cherokee-0.5.3
-PKGREVISION=	5
+DISTNAME=	cherokee-1.0.5
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/0.5/0.5.3/
+MASTER_SITES=	http://www.cherokee-project.com/download/1.0/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cherokee-project.com/
 COMMENT=	Flexible and fast web server
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		bison flex
+USE_TOOLS+=		gmake msgfmt
 
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-wwwroot=${PREFIX}/share/cherokee
 
 PKGCONFIG_OVERRIDE=	cherokee.pc.in
 
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 OWN_DIRS=		${PKG_SYSCONFDIR}/cherokee
-OWN_DIRS+=		${PKG_SYSCONFDIR}/cherokee/mods-enabled
-OWN_DIRS+=		${PKG_SYSCONFDIR}/cherokee/sites-enabled
 OWN_DIRS+=		${VARBASE}/log
 OWN_DIRS+=		${VARBASE}/run
 EGDIR=			${PREFIX}/share/examples/cherokee
-MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
-CONF_FILES=
-.for f in		advanced.conf \
-			cherokee.conf \
-			icons.conf \
-			mime.compression.types \
-			mime.types
-CONF_FILES+=		${EGDIR}/cherokee/${f} ${PKG_SYSCONFDIR}/cherokee/${f}
-.endfor
-CONF_FILES+=		${EGDIR}/cherokee/sites-available/default \
-			${PKG_SYSCONFDIR}/cherokee/sites-enabled/default
+MESSAGE_SUBST+=		EGDIR=${EGDIR}
+CONF_FILES+=		${EGDIR}/cherokee/cherokee.conf \
+			${PKG_SYSCONFDIR}/cherokee/cherokee.conf
 
 RCD_SCRIPTS=		cherokee
 
-SUBST_CLASSES+=		varbase
-SUBST_STAGE.varbase=	pre-configure
-SUBST_MESSAGE.varbase=	Fixing references to local state directory.
-SUBST_SED.varbase=	-e 's|/var/|${VARBASE}/|g'
-SUBST_FILES.varbase=	cherokee.conf.sample.pre
-SUBST_FILES.varbase+=	http-cherokee.xml
-SUBST_FILES.varbase+=	cherokee-logrotate.1
-SUBST_FILES.varbase+=	sites-default.sample.pre
+INSTALLATION_DIRS+=	${EGDIR}/pam.d
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.cherokee
-PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
-PKG_OPTIONS_GROUP.ssl=		gnutls openssl
-PKG_SUGGESTED_OPTIONS+=		inet6 gnutls
-PKG_SUPPORTED_OPTIONS+=		inet6
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+# Need to installation
+#TEST_TARGET=		test
 
-.if !empty(PKG_OPTIONS:Mgnutls)
-CONFIGURE_ARGS+=	--enable-tls=gnutls
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../security/gnutls/libgnutls-config.mk"
-CONF_FILES+=		${EGDIR}/cherokee/mods-available/ssl \
-			${PKG_SYSCONFDIR}/cherokee/mods-enabled/ssl
-.elif !empty(PKG_OPTIONS:Mopenssl)
-CONFIGURE_ARGS+=	--enable-tls=openssl
-.include "../../security/openssl/buildlink3.mk"
-CONF_FILES+=		${EGDIR}/cherokee/mods-available/ssl \
-			${PKG_SYSCONFDIR}/cherokee/mods-enabled/ssl
-.else
-CONFIGURE_ARGS+=	--disable-tls
-.endif
+BUILD_DEFS+=		VARBASE
 
-INSTALLATION_DIRS+=	${EGDIR}/pam.d
+REPLACE_PYTHON=		admin/server.py admin/upgrade_config.py
 
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cherokee/PLIST b/www/cherokee/PLIST
index db3060e8bbb..26b61993a04 100644
--- a/www/cherokee/PLIST
+++ b/www/cherokee/PLIST
@@ -1,155 +1,966 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/07/11 12:18:55 obache Exp $
 bin/cget
 bin/cherokee-config
 bin/cherokee-panic
-bin/cherokee_logrotate
+bin/cherokee-tweak
 include/cherokee/admin_client.h
+include/cherokee/avl.h
+include/cherokee/avl_r.h
 include/cherokee/buffer.h
+include/cherokee/cache.h
 include/cherokee/cherokee-config.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/cryptor.h
 include/cherokee/downloader.h
 include/cherokee/encoder.h
 include/cherokee/fdpoll.h
 include/cherokee/handler.h
 include/cherokee/header.h
 include/cherokee/http.h
+include/cherokee/init.h
+include/cherokee/iocache.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/nullable.h
+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/table.h
-include/cherokee/typed_table.h
+include/cherokee/template.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_and.la
+lib/cherokee/libplugin_authlist.la
+lib/cherokee/libplugin_bind.la
 lib/cherokee/libplugin_cgi.la
 lib/cherokee/libplugin_combined.la
 lib/cherokee/libplugin_common.la
+lib/cherokee/libplugin_custom.la
+lib/cherokee/libplugin_custom_error.la
+${PLIST.mysql}lib/cherokee/libplugin_dbslayer.la
+lib/cherokee/libplugin_deflate.la
+lib/cherokee/libplugin_directory.la
 lib/cherokee/libplugin_dirlist.la
+lib/cherokee/libplugin_empty_gif.la
+lib/cherokee/libplugin_error_nn.la
 lib/cherokee/libplugin_error_redir.la
-lib/cherokee/libplugin_fastcgi.la
+lib/cherokee/libplugin_evhost.la
+lib/cherokee/libplugin_exists.la
+lib/cherokee/libplugin_extensions.la
 lib/cherokee/libplugin_fcgi.la
 lib/cherokee/libplugin_file.la
+lib/cherokee/libplugin_from.la
+lib/cherokee/libplugin_fullpath.la
 lib/cherokee/libplugin_gzip.la
+${PLIST.geoip}lib/cherokee/libplugin_geoip.la
+lib/cherokee/libplugin_header.la
 lib/cherokee/libplugin_htdigest.la
+lib/cherokee/libplugin_htpasswd.la
+lib/cherokee/libplugin_ip_hash.la
+${PLIST.ldap}lib/cherokee/libplugin_ldap.la
+${PLIST.ssl}lib/cherokee/libplugin_libssl.la
+lib/cherokee/libplugin_method.la
+${PLIST.mysql}lib/cherokee/libplugin_mysql.la
 lib/cherokee/libplugin_ncsa.la
-lib/cherokee/libplugin_nn.la
-lib/cherokee/libplugin_phpcgi.la
+lib/cherokee/libplugin_not.la
+lib/cherokee/libplugin_or.la
+${PLIST.pam}lib/cherokee/libplugin_pam.la
 lib/cherokee/libplugin_plain.la
-lib/cherokee/libplugin_read_config.la
+lib/cherokee/libplugin_post_report.la
+lib/cherokee/libplugin_post_track.la
+lib/cherokee/libplugin_proxy.la
 lib/cherokee/libplugin_redir.la
+lib/cherokee/libplugin_rehost.la
+lib/cherokee/libplugin_render_rrd.la
+lib/cherokee/libplugin_request.la
+lib/cherokee/libplugin_round_robin.la
+lib/cherokee/libplugin_rrd.la
 lib/cherokee/libplugin_scgi.la
+lib/cherokee/libplugin_secdownload.la
 lib/cherokee/libplugin_server_info.la
-lib/cherokee/libplugin_w3c.la
+lib/cherokee/libplugin_ssi.la
+lib/cherokee/libplugin_streaming.la
+lib/cherokee/libplugin_target_ip.la
+lib/cherokee/libplugin_tls.la
+lib/cherokee/libplugin_url_arg.la
+lib/cherokee/libplugin_uwsgi.la
+lib/cherokee/libplugin_wildcard.la
 lib/libcherokee-base.la
 lib/libcherokee-client.la
 lib/libcherokee-config.la
 lib/libcherokee-server.la
 lib/pkgconfig/cherokee.pc
 man/man1/cget.1
+man/man1/cherokee-admin.1
 man/man1/cherokee-config.1
+man/man1/cherokee-tweak.1
+man/man1/cherokee-worker.1
 man/man1/cherokee.1
-man/man1/cherokee_logrotate.1
 sbin/cherokee
+sbin/cherokee-admin
+sbin/cherokee-worker
 share/aclocal/cherokee.m4
+share/cherokee/admin/Auth.py
+share/cherokee/admin/Backup.py
+share/cherokee/admin/Balancer.py
+share/cherokee/admin/CTK/CTK/Box.py
+share/cherokee/admin/CTK/CTK/Button.py
+share/cherokee/admin/CTK/CTK/Checkbox.py
+share/cherokee/admin/CTK/CTK/Combobox.py
+share/cherokee/admin/CTK/CTK/Config.py
+share/cherokee/admin/CTK/CTK/Container.py
+share/cherokee/admin/CTK/CTK/DatePicker.py
+share/cherokee/admin/CTK/CTK/Dialog.py
+share/cherokee/admin/CTK/CTK/Downloader.py
+share/cherokee/admin/CTK/CTK/Druid.py
+share/cherokee/admin/CTK/CTK/HTTP.py
+share/cherokee/admin/CTK/CTK/Help.py
+share/cherokee/admin/CTK/CTK/HiddenField.py
+share/cherokee/admin/CTK/CTK/Image.py
+share/cherokee/admin/CTK/CTK/Indenter.py
+share/cherokee/admin/CTK/CTK/JS.py
+share/cherokee/admin/CTK/CTK/Link.py
+share/cherokee/admin/CTK/CTK/List.py
+share/cherokee/admin/CTK/CTK/Notice.py
+share/cherokee/admin/CTK/CTK/Page.py
+share/cherokee/admin/CTK/CTK/PageCleaner.py
+share/cherokee/admin/CTK/CTK/Plugin.py
+share/cherokee/admin/CTK/CTK/Post.py
+share/cherokee/admin/CTK/CTK/ProgressBar.py
+share/cherokee/admin/CTK/CTK/PropsTable.py
+share/cherokee/admin/CTK/CTK/Proxy.py
+share/cherokee/admin/CTK/CTK/Radio.py
+share/cherokee/admin/CTK/CTK/RawHTML.py
+share/cherokee/admin/CTK/CTK/Refreshable.py
+share/cherokee/admin/CTK/CTK/Server.py
+share/cherokee/admin/CTK/CTK/SortableList.py
+share/cherokee/admin/CTK/CTK/Submitter.py
+share/cherokee/admin/CTK/CTK/Tab.py
+share/cherokee/admin/CTK/CTK/Table.py
+share/cherokee/admin/CTK/CTK/Template.py
+share/cherokee/admin/CTK/CTK/TextArea.py
+share/cherokee/admin/CTK/CTK/TextField.py
+share/cherokee/admin/CTK/CTK/ToggleButton.py
+share/cherokee/admin/CTK/CTK/Uploader.py
+share/cherokee/admin/CTK/CTK/Widget.py
+share/cherokee/admin/CTK/CTK/XMLRPCProxy.py
+share/cherokee/admin/CTK/CTK/__init__.py
+share/cherokee/admin/CTK/CTK/consts.py
+share/cherokee/admin/CTK/CTK/iPhoneToggle.py
+share/cherokee/admin/CTK/CTK/json_embedded.py
+share/cherokee/admin/CTK/CTK/pyscgi.py
+share/cherokee/admin/CTK/CTK/util.py
+share/cherokee/admin/CTK/static/css/CTK.css
+share/cherokee/admin/CTK/static/css/datepicker.css
+share/cherokee/admin/CTK/static/css/jquery-ui-1.7.2.custom.css
+share/cherokee/admin/CTK/static/css/jquery.ibutton.css
+share/cherokee/admin/CTK/static/images/arrow_ns.png
+share/cherokee/admin/CTK/static/images/bg-body.png
+share/cherokee/admin/CTK/static/images/bg-button-a-big.png
+share/cherokee/admin/CTK/static/images/bg-button-a-light.png
+share/cherokee/admin/CTK/static/images/bg-button-a.png
+share/cherokee/admin/CTK/static/images/bg-button-clone.png
+share/cherokee/admin/CTK/static/images/bg-button-new.png
+share/cherokee/admin/CTK/static/images/bg-button-span-big.png
+share/cherokee/admin/CTK/static/images/bg-button-span-light.png
+share/cherokee/admin/CTK/static/images/bg-button-span-start-light.png
+share/cherokee/admin/CTK/static/images/bg-button-span-stop-light.png
+share/cherokee/admin/CTK/static/images/bg-button-span.png
+share/cherokee/admin/CTK/static/images/bg-dialog-buttonpane.png
+share/cherokee/admin/CTK/static/images/bg-dialog-titlebar-close.gif
+share/cherokee/admin/CTK/static/images/bg-dialog-titlebar.png
+share/cherokee/admin/CTK/static/images/bg-dialog.png
+share/cherokee/admin/CTK/static/images/bg-filter.png
+share/cherokee/admin/CTK/static/images/bg-help-a.png
+share/cherokee/admin/CTK/static/images/bg-help-span.png
+share/cherokee/admin/CTK/static/images/bg-sel-actions-sel.png
+share/cherokee/admin/CTK/static/images/bg-sel-actions.png
+share/cherokee/admin/CTK/static/images/bg-td-even.png
+share/cherokee/admin/CTK/static/images/bg-th.png
+share/cherokee/admin/CTK/static/images/del-hover.png
+share/cherokee/admin/CTK/static/images/del.png
+share/cherokee/admin/CTK/static/images/dialog-error.png
+share/cherokee/admin/CTK/static/images/dialog-information.png
+share/cherokee/admin/CTK/static/images/dialog-warning.png
+share/cherokee/admin/CTK/static/images/ibutton-slider-default.png
+share/cherokee/admin/CTK/static/images/input-bg.png
+share/cherokee/admin/CTK/static/images/loader.gif
+share/cherokee/admin/CTK/static/images/loading.gif
+share/cherokee/admin/CTK/static/images/off.png
+share/cherokee/admin/CTK/static/images/offline.png
+share/cherokee/admin/CTK/static/images/on.png
+share/cherokee/admin/CTK/static/images/online.png
+share/cherokee/admin/CTK/static/images/tabbg.png
+share/cherokee/admin/CTK/static/images/tick.png
+share/cherokee/admin/CTK/static/images/ui-icons_222222_256x240.png
+share/cherokee/admin/CTK/static/images/ui-icons_2e83ff_256x240.png
+share/cherokee/admin/CTK/static/images/ui-icons_454545_256x240.png
+share/cherokee/admin/CTK/static/images/ui-icons_888888_256x240.png
+share/cherokee/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png
+share/cherokee/admin/CTK/static/images/uploadify.cancel.png
+share/cherokee/admin/CTK/static/js/Help.js
+share/cherokee/admin/CTK/static/js/Submitter.js
+share/cherokee/admin/CTK/static/js/common.js
+share/cherokee/admin/CTK/static/js/jquery-1.3.2.min.js
+share/cherokee/admin/CTK/static/js/jquery-ui-1.7.2.custom.min.js
+share/cherokee/admin/CTK/static/js/jquery.cookie.js
+share/cherokee/admin/CTK/static/js/jquery.form-defaults.js
+share/cherokee/admin/CTK/static/js/jquery.ibutton.js
+share/cherokee/admin/CTK/static/js/jquery.tablednd_0_5.js
+share/cherokee/admin/CTK/static/js/jquery.uploadProgress.js
+share/cherokee/admin/CgiBase.py
+share/cherokee/admin/Cherokee.py
+share/cherokee/admin/Flags.py
+share/cherokee/admin/Graph.py
+share/cherokee/admin/Handler.py
+share/cherokee/admin/Icons.py
+share/cherokee/admin/Login.py
+share/cherokee/admin/Mime.py
+share/cherokee/admin/Page.py
+share/cherokee/admin/PageAdvanced.py
+share/cherokee/admin/PageEntry.py
+share/cherokee/admin/PageError.py
+share/cherokee/admin/PageException.py
+share/cherokee/admin/PageGeneral.py
+share/cherokee/admin/PageHelp.py
+share/cherokee/admin/PageIndex.py
+share/cherokee/admin/PageNewConfig.py
+share/cherokee/admin/PageRule.py
+share/cherokee/admin/PageSource.py
+share/cherokee/admin/PageSources.py
+share/cherokee/admin/PageStatus.py
+share/cherokee/admin/PageVServer.py
+share/cherokee/admin/PageVServers.py
+share/cherokee/admin/Rule.py
+share/cherokee/admin/RuleSimple.py
+share/cherokee/admin/SelectionPanel.py
+share/cherokee/admin/Wizard.py
+share/cherokee/admin/XMLServerDigest.py
+share/cherokee/admin/cherokee.conf.sample
+share/cherokee/admin/config_version.py
+share/cherokee/admin/configured.py
+share/cherokee/admin/consts.py
+share/cherokee/admin/exception.html
+share/cherokee/admin/help.html
+share/cherokee/admin/performance.conf.sample
+share/cherokee/admin/plugins/admin.py
+share/cherokee/admin/plugins/authlist.py
+share/cherokee/admin/plugins/bind.py
+share/cherokee/admin/plugins/cgi.py
+share/cherokee/admin/plugins/common.py
+share/cherokee/admin/plugins/custom_error.py
+share/cherokee/admin/plugins/dbslayer.py
+share/cherokee/admin/plugins/directory.py
+share/cherokee/admin/plugins/dirlist.py
+share/cherokee/admin/plugins/empty_gif.py
+share/cherokee/admin/plugins/error_nn.py
+share/cherokee/admin/plugins/error_redir.py
+share/cherokee/admin/plugins/evhost.py
+share/cherokee/admin/plugins/exists.py
+share/cherokee/admin/plugins/extensions.py
+share/cherokee/admin/plugins/fcgi.py
+share/cherokee/admin/plugins/file.py
+share/cherokee/admin/plugins/from.py
+share/cherokee/admin/plugins/fullpath.py
+share/cherokee/admin/plugins/geoip.py
+share/cherokee/admin/plugins/header.py
+share/cherokee/admin/plugins/htdigest.py
+share/cherokee/admin/plugins/htpasswd.py
+share/cherokee/admin/plugins/ip_hash.py
+share/cherokee/admin/plugins/ldap.py
+share/cherokee/admin/plugins/method.py
+share/cherokee/admin/plugins/mysql.py
+share/cherokee/admin/plugins/pam.py
+share/cherokee/admin/plugins/plain.py
+share/cherokee/admin/plugins/post_report.py
+share/cherokee/admin/plugins/post_track.py
+share/cherokee/admin/plugins/proxy.py
+share/cherokee/admin/plugins/redir.py
+share/cherokee/admin/plugins/rehost.py
+share/cherokee/admin/plugins/request.py
+share/cherokee/admin/plugins/round_robin.py
+share/cherokee/admin/plugins/rrd.py
+share/cherokee/admin/plugins/scgi.py
+share/cherokee/admin/plugins/secdownload.py
+share/cherokee/admin/plugins/server_info.py
+share/cherokee/admin/plugins/ssi.py
+share/cherokee/admin/plugins/streaming.py
+share/cherokee/admin/plugins/target_ip.py
+share/cherokee/admin/plugins/tls.py
+share/cherokee/admin/plugins/url_arg.py
+share/cherokee/admin/plugins/uwsgi.py
+share/cherokee/admin/plugins/wildcard.py
+share/cherokee/admin/server.py
+share/cherokee/admin/static/css/cherokee-admin.css
+share/cherokee/admin/static/images/advanced.png
+share/cherokee/admin/static/images/bg-bar.png
+share/cherokee/admin/static/images/cherokee-logo-bar.png
+share/cherokee/admin/static/images/favicon.ico
+share/cherokee/admin/static/images/flags/ad.png
+share/cherokee/admin/static/images/flags/ae.png
+share/cherokee/admin/static/images/flags/af.png
+share/cherokee/admin/static/images/flags/ag.png
+share/cherokee/admin/static/images/flags/ai.png
+share/cherokee/admin/static/images/flags/al.png
+share/cherokee/admin/static/images/flags/am.png
+share/cherokee/admin/static/images/flags/an.png
+share/cherokee/admin/static/images/flags/ao.png
+share/cherokee/admin/static/images/flags/ar.png
+share/cherokee/admin/static/images/flags/as.png
+share/cherokee/admin/static/images/flags/at.png
+share/cherokee/admin/static/images/flags/au.png
+share/cherokee/admin/static/images/flags/aw.png
+share/cherokee/admin/static/images/flags/ax.png
+share/cherokee/admin/static/images/flags/az.png
+share/cherokee/admin/static/images/flags/ba.png
+share/cherokee/admin/static/images/flags/bb.png
+share/cherokee/admin/static/images/flags/bd.png
+share/cherokee/admin/static/images/flags/be.png
+share/cherokee/admin/static/images/flags/bf.png
+share/cherokee/admin/static/images/flags/bg.png
+share/cherokee/admin/static/images/flags/bh.png
+share/cherokee/admin/static/images/flags/bi.png
+share/cherokee/admin/static/images/flags/bj.png
+share/cherokee/admin/static/images/flags/bm.png
+share/cherokee/admin/static/images/flags/bn.png
+share/cherokee/admin/static/images/flags/bo.png
+share/cherokee/admin/static/images/flags/br.png
+share/cherokee/admin/static/images/flags/bs.png
+share/cherokee/admin/static/images/flags/bt.png
+share/cherokee/admin/static/images/flags/bv.png
+share/cherokee/admin/static/images/flags/bw.png
+share/cherokee/admin/static/images/flags/by.png
+share/cherokee/admin/static/images/flags/bz.png
+share/cherokee/admin/static/images/flags/ca.png
+share/cherokee/admin/static/images/flags/cc.png
+share/cherokee/admin/static/images/flags/cd.png
+share/cherokee/admin/static/images/flags/cf.png
+share/cherokee/admin/static/images/flags/cg.png
+share/cherokee/admin/static/images/flags/ch.png
+share/cherokee/admin/static/images/flags/ci.png
+share/cherokee/admin/static/images/flags/ck.png
+share/cherokee/admin/static/images/flags/cl.png
+share/cherokee/admin/static/images/flags/cm.png
+share/cherokee/admin/static/images/flags/cn.png
+share/cherokee/admin/static/images/flags/co.png
+share/cherokee/admin/static/images/flags/cr.png
+share/cherokee/admin/static/images/flags/cs.png
+share/cherokee/admin/static/images/flags/cu.png
+share/cherokee/admin/static/images/flags/cv.png
+share/cherokee/admin/static/images/flags/cx.png
+share/cherokee/admin/static/images/flags/cy.png
+share/cherokee/admin/static/images/flags/cz.png
+share/cherokee/admin/static/images/flags/de.png
+share/cherokee/admin/static/images/flags/dj.png
+share/cherokee/admin/static/images/flags/dk.png
+share/cherokee/admin/static/images/flags/dm.png
+share/cherokee/admin/static/images/flags/do.png
+share/cherokee/admin/static/images/flags/dz.png
+share/cherokee/admin/static/images/flags/ec.png
+share/cherokee/admin/static/images/flags/ee.png
+share/cherokee/admin/static/images/flags/eg.png
+share/cherokee/admin/static/images/flags/eh.png
+share/cherokee/admin/static/images/flags/england.png
+share/cherokee/admin/static/images/flags/er.png
+share/cherokee/admin/static/images/flags/es.png
+share/cherokee/admin/static/images/flags/et.png
+share/cherokee/admin/static/images/flags/europeanunion.png
+share/cherokee/admin/static/images/flags/fi.png
+share/cherokee/admin/static/images/flags/fj.png
+share/cherokee/admin/static/images/flags/fk.png
+share/cherokee/admin/static/images/flags/fm.png
+share/cherokee/admin/static/images/flags/fo.png
+share/cherokee/admin/static/images/flags/fr.png
+share/cherokee/admin/static/images/flags/ga.png
+share/cherokee/admin/static/images/flags/gb.png
+share/cherokee/admin/static/images/flags/gd.png
+share/cherokee/admin/static/images/flags/ge.png
+share/cherokee/admin/static/images/flags/gf.png
+share/cherokee/admin/static/images/flags/gh.png
+share/cherokee/admin/static/images/flags/gi.png
+share/cherokee/admin/static/images/flags/gl.png
+share/cherokee/admin/static/images/flags/gm.png
+share/cherokee/admin/static/images/flags/gn.png
+share/cherokee/admin/static/images/flags/gp.png
+share/cherokee/admin/static/images/flags/gq.png
+share/cherokee/admin/static/images/flags/gr.png
+share/cherokee/admin/static/images/flags/gs.png
+share/cherokee/admin/static/images/flags/gt.png
+share/cherokee/admin/static/images/flags/gu.png
+share/cherokee/admin/static/images/flags/gw.png
+share/cherokee/admin/static/images/flags/gy.png
+share/cherokee/admin/static/images/flags/hk.png
+share/cherokee/admin/static/images/flags/hm.png
+share/cherokee/admin/static/images/flags/hn.png
+share/cherokee/admin/static/images/flags/hr.png
+share/cherokee/admin/static/images/flags/ht.png
+share/cherokee/admin/static/images/flags/hu.png
+share/cherokee/admin/static/images/flags/id.png
+share/cherokee/admin/static/images/flags/ie.png
+share/cherokee/admin/static/images/flags/il.png
+share/cherokee/admin/static/images/flags/in.png
+share/cherokee/admin/static/images/flags/io.png
+share/cherokee/admin/static/images/flags/iq.png
+share/cherokee/admin/static/images/flags/ir.png
+share/cherokee/admin/static/images/flags/is.png
+share/cherokee/admin/static/images/flags/it.png
+share/cherokee/admin/static/images/flags/jm.png
+share/cherokee/admin/static/images/flags/jo.png
+share/cherokee/admin/static/images/flags/jp.png
+share/cherokee/admin/static/images/flags/ke.png
+share/cherokee/admin/static/images/flags/kg.png
+share/cherokee/admin/static/images/flags/kh.png
+share/cherokee/admin/static/images/flags/ki.png
+share/cherokee/admin/static/images/flags/km.png
+share/cherokee/admin/static/images/flags/kn.png
+share/cherokee/admin/static/images/flags/kp.png
+share/cherokee/admin/static/images/flags/kr.png
+share/cherokee/admin/static/images/flags/kw.png
+share/cherokee/admin/static/images/flags/ky.png
+share/cherokee/admin/static/images/flags/kz.png
+share/cherokee/admin/static/images/flags/la.png
+share/cherokee/admin/static/images/flags/lb.png
+share/cherokee/admin/static/images/flags/lc.png
+share/cherokee/admin/static/images/flags/li.png
+share/cherokee/admin/static/images/flags/lk.png
+share/cherokee/admin/static/images/flags/lr.png
+share/cherokee/admin/static/images/flags/ls.png
+share/cherokee/admin/static/images/flags/lt.png
+share/cherokee/admin/static/images/flags/lu.png
+share/cherokee/admin/static/images/flags/lv.png
+share/cherokee/admin/static/images/flags/ly.png
+share/cherokee/admin/static/images/flags/ma.png
+share/cherokee/admin/static/images/flags/mc.png
+share/cherokee/admin/static/images/flags/md.png
+share/cherokee/admin/static/images/flags/me.png
+share/cherokee/admin/static/images/flags/mg.png
+share/cherokee/admin/static/images/flags/mh.png
+share/cherokee/admin/static/images/flags/mk.png
+share/cherokee/admin/static/images/flags/ml.png
+share/cherokee/admin/static/images/flags/mm.png
+share/cherokee/admin/static/images/flags/mn.png
+share/cherokee/admin/static/images/flags/mo.png
+share/cherokee/admin/static/images/flags/mp.png
+share/cherokee/admin/static/images/flags/mq.png
+share/cherokee/admin/static/images/flags/mr.png
+share/cherokee/admin/static/images/flags/ms.png
+share/cherokee/admin/static/images/flags/mt.png
+share/cherokee/admin/static/images/flags/mu.png
+share/cherokee/admin/static/images/flags/mv.png
+share/cherokee/admin/static/images/flags/mw.png
+share/cherokee/admin/static/images/flags/mx.png
+share/cherokee/admin/static/images/flags/my.png
+share/cherokee/admin/static/images/flags/mz.png
+share/cherokee/admin/static/images/flags/na.png
+share/cherokee/admin/static/images/flags/nc.png
+share/cherokee/admin/static/images/flags/ne.png
+share/cherokee/admin/static/images/flags/nf.png
+share/cherokee/admin/static/images/flags/ng.png
+share/cherokee/admin/static/images/flags/ni.png
+share/cherokee/admin/static/images/flags/nl.png
+share/cherokee/admin/static/images/flags/no.png
+share/cherokee/admin/static/images/flags/np.png
+share/cherokee/admin/static/images/flags/nr.png
+share/cherokee/admin/static/images/flags/nu.png
+share/cherokee/admin/static/images/flags/nz.png
+share/cherokee/admin/static/images/flags/om.png
+share/cherokee/admin/static/images/flags/pa.png
+share/cherokee/admin/static/images/flags/pe.png
+share/cherokee/admin/static/images/flags/pf.png
+share/cherokee/admin/static/images/flags/pg.png
+share/cherokee/admin/static/images/flags/ph.png
+share/cherokee/admin/static/images/flags/pk.png
+share/cherokee/admin/static/images/flags/pl.png
+share/cherokee/admin/static/images/flags/pm.png
+share/cherokee/admin/static/images/flags/pn.png
+share/cherokee/admin/static/images/flags/pr.png
+share/cherokee/admin/static/images/flags/ps.png
+share/cherokee/admin/static/images/flags/pt.png
+share/cherokee/admin/static/images/flags/pw.png
+share/cherokee/admin/static/images/flags/py.png
+share/cherokee/admin/static/images/flags/qa.png
+share/cherokee/admin/static/images/flags/re.png
+share/cherokee/admin/static/images/flags/readme.txt
+share/cherokee/admin/static/images/flags/ro.png
+share/cherokee/admin/static/images/flags/rs.png
+share/cherokee/admin/static/images/flags/ru.png
+share/cherokee/admin/static/images/flags/rw.png
+share/cherokee/admin/static/images/flags/sa.png
+share/cherokee/admin/static/images/flags/sb.png
+share/cherokee/admin/static/images/flags/sc.png
+share/cherokee/admin/static/images/flags/scotland.png
+share/cherokee/admin/static/images/flags/sd.png
+share/cherokee/admin/static/images/flags/se.png
+share/cherokee/admin/static/images/flags/sg.png
+share/cherokee/admin/static/images/flags/sh.png
+share/cherokee/admin/static/images/flags/si.png
+share/cherokee/admin/static/images/flags/sj.png
+share/cherokee/admin/static/images/flags/sk.png
+share/cherokee/admin/static/images/flags/sl.png
+share/cherokee/admin/static/images/flags/sm.png
+share/cherokee/admin/static/images/flags/sn.png
+share/cherokee/admin/static/images/flags/so.png
+share/cherokee/admin/static/images/flags/sr.png
+share/cherokee/admin/static/images/flags/st.png
+share/cherokee/admin/static/images/flags/sv.png
+share/cherokee/admin/static/images/flags/sy.png
+share/cherokee/admin/static/images/flags/sz.png
+share/cherokee/admin/static/images/flags/tc.png
+share/cherokee/admin/static/images/flags/td.png
+share/cherokee/admin/static/images/flags/tf.png
+share/cherokee/admin/static/images/flags/tg.png
+share/cherokee/admin/static/images/flags/th.png
+share/cherokee/admin/static/images/flags/tj.png
+share/cherokee/admin/static/images/flags/tk.png
+share/cherokee/admin/static/images/flags/tl.png
+share/cherokee/admin/static/images/flags/tm.png
+share/cherokee/admin/static/images/flags/tn.png
+share/cherokee/admin/static/images/flags/to.png
+share/cherokee/admin/static/images/flags/tr.png
+share/cherokee/admin/static/images/flags/tt.png
+share/cherokee/admin/static/images/flags/tv.png
+share/cherokee/admin/static/images/flags/tw.png
+share/cherokee/admin/static/images/flags/tz.png
+share/cherokee/admin/static/images/flags/ua.png
+share/cherokee/admin/static/images/flags/ug.png
+share/cherokee/admin/static/images/flags/um.png
+share/cherokee/admin/static/images/flags/us.png
+share/cherokee/admin/static/images/flags/uy.png
+share/cherokee/admin/static/images/flags/uz.png
+share/cherokee/admin/static/images/flags/va.png
+share/cherokee/admin/static/images/flags/vc.png
+share/cherokee/admin/static/images/flags/ve.png
+share/cherokee/admin/static/images/flags/vg.png
+share/cherokee/admin/static/images/flags/vi.png
+share/cherokee/admin/static/images/flags/vn.png
+share/cherokee/admin/static/images/flags/vu.png
+share/cherokee/admin/static/images/flags/wales.png
+share/cherokee/admin/static/images/flags/wf.png
+share/cherokee/admin/static/images/flags/ws.png
+share/cherokee/admin/static/images/flags/ye.png
+share/cherokee/admin/static/images/flags/yt.png
+share/cherokee/admin/static/images/flags/za.png
+share/cherokee/admin/static/images/flags/zm.png
+share/cherokee/admin/static/images/flags/zw.png
+share/cherokee/admin/static/images/general.png
+share/cherokee/admin/static/images/home.png
+share/cherokee/admin/static/images/icons.png
+share/cherokee/admin/static/images/kid-running.png
+share/cherokee/admin/static/images/kid-stopped.png
+share/cherokee/admin/static/images/mime.png
+share/cherokee/admin/static/images/nav-selected.gif
+share/cherokee/admin/static/images/nav-sep.png
+share/cherokee/admin/static/images/other/contact-bug.png
+share/cherokee/admin/static/images/other/contact-irc.png
+share/cherokee/admin/static/images/other/contact-list.png
+share/cherokee/admin/static/images/other/facebook.png
+share/cherokee/admin/static/images/other/octality-logo.png
+share/cherokee/admin/static/images/other/proud.png
+share/cherokee/admin/static/images/other/twitter.png
+share/cherokee/admin/static/images/sources.png
+share/cherokee/admin/static/images/status.png
+share/cherokee/admin/static/images/vservers.png
+share/cherokee/admin/static/images/wizards/alfresco.png
+share/cherokee/admin/static/images/wizards/aspnet.png
+share/cherokee/admin/static/images/wizards/coldfusion.png
+share/cherokee/admin/static/images/wizards/concrete5.png
+share/cherokee/admin/static/images/wizards/dbslayer.png
+share/cherokee/admin/static/images/wizards/django.png
+share/cherokee/admin/static/images/wizards/drupal.png
+share/cherokee/admin/static/images/wizards/gallery.png
+share/cherokee/admin/static/images/wizards/glassfish.png
+share/cherokee/admin/static/images/wizards/hotlinking.png
+share/cherokee/admin/static/images/wizards/icons.png
+share/cherokee/admin/static/images/wizards/joomla.png
+share/cherokee/admin/static/images/wizards/liferay.png
+share/cherokee/admin/static/images/wizards/mailman.png
+share/cherokee/admin/static/images/wizards/mediawiki.png
+share/cherokee/admin/static/images/wizards/moinmoin.png
+share/cherokee/admin/static/images/wizards/mono.png
+share/cherokee/admin/static/images/wizards/moodle.png
+share/cherokee/admin/static/images/wizards/nagios.png
+share/cherokee/admin/static/images/wizards/php.png
+share/cherokee/admin/static/images/wizards/phpbb.png
+share/cherokee/admin/static/images/wizards/phpmyadmin.png
+share/cherokee/admin/static/images/wizards/rails.png
+share/cherokee/admin/static/images/wizards/redirect.png
+share/cherokee/admin/static/images/wizards/rtorrent.png
+share/cherokee/admin/static/images/wizards/static.png
+share/cherokee/admin/static/images/wizards/streaming.png
+share/cherokee/admin/static/images/wizards/sugar.png
+share/cherokee/admin/static/images/wizards/symfony.png
+share/cherokee/admin/static/images/wizards/trac.png
+share/cherokee/admin/static/images/wizards/uwsgi.png
+share/cherokee/admin/static/images/wizards/wordpress.png
+share/cherokee/admin/static/images/wizards/zend.png
+share/cherokee/admin/static/js/SelectionPanel.js
+share/cherokee/admin/theme.html
+share/cherokee/admin/upgrade_config.py
+share/cherokee/admin/util.py
+share/cherokee/admin/validations.py
+share/cherokee/admin/wizards/List.py
+share/cherokee/admin/wizards/alfresco.py
+share/cherokee/admin/wizards/coldfusion.py
+share/cherokee/admin/wizards/concrete5.py
+share/cherokee/admin/wizards/django.py
+share/cherokee/admin/wizards/drupal.py
+share/cherokee/admin/wizards/glassfish.py
+share/cherokee/admin/wizards/hotlinking.py
+share/cherokee/admin/wizards/icons.py
+share/cherokee/admin/wizards/joomla.py
+share/cherokee/admin/wizards/liferay.py
+share/cherokee/admin/wizards/mailman.py
+share/cherokee/admin/wizards/mediawiki.py
+share/cherokee/admin/wizards/moinmoin.py
+share/cherokee/admin/wizards/mono.py
+share/cherokee/admin/wizards/php.py
+share/cherokee/admin/wizards/phpbb.py
+share/cherokee/admin/wizards/phpmyadmin.py
+share/cherokee/admin/wizards/rails.py
+share/cherokee/admin/wizards/redirect.py
+share/cherokee/admin/wizards/rtorrent.py
+share/cherokee/admin/wizards/static.py
+share/cherokee/admin/wizards/streaming.py
+share/cherokee/admin/wizards/sugar.py
+share/cherokee/admin/wizards/symfony.py
+share/cherokee/admin/wizards/trac.py
+share/cherokee/admin/wizards/uwsgi.py
+share/cherokee/admin/wizards/wordpress.py
+share/cherokee/admin/wizards/zend.py
+share/cherokee/deps/cgi.deps
 share/cherokee/deps/combined.deps
 share/cherokee/deps/common.deps
 share/cherokee/deps/error_redir.deps
-share/cherokee/deps/nn.deps
-share/cherokee/deps/phpcgi.deps
-share/cherokee/icons/back.png
-share/cherokee/icons/binary.png
+share/cherokee/deps/fcgi.deps
+share/cherokee/deps/post_report.deps
+share/cherokee/deps/render_rrd.deps
+share/cherokee/deps/scgi.deps
+share/cherokee/deps/secdownload.deps
+share/cherokee/deps/streaming.deps
+share/cherokee/deps/uwsgi.deps
+share/cherokee/icons/README.txt
+share/cherokee/icons/arrow_turn_left.png
 share/cherokee/icons/blank.png
 share/cherokee/icons/bomb.png
-share/cherokee/icons/compressed.png
+share/cherokee/icons/camera.png
+share/cherokee/icons/cd.png
+share/cherokee/icons/color_wheel.png
+share/cherokee/icons/control_play.png
+share/cherokee/icons/css.png
+share/cherokee/icons/cup.png
+share/cherokee/icons/email.png
+share/cherokee/icons/film.png
 share/cherokee/icons/folder.png
-share/cherokee/icons/image.png
-share/cherokee/icons/iso.png
-share/cherokee/icons/java.png
-share/cherokee/icons/movie.png
-share/cherokee/icons/pdf.png
-share/cherokee/icons/ps.png
-share/cherokee/icons/readme.png
+share/cherokee/icons/font.png
+share/cherokee/icons/html.png
+share/cherokee/icons/music.png
+share/cherokee/icons/package.png
+share/cherokee/icons/page_white.png
+share/cherokee/icons/page_white_acrobat.png
+share/cherokee/icons/page_white_actionscript.png
+share/cherokee/icons/page_white_c.png
+share/cherokee/icons/page_white_go.png
+share/cherokee/icons/page_white_office.png
+share/cherokee/icons/page_white_php.png
+share/cherokee/icons/page_white_text.png
+share/cherokee/icons/printer.png
+share/cherokee/icons/ruby.png
 share/cherokee/icons/script.png
-share/cherokee/icons/sound.png
-share/cherokee/icons/tex.png
-share/cherokee/icons/text.png
-share/cherokee/icons/unknown.png
 share/cherokee/images/cherokee-logo.png
 share/cherokee/images/default-bg.png
+share/cherokee/images/favicon.ico
 share/cherokee/images/powered_by_cherokee.png
 share/cherokee/index.html
-share/cherokee/mime_types.txt
-share/doc/cherokee/Authentication.html
-share/doc/cherokee/Authors.html
-share/doc/cherokee/Behavior_configuration.html
-share/doc/cherokee/CGI_executing.html
-share/doc/cherokee/Cget.html
-share/doc/cherokee/Cherokee-icono.png
-share/doc/cherokee/Combined_logger.html
-share/doc/cherokee/Combined_logs.html
-share/doc/cherokee/Common_behavior.html
-share/doc/cherokee/Comparison_servers.html
-share/doc/cherokee/Compiling_and_Installing.html
-share/doc/cherokee/Configuration.html
-share/doc/cherokee/Copying_and_license.html
-share/doc/cherokee/Current_events.html
-share/doc/cherokee/Directory_configuration.html
-share/doc/cherokee/Directory_listing.html
-share/doc/cherokee/Encoders.html
-share/doc/cherokee/Exquisite-khelpcenter.png
-share/doc/cherokee/Extension_configuration.html
-share/doc/cherokee/FastCGI.html
-share/doc/cherokee/File_sending.html
-share/doc/cherokee/Frequently_asked_questions.html
-share/doc/cherokee/Gzip_encoder.html
-share/doc/cherokee/How_to_generate_SSL_keys.html
-share/doc/cherokee/How_to_manage_Virtual_Host.html
-share/doc/cherokee/Htdigest_validator.html
-share/doc/cherokee/Htpasswd_validator.html
-share/doc/cherokee/Icons_configuration.html
-share/doc/cherokee/Jaws_and_Cherokee_with_FastCGI.html
-share/doc/cherokee/Logging_system.html
-share/doc/cherokee/Mime_types_configuration.html
-share/doc/cherokee/NCSA_logger.html
-share/doc/cherokee/NCSA_logs.html
-share/doc/cherokee/PAM_validator.html
-share/doc/cherokee/PHP_execution.html
-share/doc/cherokee/Plain_validator.html
-share/doc/cherokee/Redirections.html
-share/doc/cherokee/Request_configuration.html
-share/doc/cherokee/Ruby_on_Rails_with_SCGI.html
-share/doc/cherokee/SCGI.html
-share/doc/cherokee/Server-conf-small.png
-share/doc/cherokee/Server_configuration.html
-share/doc/cherokee/U-Cherokee.html
-share/doc/cherokee/Validators.html
-share/doc/cherokee/W3C_logger.html
-share/doc/cherokee/W3C_logs.html
-share/doc/cherokee/WebApplications.html
-share/doc/cherokee/cherokee.png
+share/cherokee/themes/default/entry.html
+share/cherokee/themes/default/footer.html
+share/cherokee/themes/default/header.html
+share/cherokee/themes/default/logo.png
+share/cherokee/themes/default/theme.css
+share/cherokee/themes/firefox3/entry.html
+share/cherokee/themes/firefox3/footer.html
+share/cherokee/themes/firefox3/header.html
+share/cherokee/themes/firefox3/theme.css
+share/cherokee/themes/plain/entry.html
+share/cherokee/themes/plain/footer.html
+share/cherokee/themes/plain/header.html
+share/cherokee/themes/plain/theme.css
+share/doc/cherokee/basics.html
+share/doc/cherokee/basics_download.html
+share/doc/cherokee/basics_installation.html
+share/doc/cherokee/basics_installation_osx.html
+share/doc/cherokee/basics_installation_svn.html
+share/doc/cherokee/basics_installation_unix.html
+share/doc/cherokee/basics_installation_windows.html
+share/doc/cherokee/basics_requirements.html
+share/doc/cherokee/basics_running_cherokee.html
+share/doc/cherokee/basics_upgrade.html
+share/doc/cherokee/basics_why_cherokee.html
+share/doc/cherokee/config.html
+share/doc/cherokee/config_advanced.html
+share/doc/cherokee/config_general.html
+share/doc/cherokee/config_index.html
+share/doc/cherokee/config_info_sources.html
+share/doc/cherokee/config_quickstart.html
+share/doc/cherokee/config_status.html
+share/doc/cherokee/config_virtual_servers.html
+share/doc/cherokee/config_virtual_servers_evhost.html
+share/doc/cherokee/config_virtual_servers_rule.html
+share/doc/cherokee/config_virtual_servers_rule_types.html
+share/doc/cherokee/config_wizards.html
+share/doc/cherokee/cookbook.html
+share/doc/cherokee/cookbook_alfresco.html
+share/doc/cherokee/cookbook_authentication.html
+share/doc/cherokee/cookbook_coldfusion.html
+share/doc/cherokee/cookbook_concrete5.html
+share/doc/cherokee/cookbook_cross_compilation.html
+share/doc/cherokee/cookbook_dbslayer.html
+share/doc/cherokee/cookbook_django.html
+share/doc/cherokee/cookbook_drupal.html
+share/doc/cherokee/cookbook_embedding_cherokee.html
+share/doc/cherokee/cookbook_glassfish.html
+share/doc/cherokee/cookbook_https_accelerator.html
+share/doc/cherokee/cookbook_joomla.html
+share/doc/cherokee/cookbook_kumbia.html
+share/doc/cherokee/cookbook_liferay.html
+share/doc/cherokee/cookbook_mailman.html
+share/doc/cherokee/cookbook_maintenance.html
+share/doc/cherokee/cookbook_managing_logs.html
+share/doc/cherokee/cookbook_mono.html
+share/doc/cherokee/cookbook_moodle.html
+share/doc/cherokee/cookbook_nagios.html
+share/doc/cherokee/cookbook_optimizations.html
+share/doc/cherokee/cookbook_php.html
+share/doc/cherokee/cookbook_phpbb.html
+share/doc/cherokee/cookbook_phpmyadmin.html
+share/doc/cherokee/cookbook_redirs.html
+share/doc/cherokee/cookbook_ror.html
+share/doc/cherokee/cookbook_ssl.html
+share/doc/cherokee/cookbook_streaming.html
+share/doc/cherokee/cookbook_sugarcrm.html
+share/doc/cherokee/cookbook_symfony.html
+share/doc/cherokee/cookbook_trac.html
+share/doc/cherokee/cookbook_uwsgi.html
+share/doc/cherokee/cookbook_wordpress.html
+share/doc/cherokee/cookbook_zend.html
+share/doc/cherokee/dev.html
+share/doc/cherokee/dev_cherokee.conf.html
+share/doc/cherokee/dev_debug.html
+share/doc/cherokee/dev_issues.html
+share/doc/cherokee/dev_qa.html
 share/doc/cherokee/index.html
-share/examples/cherokee/cherokee/advanced.conf
+share/doc/cherokee/media/css/cherokee_doc.css
+share/doc/cherokee/media/images/admin_advanced0.png
+share/doc/cherokee/media/images/admin_advanced1.png
+share/doc/cherokee/media/images/admin_advanced2.png
+share/doc/cherokee/media/images/admin_advanced3.png
+share/doc/cherokee/media/images/admin_advanced4.png
+share/doc/cherokee/media/images/admin_advanced5.png
+share/doc/cherokee/media/images/admin_behavior.png
+share/doc/cherokee/media/images/admin_general.png
+share/doc/cherokee/media/images/admin_general_icons.png
+share/doc/cherokee/media/images/admin_general_mime.png
+share/doc/cherokee/media/images/admin_general_networking.png
+share/doc/cherokee/media/images/admin_general_permissions.png
+share/doc/cherokee/media/images/admin_general_ports.png
+share/doc/cherokee/media/images/admin_handler_admin.png
+share/doc/cherokee/media/images/admin_handler_cgi.png
+share/doc/cherokee/media/images/admin_handler_custom_error.png
+share/doc/cherokee/media/images/admin_handler_dbslayer.png
+share/doc/cherokee/media/images/admin_handler_dirlist.png
+share/doc/cherokee/media/images/admin_handler_dirlist_ex.png
+share/doc/cherokee/media/images/admin_handler_fastcgi1.png
+share/doc/cherokee/media/images/admin_handler_fastcgi2.png
+share/doc/cherokee/media/images/admin_handler_file.png
+share/doc/cherokee/media/images/admin_handler_onlylisting.png
+share/doc/cherokee/media/images/admin_handler_onlylisting_ex.png
+share/doc/cherokee/media/images/admin_handler_proxy.png
+share/doc/cherokee/media/images/admin_handler_secdownload.png
+share/doc/cherokee/media/images/admin_index.png
+share/doc/cherokee/media/images/admin_info_sources.png
+share/doc/cherokee/media/images/admin_launch.png
+share/doc/cherokee/media/images/admin_noconfig.png
+share/doc/cherokee/media/images/admin_notrunning.png
+share/doc/cherokee/media/images/admin_rule_regex.png
+share/doc/cherokee/media/images/admin_validators_authlist.png
+share/doc/cherokee/media/images/admin_validators_ldap.png
+share/doc/cherokee/media/images/admin_validators_pam.png
+share/doc/cherokee/media/images/admin_validators_plain.png
+share/doc/cherokee/media/images/admin_vserver.png
+share/doc/cherokee/media/images/admin_vserver_errors.png
+share/doc/cherokee/media/images/admin_vserver_evhost.png
+share/doc/cherokee/media/images/admin_vserver_loggers.png
+share/doc/cherokee/media/images/admin_vserver_security.png
+share/doc/cherokee/media/images/admin_vserver_wizard.png
+share/doc/cherokee/media/images/admin_vservers_wizard.png
+share/doc/cherokee/media/images/cookbook_alfresco_alfresco.png
+share/doc/cherokee/media/images/cookbook_alfresco_assistant.png
+share/doc/cherokee/media/images/cookbook_alfresco_install.png
+share/doc/cherokee/media/images/cookbook_alfresco_path.png
+share/doc/cherokee/media/images/cookbook_alfresco_share.png
+share/doc/cherokee/media/images/cookbook_alfresco_soffice.png
+share/doc/cherokee/media/images/cookbook_dbslayer1.png
+share/doc/cherokee/media/images/cookbook_dbslayer2.png
+share/doc/cherokee/media/images/cookbook_dbslayer3.png
+share/doc/cherokee/media/images/cookbook_dbslayer4.png
+share/doc/cherokee/media/images/cookbook_django.png
+share/doc/cherokee/media/images/cookbook_django_common.png
+share/doc/cherokee/media/images/cookbook_django_infosources.png
+share/doc/cherokee/media/images/cookbook_drupal.png
+share/doc/cherokee/media/images/cookbook_glassfish.png
+share/doc/cherokee/media/images/cookbook_https_accelerator_handler.png
+share/doc/cherokee/media/images/cookbook_https_accelerator_sources.png
+share/doc/cherokee/media/images/cookbook_joomla.png
+share/doc/cherokee/media/images/cookbook_liferay.png
+share/doc/cherokee/media/images/cookbook_mailman.png
+share/doc/cherokee/media/images/cookbook_maintenance_advanced_domains.png
+share/doc/cherokee/media/images/cookbook_maintenance_advanced_redir.png
+share/doc/cherokee/media/images/cookbook_maintenance_advanced_rules.png
+share/doc/cherokee/media/images/cookbook_maintenance_copy.png
+share/doc/cherokee/media/images/cookbook_maintenance_domain.png
+share/doc/cherokee/media/images/cookbook_maintenance_error.png
+share/doc/cherokee/media/images/cookbook_maintenance_result.png
+share/doc/cherokee/media/images/cookbook_maintenance_rule.png
+share/doc/cherokee/media/images/cookbook_managing_logs_handler.png
+share/doc/cherokee/media/images/cookbook_managing_logs_rules.png
+share/doc/cherokee/media/images/cookbook_managing_logs_security.png
+share/doc/cherokee/media/images/cookbook_mono_demo.png
+share/doc/cherokee/media/images/cookbook_mono_handler.png
+share/doc/cherokee/media/images/cookbook_moodle.png
+share/doc/cherokee/media/images/cookbook_moodle_db.png
+share/doc/cherokee/media/images/cookbook_moodle_document_root.png
+share/doc/cherokee/media/images/cookbook_moodle_modules.png
+share/doc/cherokee/media/images/cookbook_moodle_paths.png
+share/doc/cherokee/media/images/cookbook_mysql_rule.png
+share/doc/cherokee/media/images/cookbook_mysql_validator.png
+share/doc/cherokee/media/images/cookbook_nagios1.png
+share/doc/cherokee/media/images/cookbook_nagios2.png
+share/doc/cherokee/media/images/cookbook_nagios3.png
+share/doc/cherokee/media/images/cookbook_nagios4.png
+share/doc/cherokee/media/images/cookbook_phpbb_1_intro.png
+share/doc/cherokee/media/images/cookbook_phpbb_2_req.png
+share/doc/cherokee/media/images/cookbook_phpbb_3_db.png
+share/doc/cherokee/media/images/cookbook_phpbb_4_admin.png
+share/doc/cherokee/media/images/cookbook_phpbb_5_config.png
+share/doc/cherokee/media/images/cookbook_phpbb_6_advanced.png
+share/doc/cherokee/media/images/cookbook_phpbb_7_create.png
+share/doc/cherokee/media/images/cookbook_phpbb_8_final.png
+share/doc/cherokee/media/images/cookbook_phpbb_adm.png
+share/doc/cherokee/media/images/cookbook_phpbb_adm_warning.png
+share/doc/cherokee/media/images/cookbook_phpbb_rules.png
+share/doc/cherokee/media/images/cookbook_phpbb_running.png
+share/doc/cherokee/media/images/cookbook_phpmyadmin.png
+share/doc/cherokee/media/images/cookbook_phpmyadmin_denied.png
+share/doc/cherokee/media/images/cookbook_redir_behavior.png
+share/doc/cherokee/media/images/cookbook_redir_domains.png
+share/doc/cherokee/media/images/cookbook_redir_handler.png
+share/doc/cherokee/media/images/cookbook_ror.png
+share/doc/cherokee/media/images/cookbook_ror_common.png
+share/doc/cherokee/media/images/cookbook_ror_fcgi.png
+share/doc/cherokee/media/images/cookbook_ror_wizard.png
+share/doc/cherokee/media/images/cookbook_sugarcrm_install0.png
+share/doc/cherokee/media/images/cookbook_sugarcrm_install1.png
+share/doc/cherokee/media/images/cookbook_sugarcrm_running0.png
+share/doc/cherokee/media/images/cookbook_sugarcrm_running1.png
+share/doc/cherokee/media/images/cookbook_symfony.png
+share/doc/cherokee/media/images/cookbook_trac.png
+share/doc/cherokee/media/images/cookbook_trac_info.png
+share/doc/cherokee/media/images/cookbook_trac_rules.png
+share/doc/cherokee/media/images/cookbook_trac_scgi.png
+share/doc/cherokee/media/images/cookbook_trac_static.png
+share/doc/cherokee/media/images/cookbook_wp1.png
+share/doc/cherokee/media/images/cookbook_wp2.png
+share/doc/cherokee/media/images/cookbook_wp3.png
+share/doc/cherokee/media/images/cookbook_wp4.png
+share/doc/cherokee/media/images/cookbook_wp5.png
+share/doc/cherokee/media/images/cookbook_zend1.png
+share/doc/cherokee/media/images/other_graphs_conns.png
+share/doc/cherokee/media/images/other_graphs_logging.png
+share/doc/cherokee/media/images/other_graphs_timeouts.png
+share/doc/cherokee/media/images/other_graphs_traffic.png
+share/doc/cherokee/media/images/proxy_phase1.png
+share/doc/cherokee/media/images/proxy_phase2.png
+share/doc/cherokee/media/images/screencast.png
+share/doc/cherokee/media/images/tracelor.png
+share/doc/cherokee/modules.html
+share/doc/cherokee/modules_balancers.html
+share/doc/cherokee/modules_balancers_ip_hash.html
+share/doc/cherokee/modules_balancers_round_robin.html
+share/doc/cherokee/modules_encoders.html
+share/doc/cherokee/modules_encoders_deflate.html
+share/doc/cherokee/modules_encoders_gzip.html
+share/doc/cherokee/modules_handlers.html
+share/doc/cherokee/modules_handlers_admin.html
+share/doc/cherokee/modules_handlers_cgi.html
+share/doc/cherokee/modules_handlers_common.html
+share/doc/cherokee/modules_handlers_custom_error.html
+share/doc/cherokee/modules_handlers_dbslayer.html
+share/doc/cherokee/modules_handlers_dirlist.html
+share/doc/cherokee/modules_handlers_empty_gif.html
+share/doc/cherokee/modules_handlers_fcgi.html
+share/doc/cherokee/modules_handlers_file.html
+share/doc/cherokee/modules_handlers_postreport.html
+share/doc/cherokee/modules_handlers_proxy.html
+share/doc/cherokee/modules_handlers_redir.html
+share/doc/cherokee/modules_handlers_scgi.html
+share/doc/cherokee/modules_handlers_secdownload.html
+share/doc/cherokee/modules_handlers_server_info.html
+share/doc/cherokee/modules_handlers_ssi.html
+share/doc/cherokee/modules_handlers_streaming.html
+share/doc/cherokee/modules_handlers_uwsgi.html
+share/doc/cherokee/modules_loggers.html
+share/doc/cherokee/modules_loggers_combined.html
+share/doc/cherokee/modules_loggers_custom.html
+share/doc/cherokee/modules_loggers_ncsa.html
+share/doc/cherokee/modules_validators.html
+share/doc/cherokee/modules_validators_authlist.html
+share/doc/cherokee/modules_validators_htdigest.html
+share/doc/cherokee/modules_validators_htpasswd.html
+share/doc/cherokee/modules_validators_ldap.html
+share/doc/cherokee/modules_validators_mysql.html
+share/doc/cherokee/modules_validators_pam.html
+share/doc/cherokee/modules_validators_plain.html
+share/doc/cherokee/other.html
+share/doc/cherokee/other_bundle.html
+share/doc/cherokee/other_bundle_cget.html
+share/doc/cherokee/other_bundle_cherokee-admin.html
+share/doc/cherokee/other_bundle_cherokee-config.html
+share/doc/cherokee/other_bundle_cherokee-tweak.html
+share/doc/cherokee/other_bundle_cherokee-worker.html
+share/doc/cherokee/other_bundle_cherokee.html
+share/doc/cherokee/other_bundle_spawn-fcgi.html
+share/doc/cherokee/other_community.html
+share/doc/cherokee/other_errors.html
+share/doc/cherokee/other_faq.html
+share/doc/cherokee/other_goodies.html
+share/doc/cherokee/other_graphs.html
+share/doc/cherokee/other_signals.html
 share/examples/cherokee/cherokee/cherokee.conf
-share/examples/cherokee/cherokee/icons.conf
-share/examples/cherokee/cherokee/mime.compression.types
-share/examples/cherokee/cherokee/mime.types
-share/examples/cherokee/cherokee/mods-available/admin
-share/examples/cherokee/cherokee/mods-available/ssl
-share/examples/cherokee/cherokee/sites-available/default
-share/examples/cherokee/cherokee/sites-available/example.com
-share/examples/cherokee/cherokee/sites-enabled/default
+share/examples/cherokee/cherokee/cherokee.conf.perf_sample
 share/examples/cherokee/pam.d/cherokee
 share/examples/rc.d/cherokee
-@pkgdir share/examples/cherokee/cherokee/ssl
-@pkgdir share/examples/cherokee/cherokee/mods-enabled
+share/locale/ca/LC_MESSAGES/cherokee.mo
+share/locale/de/LC_MESSAGES/cherokee.mo
+share/locale/en/LC_MESSAGES/cherokee.mo
+share/locale/es/LC_MESSAGES/cherokee.mo
+share/locale/fr/LC_MESSAGES/cherokee.mo
+share/locale/nl/LC_MESSAGES/cherokee.mo
+share/locale/pl/LC_MESSAGES/cherokee.mo
+share/locale/pt_BR/LC_MESSAGES/cherokee.mo
+share/locale/sv_SE/LC_MESSAGES/cherokee.mo
+share/locale/zh_CN/LC_MESSAGES/cherokee.mo
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index a0b0fb06b14..36e62dfd05b 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/09/24 15:40:24 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/07/11 12:18:55 obache Exp $
 
-SHA1 (cherokee-0.5.3.tar.gz) = 97f436a8e5109eb1420b9ead70f281adac535278
-RMD160 (cherokee-0.5.3.tar.gz) = adad3e9c0f3b181dda135c931337b1946770bfce
-Size (cherokee-0.5.3.tar.gz) = 1547870 bytes
-SHA1 (patch-aa) = 541c40b0ffeedab919f345b4439305a3c7c63dc4
-SHA1 (patch-ab) = 35008bfd0a665120a91cf891d0aa3520587b5e75
-SHA1 (patch-ac) = 5523771b9be6fed879634d61c796cad2be15dd9a
-SHA1 (patch-ad) = 2246b5097b90e6db3464d0ab38579467d1980043
+SHA1 (cherokee-1.0.5.tar.gz) = 61902974f839adbb0459c4df709b4d57f08b7ac2
+RMD160 (cherokee-1.0.5.tar.gz) = 00e64a63d861838c6df83b86ce25a518f3331bbb
+Size (cherokee-1.0.5.tar.gz) = 5364282 bytes
diff --git a/www/cherokee/files/cherokee.sh b/www/cherokee/files/cherokee.sh
index 6c02e028fb1..f82ba245fc1 100644
--- a/www/cherokee/files/cherokee.sh
+++ b/www/cherokee/files/cherokee.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cherokee.sh,v 1.2 2006/05/01 10:32:51 jmmv Exp $
+# $NetBSD: cherokee.sh,v 1.3 2010/07/11 12:18:55 obache Exp $
 #
 # PROVIDE: cherokee
 # REQUIRE: DAEMON
@@ -12,7 +12,7 @@ fi
 name="cherokee"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-command_args="-b"
+command_args="-d"
 required_files="@PKG_SYSCONFDIR@/cherokee/${name}.conf"
 
 if [ -f /etc/rc.subr ]; then
diff --git a/www/cherokee/options.mk b/www/cherokee/options.mk
new file mode 100644
index 00000000000..8c9aecc8133
--- /dev/null
+++ b/www/cherokee/options.mk
@@ -0,0 +1,96 @@
+# $NetBSD: options.mk,v 1.1 2010/07/11 12:18:55 obache Exp $
+#
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.cherokee
+PKG_SUPPORTED_OPTIONS+=		geoip ffmpeg inet6 ldap mysql pam ssl threads
+PKG_SUGGESTED_OPTIONS+=		inet6 pam ssl threads
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	geoip ldap mysql pam ssl
+
+###
+### Threading support.
+###
+.if !empty(PKG_OPTIONS:Mthreads)
+.include "../../mk/pthread.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-pthread
+.else
+CONFIGURE_ARGS+=	--disable-pthread
+.endif
+
+
+###
+### IPv6 support.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+###
+### SSL support.
+###
+.if !empty(PKG_OPTIONS:Mssl)
+PLIST.ssl=		yes
+CONFIGURE_ARGS+=	--with-libssl=${SSLBASE}
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-libssl
+.endif
+
+###
+### Allow using LDAP for "basic" authentication.
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
+PLIST.ldap=		yes
+CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
+.else
+CONFIGURE_ARGS+=	--without-ldap
+.endif
+
+###
+### Allow using MySQL for virtual host configuration.
+###
+.if !empty(PKG_OPTIONS:Mmysql)
+.include "../../mk/mysql.buildlink3.mk"
+PLIST.mysql=		yes
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+
+###
+### GeoIP support
+###
+.if !empty(PKG_OPTIONS:Mgeoip)
+PLIST.geoip=		yes
+CONFIGURE_ARGS+=	--with-geoip=${BUILDLINK_PREFIX.GeoIP}
+.include "../../net/GeoIP/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-geoip
+.endif
+
+###
+### FFMpeg support
+###
+.if !empty(PKG_OPTIONS:Mffmpeg)
+PLIST.ffmpeg=		yes
+CONFIGURE_ARGS+=	--with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg}
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-ffmpeg
+.endif
+
+###
+### PAM support
+###
+.if !empty(PKG_OPTIONS:Mpam)
+PLIST.pam=		yes
+.include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-pam
+.else
+CONFIGURE_ARGS+=	--disable-pam
+.endif
diff --git a/www/cherokee/patches/patch-aa b/www/cherokee/patches/patch-aa
deleted file mode 100644
index a84f9c15cf6..00000000000
--- a/www/cherokee/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/01 07:22:29 jmmv Exp $
-
---- Makefile.in.orig	2006-04-22 13:26:05.000000000 +0200
-+++ Makefile.in	2006-04-22 13:26:10.000000000 +0200
-@@ -1047,7 +1047,6 @@
- 	else \
- 		$(INSTALL_DATA) $(top_srcdir)/mods-admin.sample $(DESTDIR)$(cherokeeconfdir)/mods-available/admin; \
- 	fi
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
- 
- uninstall-local: uninstall-local-config
- 	@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \
diff --git a/www/cherokee/patches/patch-ab b/www/cherokee/patches/patch-ab
deleted file mode 100644
index 5dae5489133..00000000000
--- a/www/cherokee/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/06/08 19:48:35 joerg Exp $
-
---- configure.orig	2006-06-08 19:31:44.000000000 +0000
-+++ configure
-@@ -20905,12 +20905,6 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
--if test "$YACC" != "bison -y"; then
--    { { echo "$as_me:$LINENO: error: Bison is required to build Cherokee" >&5
--echo "$as_me: error: Bison is required to build Cherokee" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/www/cherokee/patches/patch-ac b/www/cherokee/patches/patch-ac
deleted file mode 100644
index 897c5b33128..00000000000
--- a/www/cherokee/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/09/24 15:40:24 joerg Exp $
-
---- cherokee/read_config_grammar.y.orig	2006-09-24 17:26:21.000000000 +0000
-+++ cherokee/read_config_grammar.y
-@@ -440,7 +440,7 @@ yyerror (char* msg)
- 
- 
- %token T_QUOTE T_DENY T_THREAD_NUM T_SSL_CERT_KEY_FILE T_SSL_CERT_FILE T_KEEPALIVE_MAX_REQUESTS T_ERROR_HANDLER
--%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER T_GROUP T_POLICY
-+%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER_ T_GROUP T_POLICY
- %token T_SERVER T_USERDIR T_PIDFILE T_LISTEN T_SERVER_TOKENS T_ENCODER T_ALLOW T_DIRECTORYINDEX 
- %token T_ICONS T_AUTH T_NAME T_METHOD T_PASSWDFILE T_SSL_CA_LIST_FILE T_FROM T_SOCKET T_LOG_FLUSH_INTERVAL
- %token T_HEADERFILE T_PANIC_ACTION T_JUST_ABOUT T_LISTEN_QUEUE_SIZE T_SENDFILE T_MINSIZE T_MAXSIZE T_MAX_FDS
-@@ -1059,7 +1059,7 @@ ipv6 : T_IPV6 T_NUMBER
- 	   SRV(server)->ipv6 = $2;
- };
- 
--user1 : T_USER T_ID
-+user1 : T_USER_ T_ID
- {
- 	   struct passwd *pwd;
- 	   
-@@ -1074,7 +1074,7 @@ user1 : T_USER T_ID
- 	   free ($2);
- };
- 
--user2 : T_USER T_NUMBER
-+user2 : T_USER_ T_NUMBER
- {
- 	   SRV(server)->user = $2;
- };
-@@ -1702,7 +1702,7 @@ auth_option : T_NAME T_QSTRING 
- 	   free ($2);
- };
- 
--auth_option : T_USER id_list
-+auth_option : T_USER_ id_list
- {
- 	   linked_list_t *i;
- 
diff --git a/www/cherokee/patches/patch-ad b/www/cherokee/patches/patch-ad
deleted file mode 100644
index cfe05567ab6..00000000000
--- a/www/cherokee/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/09/24 15:40:24 joerg Exp $
-
---- cherokee/read_config_scanner.l.orig	2006-04-01 14:50:24.000000000 +0000
-+++ cherokee/read_config_scanner.l
-@@ -77,7 +77,7 @@ nl              [\n\r]
- "KeepAlive"             { return T_KEEPALIVE; }
- "MaxKeepAliveRequests"  { return T_KEEPALIVE_MAX_REQUESTS; }
- "ErrorHandler"          { return T_ERROR_HANDLER; }
--"User"                  { return T_USER; }
-+"User"                  { return T_USER_; }
- "Group"                 { return T_GROUP; }
- "Server"                { return T_SERVER; }
- "Userdir"               { return T_USERDIR; }