pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cherokee package tracking unreleased 1.2.104



Module Name:	pkgsrc-wip
Committed By:	Gianni D'Aprile <giannidaprile+pkgsrc-wip%gmail.com@localhost>
Pushed By:	giannidaprile
Date:		Sun Dec 27 09:38:44 2015 -0600
Changeset:	dc1d342937893f766c61055ea5bbc22927ce560f

Added Files:
	cherokee/DESCR
	cherokee/MESSAGE
	cherokee/Makefile
	cherokee/PLIST
	cherokee/distinfo
	cherokee/files/cherokee.sh
	cherokee/options.mk
	cherokee/patches/patch-admin_wizards_php.py
	cherokee/patches/patch-autogen.sh
	cherokee/patches/patch-cherokee_main__admin.c
	cherokee/patches/patch-po_admin_generate__POTFILESin.py

Log Message:
cherokee package tracking unreleased 1.2.104

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc1d342937893f766c61055ea5bbc22927ce560f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cherokee/DESCR                                     |    4 +
 cherokee/MESSAGE                                   |   12 +
 cherokee/Makefile                                  |   69 ++
 cherokee/PLIST                                     | 1045 ++++++++++++++++++++
 cherokee/distinfo                                  |    9 +
 cherokee/files/cherokee.sh                         |   24 +
 cherokee/options.mk                                |   97 ++
 cherokee/patches/patch-admin_wizards_php.py        |   14 +
 cherokee/patches/patch-autogen.sh                  |  128 +++
 cherokee/patches/patch-cherokee_main__admin.c      |   13 +
 .../patches/patch-po_admin_generate__POTFILESin.py |   10 +
 11 files changed, 1425 insertions(+)

diffs:
diff --git a/cherokee/DESCR b/cherokee/DESCR
new file mode 100644
index 0000000..ce9b2de
--- /dev/null
+++ b/cherokee/DESCR
@@ -0,0 +1,4 @@
+Cherokee is a very fast, flexible and easy to configure Web Server.  It
+supports the widespread technologies nowadays: FastCGI, SCGI, PHP, CGI,
+TLS and SSL encrypted connections, Virtual hosts, Authentication, on the
+fly encoding, Apache compatible log files, and much more.
diff --git a/cherokee/MESSAGE b/cherokee/MESSAGE
new file mode 100644
index 0000000..e7b5dce
--- /dev/null
+++ b/cherokee/MESSAGE
@@ -0,0 +1,12 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2006/05/01 07:22:29 jmmv Exp $
+
+You need to copy the cherokee PAM configuration file to your PAM
+configuration directory (typically /etc/pam.d).  You can find a sample
+file in:
+
+	${EGDIR}/pam.d/cherokee
+
+It may need to be manually adjusted.
+
+===========================================================================
diff --git a/cherokee/Makefile b/cherokee/Makefile
new file mode 100644
index 0000000..9e47270
--- /dev/null
+++ b/cherokee/Makefile
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile,v 1.15 2010/07/11 12:18:55 obache Exp $
+#
+
+PKGNAME=	cherokee-1.2.104
+GIT_COMMIT=	a917d76ed9b4272478ca973084ec1037a950c443
+DISTNAME=	${PKGNAME}-${GIT_COMMIT}
+CATEGORIES=	www
+MASTER_SITES=	-https://github.com/cherokee/webserver/archive/${GIT_COMMIT}.tar.gz
+
+MAINTAINER=	gianni-pkgsrc-wio%daprile.net@localhost
+HOMEPAGE=	http://www.cherokee-project.com/
+COMMENT=	Flexible and fast web server
+LICENSE=	gnu-gpl-v2
+
+WRKSRC=		${WRKDIR}/webserver-${GIT_COMMIT}
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+# Force using "curl" for fetching the distribution file. It is only available
+# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
+FETCH_USING=    curl
+
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		autoconf automake gmake gm4 msgfmt
+EXTRACT_USING=		bsdtar
+
+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}
+OWN_DIRS=		${PKG_SYSCONFDIR}/cherokee
+OWN_DIRS+=		${VARBASE}/log
+OWN_DIRS+=		${VARBASE}/run
+EGDIR=			${PREFIX}/share/examples/cherokee
+MESSAGE_SUBST+=		EGDIR=${EGDIR}
+CONF_FILES+=		${EGDIR}/cherokee/cherokee.conf \
+			${PKG_SYSCONFDIR}/cherokee/cherokee.conf
+
+RCD_SCRIPTS=		cherokee
+
+PYTHON_VERSIONS_INCOMPATIBLE=   33 34 # not yet ported as of 1.2.101
+
+.include "options.mk"
+
+BUILD_DEFS+=		VARBASE
+
+# this needs to be done before pre-configure
+SUBST_CLASSES+= 	python
+SUBST_STAGE.python= 	post-patch
+SUBST_MESSAGE.python= 	Fixing Python references
+SUBST_FILES.python= 	po/admin/generate_POTFILESin.py
+SUBST_VARS.python= 	PYTHONBIN
+
+REPLACE_PYTHON= 	cherokee/cherokee-admin-launcher \
+			cherokee/cherokee-tweak
+
+# Needs installation:
+TEST_TARGET=		test
+
+# happens before REPLACE_PYTHON
+pre-configure:
+	(cd ${WRKSRC}; ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ./autogen.sh)
+
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cherokee/PLIST b/cherokee/PLIST
new file mode 100644
index 0000000..aee3582
--- /dev/null
+++ b/cherokee/PLIST
@@ -0,0 +1,1045 @@
+@comment $NetBSD$
+bin/CTK-run
+bin/cget
+bin/cherokee-admin-launcher
+bin/cherokee-config
+bin/cherokee-macos-askpass
+bin/cherokee-panic
+bin/cherokee-tweak
+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/logger.h
+include/cherokee/macros.h
+include/cherokee/mime.h
+include/cherokee/mime_entry.h
+include/cherokee/module.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/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_drop.la
+lib/cherokee/libplugin_empty_gif.la
+lib/cherokee/libplugin_error_nn.la
+lib/cherokee/libplugin_error_redir.la
+lib/cherokee/libplugin_evhost.la
+lib/cherokee/libplugin_exists.la
+lib/cherokee/libplugin_extensions.la
+lib/cherokee/libplugin_failover.la
+lib/cherokee/libplugin_fcgi.la
+lib/cherokee/libplugin_file.la
+lib/cherokee/libplugin_from.la
+lib/cherokee/libplugin_fullpath.la
+${PLIST.geoip}lib/cherokee/libplugin_geoip.la
+lib/cherokee/libplugin_gzip.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
+lib/cherokee/libplugin_method.la
+${PLIST.mysql}lib/cherokee/libplugin_mysql.la
+lib/cherokee/libplugin_ncsa.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_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_ssi.la
+${PLIST.ssl}lib/cherokee/libplugin_libssl.la
+${PLIST.ffmpeg}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_v_or.la
+lib/cherokee/libplugin_wildcard.la
+lib/libcherokee-base.la
+lib/libcherokee-client.la
+lib/libcherokee-server.la
+lib/pkgconfig/cherokee.pc
+man/man1/cget.1
+man/man1/cherokee-admin-launcher.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
+sbin/cherokee
+sbin/cherokee-admin
+sbin/cherokee-worker
+share/aclocal/cherokee.m4
+share/cherokee/admin/About.py
+share/cherokee/admin/Auth.py
+share/cherokee/admin/Balancer.py
+share/cherokee/admin/CTK/CTK/AjaxUpload.py
+share/cherokee/admin/CTK/CTK/Box.py
+share/cherokee/admin/CTK/CTK/Button.py
+share/cherokee/admin/CTK/CTK/Carousel.py
+share/cherokee/admin/CTK/CTK/Checkbox.py
+share/cherokee/admin/CTK/CTK/Collapsible.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/Init.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/MailHTML.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/Paginator.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/StarRating.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/i18n.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-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-sel-actions-sel.png
+share/cherokee/admin/CTK/static/images/bg-sel-actions.png
+share/cherokee/admin/CTK/static/images/carousel-left-arrow.png
+share/cherokee/admin/CTK/static/images/carousel-right-arrow.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/forbid.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/jquery.ui.stars.gif
+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-bg_gloss-wave_35_f6a828_500x100.png
+share/cherokee/admin/CTK/static/images/ui-bg_highlight-soft_100_eeeeee_1x100.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/Carousel.js
+share/cherokee/admin/CTK/static/js/Help.js
+share/cherokee/admin/CTK/static/js/StarRating.js
+share/cherokee/admin/CTK/static/js/Submitter.js
+share/cherokee/admin/CTK/static/js/ajaxupload.3.6.js
+share/cherokee/admin/CTK/static/js/common.js
+share/cherokee/admin/CTK/static/js/jquery-1.3.2.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-ui-1.7.2.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/Certs.py
+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/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/SaveButton.py
+share/cherokee/admin/SavingChecks.py
+share/cherokee/admin/SelectionPanel.py
+share/cherokee/admin/SystemInfo.py
+share/cherokee/admin/SystemStats.py
+share/cherokee/admin/SystemStatsWidgets.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/icons/cherokee-admin-launcher-128.png
+share/cherokee/admin/icons/cherokee-admin-launcher-16.png
+share/cherokee/admin/icons/cherokee-admin-launcher-256.png
+share/cherokee/admin/icons/cherokee-admin-launcher-32.png
+share/cherokee/admin/icons/cherokee-admin-launcher-48.png
+share/cherokee/admin/icons/cherokee-admin-launcher-512.png
+share/cherokee/admin/icons/cherokee-admin-launcher-96.png
+share/cherokee/admin/icons/cherokee-admin-launcher.svg
+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/deflate.py
+share/cherokee/admin/plugins/directory.py
+share/cherokee/admin/plugins/dirlist.py
+share/cherokee/admin/plugins/drop.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/failover.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/gzip.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/popen.py
+share/cherokee/admin/server.py
+share/cherokee/admin/static/css/cherokee-admin.css
+share/cherokee/admin/static/help_404.html
+share/cherokee/admin/static/images/advanced.png
+share/cherokee/admin/static/images/backup.png
+share/cherokee/admin/static/images/bg-bar.png
+share/cherokee/admin/static/images/bg-body.png
+share/cherokee/admin/static/images/bg-help-a.png
+share/cherokee/admin/static/images/bg-help-span.png
+share/cherokee/admin/static/images/bg-td-even.png
+share/cherokee/admin/static/images/bg-th.png
+share/cherokee/admin/static/images/cherokee-logo-bar.png
+share/cherokee/admin/static/images/cpu.png
+share/cherokee/admin/static/images/disk.png
+share/cherokee/admin/static/images/favicon.ico
+share/cherokee/admin/static/images/featured-list-bg.png
+share/cherokee/admin/static/images/featured-list-selected.png
+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/ja.png
+share/cherokee/admin/static/images/flags/jm.png
+share/cherokee/admin/static/images/flags/jo.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/host.png
+share/cherokee/admin/static/images/icons.png
+share/cherokee/admin/static/images/information.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/network.png
+share/cherokee/admin/static/images/other/contact-bug.png
+share/cherokee/admin/static/images/other/contact-list.png
+share/cherokee/admin/static/images/other/facebook.png
+share/cherokee/admin/static/images/other/github.png
+share/cherokee/admin/static/images/other/googleplus.png
+share/cherokee/admin/static/images/other/irc.png
+share/cherokee/admin/static/images/other/latest.png
+share/cherokee/admin/static/images/other/left.png
+share/cherokee/admin/static/images/other/linkedin.png
+share/cherokee/admin/static/images/other/proud.png
+share/cherokee/admin/static/images/other/right.png
+share/cherokee/admin/static/images/other/twitter.png
+share/cherokee/admin/static/images/other/web.png
+share/cherokee/admin/static/images/panel-clone.png
+share/cherokee/admin/static/images/panel-new.png
+share/cherokee/admin/static/images/ram.png
+share/cherokee/admin/static/images/remote.png
+share/cherokee/admin/static/images/sidebar-bg.png
+share/cherokee/admin/static/images/sources.png
+share/cherokee/admin/static/images/status.png
+share/cherokee/admin/static/images/uptime.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/flcache.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/ssl_test.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/flcache.py
+share/cherokee/admin/wizards/glassfish.py
+share/cherokee/admin/wizards/hotlinking.py
+share/cherokee/admin/wizards/icons.py
+share/cherokee/admin/wizards/mailman.py
+share/cherokee/admin/wizards/mono.py
+share/cherokee/admin/wizards/php.py
+share/cherokee/admin/wizards/rails.py
+share/cherokee/admin/wizards/redirect.py
+share/cherokee/admin/wizards/rtorrent.py
+share/cherokee/admin/wizards/ssl_test.py
+share/cherokee/admin/wizards/static.py
+share/cherokee/admin/wizards/streaming.py
+share/cherokee/admin/wizards/symfony.py
+share/cherokee/admin/wizards/uwsgi.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/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/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/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/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/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/cherokee/themes/white/entry.html
+share/cherokee/themes/white/footer.html
+share/cherokee/themes/white/header.html
+share/cherokee/themes/white/theme.css
+share/doc/cherokee/basics.html
+share/doc/cherokee/basics_download.html
+share/doc/cherokee/basics_installation.html
+share/doc/cherokee/basics_installation_easy-install.html
+share/doc/cherokee/basics_installation_freebsd.html
+share/doc/cherokee/basics_installation_git.html
+share/doc/cherokee/basics_installation_osx.html
+share/doc/cherokee/basics_installation_unix.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_market.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_walkthrough.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_domain_matching.html
+share/doc/cherokee/cookbook_drupal.html
+share/doc/cherokee/cookbook_embedding_cherokee.html
+share/doc/cherokee/cookbook_glassfish.html
+share/doc/cherokee/cookbook_http_to_https.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_traffic_restriction.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_ctk.html
+share/doc/cherokee/dev_debug.html
+share/doc/cherokee/dev_qa.html
+share/doc/cherokee/dev_quickstart.html
+share/doc/cherokee/distro.html
+share/doc/cherokee/distro_dev_intro.html
+share/doc/cherokee/index.html
+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_index_backup.png
+share/doc/cherokee/media/images/admin_index_restore.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_security_ssl.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_drupal_dir_rules.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_1.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_2.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_3.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_4.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_6.png
+share/doc/cherokee/media/images/cookbook_drupal_dir_rules_7.png
+share/doc/cherokee/media/images/cookbook_drupal_vserver_rules.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_redir_https.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_wp_example1.png
+share/doc/cherokee/media/images/cookbook_wp_example2.png
+share/doc/cherokee/media/images/cookbook_wp_example3.png
+share/doc/cherokee/media/images/cookbook_zend1.png
+share/doc/cherokee/media/images/market_index.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_failover.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_drop.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-launcher.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_community.html
+share/doc/cherokee/other_errors.html
+share/doc/cherokee/other_faq.html
+share/doc/cherokee/other_front_line_cache.html
+share/doc/cherokee/other_goodies.html
+share/doc/cherokee/other_graphs.html
+share/doc/cherokee/other_os_tuning.html
+share/doc/cherokee/other_signals.html
+share/examples/cherokee/cherokee/cherokee.conf
+share/examples/cherokee/cherokee/cherokee.conf.perf_sample
+share/examples/cherokee/pam.d/cherokee
+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/gl/LC_MESSAGES/cherokee.mo
+share/locale/it/LC_MESSAGES/cherokee.mo
+share/locale/ja/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/cherokee/distinfo b/cherokee/distinfo
new file mode 100644
index 0000000..95d1e4a
--- /dev/null
+++ b/cherokee/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+SHA1 (cherokee-1.2.104-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = 3b9ee1f48003ec75b68eeb09cfc0e751f1758658
+RMD160 (cherokee-1.2.104-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = ca1a78b2350814e492469146458f1afdcb3dfe6a
+Size (cherokee-1.2.104-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = 5313230 bytes
+SHA1 (patch-admin_wizards_php.py) = ee0cbb2f728889a57dad3712aa7d355b5c6473a8
+SHA1 (patch-autogen.sh) = 7bb7456f85bd90dd23370e2b58812d27367486b5
+SHA1 (patch-cherokee_main__admin.c) = 18fab221ca914038822457a904af322813d8acd8
+SHA1 (patch-po_admin_generate__POTFILESin.py) = badfafc7f9d002923fb8d5b1fc5d38a2e6a3146d
diff --git a/cherokee/files/cherokee.sh b/cherokee/files/cherokee.sh
new file mode 100644
index 0000000..f82ba24
--- /dev/null
+++ b/cherokee/files/cherokee.sh
@@ -0,0 +1,24 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: cherokee.sh,v 1.3 2010/07/11 12:18:55 obache Exp $
+#
+# PROVIDE: cherokee
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="cherokee"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+command_args="-d"
+required_files="@PKG_SYSCONFDIR@/cherokee/${name}.conf"
+
+if [ -f /etc/rc.subr ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO@ -n " ${name}"
+	${command} ${cherokee_flags} ${command_args}
+fi
diff --git a/cherokee/options.mk b/cherokee/options.mk
new file mode 100644
index 0000000..65079c7
--- /dev/null
+++ b/cherokee/options.mk
@@ -0,0 +1,97 @@
+# $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+=	ffmpeg 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/ffmpeg1/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-ffmpeg
+.endif
+
+###
+### PAM support
+###
+.if !empty(PKG_OPTIONS:Mpam)
+PLIST.pam=		yes
+.include "../../mk/pam.buildlink3.mk"
+INSTALLATION_DIRS+=	${EGDIR}/pam.d
+CONFIGURE_ARGS+=	--enable-pam
+.else
+CONFIGURE_ARGS+=	--disable-pam
+.endif
diff --git a/cherokee/patches/patch-admin_wizards_php.py b/cherokee/patches/patch-admin_wizards_php.py
new file mode 100644
index 0000000..c8f2d0f
--- /dev/null
+++ b/cherokee/patches/patch-admin_wizards_php.py
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- admin/wizards/php.py.orig	2014-10-17 17:20:36.000000000 +0000
++++ admin/wizards/php.py
+@@ -88,7 +88,8 @@ STD_ETC_PATHS = ['/etc/php.ini',
+                  '/opt/local/etc/php*/php.ini',
+                  '/etc/php*/*/php.ini',
+                  '/etc/php*/php.ini',
+-                 '/usr/local/lib*/php.ini']
++                 '/usr/local/lib*/php.ini',
++                 '@PKG_SYSCONFDIR@/php.ini']
+ 
+ CFG_PREFIX    = 'tmp!wizard!php'
+ 
diff --git a/cherokee/patches/patch-autogen.sh b/cherokee/patches/patch-autogen.sh
new file mode 100644
index 0000000..8c7970d
--- /dev/null
+++ b/cherokee/patches/patch-autogen.sh
@@ -0,0 +1,128 @@
+$NetBSD$
+
+--- autogen.sh.orig	2014-10-17 17:20:36.000000000 +0000
++++ autogen.sh
+@@ -29,14 +29,8 @@ test -z "$AUTOMAKE" && AUTOMAKE=automake
+ test -z "$ACLOCAL" && ACLOCAL=aclocal
+ test -z "$AUTOCONF" && AUTOCONF=autoconf
+ test -z "$AUTOHEADER" && AUTOHEADER=autoheader
+-
+-if hash glibtool 2>&-; then
+- test -z "$LIBTOOL" && LIBTOOL=glibtool
+- test -z "$LIBTOOLIZE" && LIBTOOLIZE=glibtoolize
+-else
+- test -z "$LIBTOOL" && LIBTOOL=libtool
+- test -z "$LIBTOOLIZE" && LIBTOOLIZE=libtoolize
+-fi
++test -z "$LIBTOOL" && LIBTOOL=libtool
++test -z "$LIBTOOLIZE" && LIBTOOLIZE=libtoolize
+ 
+ ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
+     echo
+@@ -64,56 +58,56 @@ fi
+     DIE=1
+ }
+ 
+-echo -n "Checking for python2 binary ..."
+-	
+-hash python2 2>&- || {
+-
+-	echo " NOT found."
+-
+-	PYTHON2EXISTS=false
+-	
+-	for python2 in python2.7 python2.6 python2.5 python2.4; do
+-		echo -n "  Checking for $python2 ..."
+-		hash $python2 2>&-
+-		STATUS=$?
+-
+-		if [ $STATUS -eq 0 ]
+-		then
+-			echo " found. :)"
+-			PYTHON2EXISTS=true
+-			PYTHON2BIN=$(which $python2)
+-			
+-			prompt=$(echo -n "Create symlink from $PYTHON2BIN to /usr/local/bin/python2? [Yes|no] ")
+-			
+-			read -p "$prompt" CREATESYMLINK
+-			CREATESYMLINK=${CREATESYMLINK:-no}
+-
+-			if [ "$CREATESYMLINK" = "Yes" ] || [ "$CREATESYMLINK" = "yes" ] || [ "$CREATESYMLINK" = "Y" ] || [ "$CREATESYMLINK" = "y" ]
+-			then
+-				echo "Symlinking $PYTHON2BIN to /usr/local/bin/python2"
+-				ln -s $PYTHON2BIN /usr/local/bin/python2
+-			else
+-				echo ""
+-				echo "Exiting:"
+-				echo "  A python2 symlink to a Python 2.x binary (e.g. $PYTHON2BIN) is required to continue."
+-				echo "  Please use a Python installation script of your choice that will create the required"
+-				echo "  symlink or manually create a symlink in a location accessible from your \$PATH environment"
+-				echo "  variable and then rerun this script."
+-				DIE=1
+-			fi
+-			break
+-		else
+-			echo " NOT found."
+-		fi
+-	done
+-
+-	if [ "$PYTHON2EXISTS" = "false" ]
+-	then
+-		echo "No compatible Python 2.x binary found. Exiting."
+-		DIE=1
+-	fi
+-}
+-echo ""
++#echo -n "Checking for python2 binary ..."
++#	
++#command -v python2 2>&- || {
++#
++#	echo " NOT found."
++#
++#	PYTHON2EXISTS=false
++#	
++#	for python2 in python2.7 python2.6 python2.5 python2.4; do
++#		echo -n "  Checking for $python2 ..."
++#		command -v $python2 2>&-
++#		STATUS=$?
++#
++#		if [ $STATUS -eq 0 ]
++#		then
++#			echo " found. :)"
++#			PYTHON2EXISTS=true
++#			PYTHON2BIN=$(which $python2)
++#			
++#			prompt=$(echo -n "Create symlink from $PYTHON2BIN to /usr/local/bin/python2? [Yes|no] ")
++#			
++#			read -p "$prompt" CREATESYMLINK
++#			CREATESYMLINK=${CREATESYMLINK:-no}
++#
++#			if [ "$CREATESYMLINK" = "Yes" ] || [ "$CREATESYMLINK" = "yes" ] || [ "$CREATESYMLINK" = "Y" ] || [ "$CREATESYMLINK" = "y" ]
++#			then
++#				echo "Symlinking $PYTHON2BIN to /usr/local/bin/python2"
++#				ln -s $PYTHON2BIN /usr/local/bin/python2
++#			else
++#				echo ""
++#				echo "Exiting:"
++#				echo "  A python2 symlink to a Python 2.x binary (e.g. $PYTHON2BIN) is required to continue."
++#				echo "  Please use a Python installation script of your choice that will create the required"
++#				echo "  symlink or manually create a symlink in a location accessible from your \$PATH environment"
++#				echo "  variable and then rerun this script."
++#				DIE=1
++#			fi
++#			break
++#		else
++#			echo " NOT found."
++#		fi
++#	done
++#
++#	if [ "$PYTHON2EXISTS" = "false" ]
++#	then
++#		echo "No compatible Python 2.x binary found. Exiting."
++#		DIE=1
++#	fi
++#}
++#echo ""
+ 
+ if test "$DIE" -eq 1; then
+     exit 1
diff --git a/cherokee/patches/patch-cherokee_main__admin.c b/cherokee/patches/patch-cherokee_main__admin.c
new file mode 100644
index 0000000..5b7aa87
--- /dev/null
+++ b/cherokee/patches/patch-cherokee_main__admin.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- cherokee/main_admin.c.orig	2014-10-17 17:20:36.000000000 +0000
++++ cherokee/main_admin.c
+@@ -556,7 +556,7 @@ check_for_python (void)
+ 	int         re;
+ 	pid_t       pid;
+ 	int         exitcode = -1;
+-	char const *args[]   = {"env", "python2", "-c", "raise SystemExit", NULL};
++	char const *args[]   = {"env", "python", "-c", "raise SystemExit", NULL};
+ 
+ 	pid = fork();
+ 	if (pid == -1) {
diff --git a/cherokee/patches/patch-po_admin_generate__POTFILESin.py b/cherokee/patches/patch-po_admin_generate__POTFILESin.py
new file mode 100644
index 0000000..d4148ed
--- /dev/null
+++ b/cherokee/patches/patch-po_admin_generate__POTFILESin.py
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- po/admin/generate_POTFILESin.py.orig	2014-10-17 17:20:36.000000000 +0000
++++ po/admin/generate_POTFILESin.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!@PYTHONBIN@
+ 
+ # Cherokee POTFILES.in generator
+ #


Home | Main Index | Thread Index | Old Index