Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Aug 2014 16:32:41 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365755 - in head/www/cherokee: . files
Message-ID:  <201408231632.s7NGWf68007961@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sat Aug 23 16:32:40 2014
New Revision: 365755
URL: http://svnweb.freebsd.org/changeset/ports/365755
QAT: https://qat.redports.org/buildarchive/r365755/

Log:
  Update to 1.2.104 and stage.
  
  PR:		192813
  Submitted by:	Ports Fury

Added:
  head/www/cherokee/files/patch-Makefile.am   (contents, props changed)
Deleted:
  head/www/cherokee/files/patch-configure
Modified:
  head/www/cherokee/Makefile
  head/www/cherokee/distinfo
  head/www/cherokee/pkg-descr
  head/www/cherokee/pkg-plist

Modified: head/www/cherokee/Makefile
==============================================================================
--- head/www/cherokee/Makefile	Sat Aug 23 16:29:26 2014	(r365754)
+++ head/www/cherokee/Makefile	Sat Aug 23 16:32:40 2014	(r365755)
@@ -2,207 +2,110 @@
 # $FreeBSD$
 
 PORTNAME=	cherokee
-PORTVERSION=	1.2.101
-PORTREVISION=	6
+PORTVERSION=	1.2.104
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION}
+MASTER_SITES=	GH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and flexible web server
 
-BROKEN=		No public distfiles
+LICENSE=	GPLv2
 
-USES=		gettext gmake pathfix pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME}
+GH_PROJECT=	webserver
+GH_TAGNAME=	${PORTVERSION:S/^/v/}
+GH_COMMIT=	e5583c6
+
+USES=		gettext gmake libtool pathfix pkgconfig python:2,build \
+		shebangfix
+SHEBANG_FILES=	admin/CTK/CTK-run.pre admin/server.py \
+		admin/upgrade_config.py cherokee/cherokee-admin-launcher \
+		cherokee/cherokee-tweak contrib/tracelor.py \
+		doc/build/asciidoc.py doc/cookbook_dbslayer.txt \
+		doc/test_images.py doc/test_links.py \
+		po/admin/generate_POTFILESin.py po/po_stats.py \
+		qa/fcgi.py qa/run-tests.py
+python_CMD=	${PYTHON_CMD}
+USE_RC_SUBR=	cherokee
 USE_OPENSSL=	yes
+USE_AUTOTOOLS=	libtoolize aclocal automake autoheader autoconf
+LIBTOOLIZE_ARGS=--copy --force
+AUTOMAKE_ARGS=	--add-missing --copy --foreign
+CONFIGURE_ARGS=	--disable-silent-rules \
+		--disable-static \
+		--localstatedir=${CHEROKEE_VARDIR} \
+		--without-php \
+		--with-python=${PYTHON_CMD} \
+		--with-wwwroot=${WWWDIR} \
+		--with-wwwuser=${CHEROKEE_USER} \
+		--with-wwwgroup=${CHEROKEE_GROUP}
+MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	cherokee
-SUB_FILES=	pkg-install pkg-message
-GNU_CONFIGURE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
+SUB_FILES=	pkg-install pkg-message
+
 CHEROKEE_VARDIR?=	/var
-CHEROKEE_LOGDIR?=	${CHEROKEE_VARDIR}/log
-CHEROKEE_ACCESSLOG?=	${CHEROKEE_LOGDIR}/cherokee.access
-CHEROKEE_ERRORLOG?=	${CHEROKEE_LOGDIR}/cherokee.error
 
 # Adjust this if you need to run Cherokee as a distinct user:group
-CHEROKEE_USER=	www
-CHEROKEE_GROUP=	www
-
-# This should be ok since 1.0.9, cherokee drops privileges
-# after opening logfiles as a security measure
-CHEROKEE_LOGFILE_FILEMODE=	0600
-CHEROKEE_LOGFILE_USER=	root
-CHEROKEE_LOGFILE_GROUP=	wheel
-
-# Directory where to put RRD files, by default
-CHEROKEE_RRDDIR=/var/lib/cherokee/graphs
+CHEROKEE_USER=		www
+CHEROKEE_GROUP=		www
 
-CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www/cherokee \
-		--localstatedir=${CHEROKEE_VARDIR} \
-		--disable-static
-DEFCONFS=	cherokee.conf
-CONFSUBDIRS=	ssl mods-available mods-enabled sites-available sites-enabled
-MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee-admin.1 cherokee-admin-launcher.1 \
-		cherokee-tweak.1 cherokee-worker.1
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	IPV6 MYSQL LDAP GEOIP FFMPEG NLS INTPCRE ADMIN ADMIN RRDTOOL UWSGI DOCS
-OPTIONS_DEFAULT=IPV6 GEOIP ADMIN
-ADMIN_DESC=	Build the Admin Interface
-INTPCRE_DESC=	Use internal PCRE library
-RRDTOOL_DESC=	Usage graphs support
-UWSGI_DESC=	uWSGI support
+OPTIONS_DEFINE=		ADMIN DOCS FFMPEG GEOIP INTPCRE IPV6 LDAP MYSQL \
+			RRDTOOL UWSGI
+OPTIONS_DEFAULT=	ADMIN GEOIP
+OPTIONS_SUB=		yes
+
+ADMIN_DESC=		Build the Admin Interface
+ADMIN_USES=		python:2,run
+ADMIN_CONFIGURE_OFF=	--disable-admin
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CONFIGURE_ON=	--with-ffmpeg=yes
+FFMPEG_CONFIGURE_OFF=	--with-ffmpeg=no
+GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_CONFIGURE_ON=	--with-geoip=yes
+GEOIP_CONFIGURE_OFF=	--with-geoip=no
+INTPCRE_DESC=		Use internal PCRE library
+INTPCRE_LIB_DEPENDS_OFF=libpcre.so:${PORTSDIR}/devel/pcre
+INTPCRE_CONFIGURE_ON=	--enable-internal-pcre
+IPV6_CONFIGURE_OFF=	--disable-ipv6
+LDAP_USE=		openldap=yes
+LDAP_CONFIGURE_ON=	--with-ldap=yes
+LDAP_CONFIGURE_OFF=	--with-ldap=no
+MYSQL_USE=		mysql=yes
+MYSQL_CONFIGURE_ON=	--with-mysql=yes
+MYSQL_CONFIGURE_OFF=	--with-mysql=no
+RRDTOOL_DESC=		Usage graphs support
+RRDTOOL_RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
+UWSGI_DESC=		uWSGI support
+UWSGI_RUN_DEPENDS=	uwsgi:${PORTSDIR}/www/uwsgi
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MADMIN}
-USE_PYTHON=	yes
-PLIST_SUB+=	ADMIN=""
-.else
-CONFIGURE_ARGS+=--disable-admin
-PLIST_SUB+=	ADMIN="@comment "
-.endif
-
-CONFIGURE_ARGS+=--with-wwwuser=${CHEROKEE_USER} --with-wwwgroup=${CHEROKEE_GROUP}
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql=yes
-PLIST_SUB+=	MYSQL=""
-.else
-CONFIGURE_ARGS+=--with-mysql=no
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-ldap=yes
-PLIST_SUB+=	LDAP=""
-.else
-CONFIGURE_ARGS+=--with-ldap=no
-PLIST_SUB+=	LDAP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
-CONFIGURE_ARGS+=--with-geoip=yes
-PLIST_SUB+=	GEOIP=""
-.else
-CONFIGURE_ARGS+=--with-geoip=no
-PLIST_SUB+=	GEOIP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=--with-ffmpeg=yes
-.else
-CONFIGURE_ARGS+=--with-ffmpeg=no
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MINTPCRE}
-CONFIGURE_ARGS+=--enable-internal-pcre
-.else
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-.endif
-
-.if ${PORT_OPTIONS:MRRDTOOL}
-RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
-.endif
-
-.if ${PORT_OPTIONS:MUWSGI}
-RUN_DEPENDS+=	uwsgi:${PORTSDIR}/www/uwsgi
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
-		${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR} --|g'
-	@${REINPLACE_CMD} -e '/cherokee_replace.*%sysconfdir%/d;/^SUBDIRS/s|doc ||;\
-		/^install-data-am/s|install-data-local|install-data-local-config|;\
-		/^SUBDIRS/s|windows||'\
-		${WRKSRC}/Makefile.in
-	@for i in ${BUILD_WRKSRC}/*.sample.pre;do ${SED} -e \
-		's:%wwwroot%:${PREFIX}/www/cherokee:g; \
-		s:%prefix%:${PREFIX}:g; \
-		s:%localstatedir%:/var:g' \
-		$$i > $${i%.pre};done
-
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/admin/CTK/CTK-run.pre
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/cherokee/cherokee-admin-launcher
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/admin/server.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/admin/upgrade_config.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/cherokee/cherokee-tweak
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/doc/cookbook_dbslayer.html
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/doc/test_images.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/contrib/tracelor.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/po/po_stats.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/qa/fcgi.py
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
-		${WRKSRC}/qa/run-tests.py
+pre-configure:
+	@(cd ${WRKSRC}/po/admin && ${PYTHON_CMD} generate_POTFILESin.py \
+		> POTFILES.in)
 
 post-install:
-	@${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|}
-	@for i in ${DEFCONFS};do\
-		${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done
-	@${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample
-	@:>${PREFIX}/etc/cherokee/mods-enabled/.empty
-	@:>${PREFIX}/etc/cherokee/sites-available/.empty
-	@:>${PREFIX}/etc/cherokee/sites-enabled/.empty
-	@:>${PREFIX}/etc/cherokee/ssl/.empty
-	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\
-		if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done
-	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\
-		if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done
-
-.if ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
-.endif
-
+.for i in mods-available mods-enabled sites-available sites-enabled ssl
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/${i}
+	@${ECHO_CMD} -n > ${STAGEDIR}${ETCDIR}/${i}/.empty
+.endfor
+	(cd ${WRKSRC} && ${INSTALL_DATA} cherokee.conf.sample \
+		${STAGEDIR}${ETCDIR}/cherokee.conf.sample)
+	(cd ${WRKSRC} && ${INSTALL_DATA} performance.conf.sample \
+		${STAGEDIR}${ETCDIR}/cherokee.conf.perf_sample)
 .if ${PORT_OPTIONS:MADMIN}
-	@cd ${DATADIR}/admin && ${FIND} . -name "*.py" |\
-	${XARGS} ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py
+	(cd ${WRKSRC} && ${INSTALL_DATA} cherokee.conf.sample \
+		${STAGEDIR}${DATADIR}/admin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} performance.conf.sample \
+		${STAGEDIR}${DATADIR}/admin)
+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
+		-d ${DATADIR}/admin -f ${DATADIR_REL}/admin)
 .endif
 
-	@${SETENV} \
-	     CHEROKEE_LOGFILE_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE} \
-	     CHEROKEE_LOGFILE_USER=${CHEROKEE_LOGFILE_USER} \
-	     CHEROKEE_LOGFILE_GROUP=${CHEROKEE_LOGFILE_GROUP} \
-	     CHEROKEE_ERRORLOG=${CHEROKEE_ERRORLOG} \
-	     CHEROKEE_ACCESSLOG=${CHEROKEE_ACCESSLOG} \
-	     CHEROKEE_WITH_RRDTOOL=${WITH_RRDTOOL} \
-	     CHEROKEE_RRDDIR=${CHEROKEE_RRDDIR} \
-	     CHEROKEE_RRDDIR_USER=${CHEROKEE_USER} \
-	     CHEROKEE_RRDDIR_GROUP=${CHEROKEE_GROUP} \
-	     ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-	@${ECHO_MSG} "==============================================================="
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG} "==============================================================="
-
 .include <bsd.port.mk>

Modified: head/www/cherokee/distinfo
==============================================================================
--- head/www/cherokee/distinfo	Sat Aug 23 16:29:26 2014	(r365754)
+++ head/www/cherokee/distinfo	Sat Aug 23 16:32:40 2014	(r365755)
@@ -1,2 +1,2 @@
-SHA256 (cherokee-1.2.101.tar.gz) = ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
-SIZE (cherokee-1.2.101.tar.gz) = 6320209
+SHA256 (cherokee-1.2.104.tar.gz) = f43c2db12dc1b7db1ce4aaa29855657d7f6fad6008d498f3728168e5c130e439
+SIZE (cherokee-1.2.104.tar.gz) = 5313696

Added: head/www/cherokee/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/cherokee/files/patch-Makefile.am	Sat Aug 23 16:32:40 2014	(r365755)
@@ -0,0 +1,57 @@
+--- Makefile.am.orig
++++ Makefile.am
+@@ -105,52 +105,16 @@
+ 		); \
+ 	fi
+ 
+-install-data-local-config:
++install-data-local: $(CONFS)
+ 	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
+ 	$(INSTALL_DATA) $(top_builddir)/config.h $(DESTDIR)$(pkgincludedir)/cherokee-config.h
+ 
+-uninstall-local-config:
++uninstall-local:
+ 	@if test -f $(DESTDIR)$(pkgincludedir)/cherokee-config.h; then \
+ 		echo "rm -f $(DESTDIR)$(pkgincludedir)/cherokee-config.h"; \
+ 		$(RM) -f $(DESTDIR)$(pkgincludedir)/cherokee-config.h; \
+ 	fi
+ 
+-install-data-local: $(CONFS) install-data-local-config
+-	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)
+-	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
+-	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+-	@$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/cherokee/graphs/images
+-	@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)
+-	@$(mkinstalldirs) $(DESTDIR)$(cherokeeadmindir)
+-	@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \
+-		echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \
+-	else \
+-		$(INSTALL_DATA) $(top_builddir)/cherokee.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf; \
+-	fi
+-	$(INSTALL_DATA) $(top_builddir)/cherokee.conf.sample $(DESTDIR)$(cherokeeadmindir)/cherokee.conf.sample
+-	$(INSTALL_DATA) $(top_builddir)/performance.conf.sample $(DESTDIR)$(cherokeeadmindir)/performance.conf.sample
+-	@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample ; then \
+-		echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample"; \
+-	else \
+-		$(INSTALL_DATA) $(top_builddir)/performance.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample; \
+-	fi
+-	@if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
+-		$(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
+-	fi
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
+-
+-uninstall-local: uninstall-local-config
+-#	@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \
+-#		echo "rm -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \
+-#		$(RM) -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf; \
+-#	fi
+-	@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample ; then \
+-		echo "rm -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample"; \
+-		$(RM) -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample; \
+-	fi
+-	$(RM) -f $(DESTDIR)$(cherokeeadmindir)/cherokee.conf.sample
+-	$(RM) -f $(DESTDIR)$(cherokeeadmindir)/performance.conf.sample
+-
+ test:
+ 	$(MAKE) -C doc test
+ 	$(MAKE) -C admin test

Modified: head/www/cherokee/pkg-descr
==============================================================================
--- head/www/cherokee/pkg-descr	Sat Aug 23 16:29:26 2014	(r365754)
+++ head/www/cherokee/pkg-descr	Sat Aug 23 16:32:40 2014	(r365755)
@@ -1,7 +1,8 @@
-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, Load
-balancing, Apache compatible log files, and much more. A user friendly interface
-called cherokee-admin is provided for a no-hassle configuration of the server.
+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, Load balancing, Apache compatible log files, and much
+more. A user friendly interface called cherokee-admin is provided for a
+no-hassle configuration of the server.
 
 WWW: http://www.cherokee-project.com/

Modified: head/www/cherokee/pkg-plist
==============================================================================
--- head/www/cherokee/pkg-plist	Sat Aug 23 16:29:26 2014	(r365754)
+++ head/www/cherokee/pkg-plist	Sat Aug 23 16:32:40 2014	(r365755)
@@ -1,18 +1,17 @@
 bin/CTK-run
 bin/cget
+bin/cherokee-admin-launcher
 bin/cherokee-config
+bin/cherokee-macos-askpass
 bin/cherokee-panic
 bin/cherokee-tweak
-bin/cherokee-macos-askpass
-bin/cherokee-admin-launcher
-@unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done
-@unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done
-etc/cherokee/cherokee.conf.default
-etc/cherokee/cherokee.conf.perf_sample
-etc/cherokee/mods-enabled/.empty
-etc/cherokee/sites-available/.empty
-etc/cherokee/sites-enabled/.empty
-etc/cherokee/ssl/.empty
+@sample %%ETCDIR%%/cherokee.conf.sample
+%%ETCDIR%%/cherokee.conf.perf_sample
+%%ETCDIR%%/mods-available/.empty
+%%ETCDIR%%/mods-enabled/.empty
+%%ETCDIR%%/sites-available/.empty
+%%ETCDIR%%/sites-enabled/.empty
+%%ETCDIR%%/ssl/.empty
 include/cherokee/avl.h
 include/cherokee/avl_r.h
 include/cherokee/buffer.h
@@ -53,151 +52,89 @@ include/cherokee/url.h
 include/cherokee/util.h
 include/cherokee/validator.h
 include/cherokee/version.h
-lib/cherokee/libplugin_admin.la
 lib/cherokee/libplugin_admin.so
-lib/cherokee/libplugin_and.la
 lib/cherokee/libplugin_and.so
-lib/cherokee/libplugin_authlist.la
 lib/cherokee/libplugin_authlist.so
-lib/cherokee/libplugin_bind.la
 lib/cherokee/libplugin_bind.so
-lib/cherokee/libplugin_cgi.la
 lib/cherokee/libplugin_cgi.so
-lib/cherokee/libplugin_combined.la
 lib/cherokee/libplugin_combined.so
-lib/cherokee/libplugin_common.la
 lib/cherokee/libplugin_common.so
-lib/cherokee/libplugin_custom.la
 lib/cherokee/libplugin_custom.so
-lib/cherokee/libplugin_custom_error.la
 lib/cherokee/libplugin_custom_error.so
-%%MYSQL%%lib/cherokee/libplugin_dbslayer.la
 %%MYSQL%%lib/cherokee/libplugin_dbslayer.so
-lib/cherokee/libplugin_deflate.la
 lib/cherokee/libplugin_deflate.so
-lib/cherokee/libplugin_directory.la
 lib/cherokee/libplugin_directory.so
-lib/cherokee/libplugin_dirlist.la
 lib/cherokee/libplugin_dirlist.so
-lib/cherokee/libplugin_drop.la
 lib/cherokee/libplugin_drop.so
-lib/cherokee/libplugin_empty_gif.la
 lib/cherokee/libplugin_empty_gif.so
-lib/cherokee/libplugin_error_nn.la
 lib/cherokee/libplugin_error_nn.so
-lib/cherokee/libplugin_error_redir.la
 lib/cherokee/libplugin_error_redir.so
-lib/cherokee/libplugin_evhost.la
 lib/cherokee/libplugin_evhost.so
-lib/cherokee/libplugin_exists.la
 lib/cherokee/libplugin_exists.so
-lib/cherokee/libplugin_extensions.la
 lib/cherokee/libplugin_extensions.so
-lib/cherokee/libplugin_failover.la
 lib/cherokee/libplugin_failover.so
-lib/cherokee/libplugin_fcgi.la
 lib/cherokee/libplugin_fcgi.so
-lib/cherokee/libplugin_file.la
 lib/cherokee/libplugin_file.so
-lib/cherokee/libplugin_from.la
 lib/cherokee/libplugin_from.so
-lib/cherokee/libplugin_fullpath.la
 lib/cherokee/libplugin_fullpath.so
-%%GEOIP%%lib/cherokee/libplugin_geoip.la
 %%GEOIP%%lib/cherokee/libplugin_geoip.so
-lib/cherokee/libplugin_gzip.la
 lib/cherokee/libplugin_gzip.so
-lib/cherokee/libplugin_header.la
 lib/cherokee/libplugin_header.so
-lib/cherokee/libplugin_htdigest.la
 lib/cherokee/libplugin_htdigest.so
-lib/cherokee/libplugin_htpasswd.la
 lib/cherokee/libplugin_htpasswd.so
-%%LDAP%%lib/cherokee/libplugin_ldap.la
 %%LDAP%%lib/cherokee/libplugin_ldap.so
-lib/cherokee/libplugin_ip_hash.la
 lib/cherokee/libplugin_ip_hash.so
-lib/cherokee/libplugin_libssl.la
 lib/cherokee/libplugin_libssl.so
-lib/cherokee/libplugin_method.la
 lib/cherokee/libplugin_method.so
-%%MYSQL%%lib/cherokee/libplugin_mysql.la
 %%MYSQL%%lib/cherokee/libplugin_mysql.so
-lib/cherokee/libplugin_ncsa.la
 lib/cherokee/libplugin_ncsa.so
-lib/cherokee/libplugin_not.la
 lib/cherokee/libplugin_not.so
-lib/cherokee/libplugin_or.la
 lib/cherokee/libplugin_or.so
-lib/cherokee/libplugin_pam.la
 lib/cherokee/libplugin_pam.so
-lib/cherokee/libplugin_plain.la
 lib/cherokee/libplugin_plain.so
-lib/cherokee/libplugin_post_report.la
 lib/cherokee/libplugin_post_report.so
-lib/cherokee/libplugin_post_track.la
 lib/cherokee/libplugin_post_track.so
-lib/cherokee/libplugin_proxy.la
 lib/cherokee/libplugin_proxy.so
-lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
-lib/cherokee/libplugin_rehost.la
 lib/cherokee/libplugin_rehost.so
-lib/cherokee/libplugin_render_rrd.la
 lib/cherokee/libplugin_render_rrd.so
-lib/cherokee/libplugin_request.la
 lib/cherokee/libplugin_request.so
-lib/cherokee/libplugin_round_robin.la
 lib/cherokee/libplugin_round_robin.so
-lib/cherokee/libplugin_rrd.la
 lib/cherokee/libplugin_rrd.so
-lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_scgi.so
-lib/cherokee/libplugin_secdownload.la
 lib/cherokee/libplugin_secdownload.so
-lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_server_info.so
-lib/cherokee/libplugin_ssi.la
 lib/cherokee/libplugin_ssi.so
-lib/cherokee/libplugin_target_ip.la
+%%FFMPEG%%lib/cherokee/libplugin_streaming.so
 lib/cherokee/libplugin_target_ip.so
-lib/cherokee/libplugin_tls.la
 lib/cherokee/libplugin_tls.so
-lib/cherokee/libplugin_url_arg.la
 lib/cherokee/libplugin_url_arg.so
-lib/cherokee/libplugin_uwsgi.la
 lib/cherokee/libplugin_uwsgi.so
-lib/cherokee/libplugin_v_or.la
 lib/cherokee/libplugin_v_or.so
-lib/cherokee/libplugin_wildcard.la
 lib/cherokee/libplugin_wildcard.so
-lib/libcherokee-base.la
 lib/libcherokee-base.so
 lib/libcherokee-base.so.0
-lib/libcherokee-client.la
+lib/libcherokee-base.so.0.0.1
 lib/libcherokee-client.so
 lib/libcherokee-client.so.0
-lib/libcherokee-server.la
+lib/libcherokee-client.so.0.0.1
 lib/libcherokee-server.so
 lib/libcherokee-server.so.0
+lib/libcherokee-server.so.0.0.1
 libdata/pkgconfig/cherokee.pc
+man/man1/cget.1.gz
+man/man1/cherokee.1.gz
+man/man1/cherokee-admin.1.gz
+man/man1/cherokee-admin-launcher.1.gz
+man/man1/cherokee-config.1.gz
+man/man1/cherokee-tweak.1.gz
+man/man1/cherokee-worker.1.gz
 sbin/cherokee
 sbin/cherokee-admin
 sbin/cherokee-worker
 share/aclocal/cherokee.m4
-%%NLS%%share/locale/ca/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/de/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/en/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/es/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/it/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/sv_SE/LC_MESSAGES/cherokee.mo
-%%NLS%%share/locale/jp/LC_MESSAGES/cherokee.mo
+%%ADMIN%%%%DATADIR%%/admin/About.py
+%%ADMIN%%%%DATADIR%%/admin/About.pyc
 %%ADMIN%%%%DATADIR%%/admin/Auth.py
 %%ADMIN%%%%DATADIR%%/admin/Auth.pyc
 %%ADMIN%%%%DATADIR%%/admin/Balancer.py
@@ -208,8 +145,12 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Box.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Button.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Button.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Checkbox.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Checkbox.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Combobox.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Combobox.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Config.py
@@ -234,6 +175,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Image.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Indenter.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Indenter.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/JS.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/JS.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Link.py
@@ -248,6 +191,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Page.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/PageCleaner.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/PageCleaner.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Plugin.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Plugin.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Post.py
@@ -268,6 +213,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Server.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/SortableList.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/SortableList.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Submitter.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Submitter.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Tab.py
@@ -302,70 +249,6 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/pyscgi.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/__init__.py
-%%ADMIN%%%%DATADIR%%/admin/market/Install.py
-%%ADMIN%%%%DATADIR%%/admin/market/InstallUtil.py
-%%ADMIN%%%%DATADIR%%/admin/market/Install_Log.py
-%%ADMIN%%%%DATADIR%%/admin/market/Menu.py
-%%ADMIN%%%%DATADIR%%/admin/market/PageApp.py
-%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.py
-%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.py
-%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.py
-%%ADMIN%%%%DATADIR%%/admin/market/Report.py
-%%ADMIN%%%%DATADIR%%/admin/market/Review.py
-%%ADMIN%%%%DATADIR%%/admin/market/Library.py
-%%ADMIN%%%%DATADIR%%/admin/market/Util.py
-%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.py
-%%ADMIN%%%%DATADIR%%/admin/market/ows_consts.py
-%%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.py
-%%ADMIN%%%%DATADIR%%/admin/market/__init__.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Install.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/InstallUtil.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Install_Log.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Menu.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/PageApp.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Review.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Report.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Library.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Util.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/ows_consts.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.pyc
-%%ADMIN%%%%DATADIR%%/admin/market/Distro.py
-%%ADMIN%%%%DATADIR%%/admin/market/Distro.pyc
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.py
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.py
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.py
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.py
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.py
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.pyc
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.pyc
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.pyc
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.pyc
-%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.pyc
-%%ADMIN%%%%DATADIR%%/admin/About.py
-%%ADMIN%%%%DATADIR%%/admin/OWS_Backup.py
-%%ADMIN%%%%DATADIR%%/admin/OWS_Cherokee_Info.py
-%%ADMIN%%%%DATADIR%%/admin/OWS_Login.py
-%%ADMIN%%%%DATADIR%%/admin/OWS_Market_Info.py
-%%ADMIN%%%%DATADIR%%/admin/SaveButton.py
-%%ADMIN%%%%DATADIR%%/admin/SystemInfo.py
-%%ADMIN%%%%DATADIR%%/admin/SystemStats.py
-%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.py
-%%ADMIN%%%%DATADIR%%/admin/popen.py
-%%ADMIN%%%%DATADIR%%/admin/About.pyc
-%%ADMIN%%%%DATADIR%%/admin/OWS_Backup.pyc
-%%ADMIN%%%%DATADIR%%/admin/OWS_Cherokee_Info.pyc
-%%ADMIN%%%%DATADIR%%/admin/OWS_Login.pyc
-%%ADMIN%%%%DATADIR%%/admin/OWS_Market_Info.pyc
-%%ADMIN%%%%DATADIR%%/admin/SaveButton.pyc
-%%ADMIN%%%%DATADIR%%/admin/SystemInfo.pyc
-%%ADMIN%%%%DATADIR%%/admin/SystemStats.pyc
-%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.pyc
-%%ADMIN%%%%DATADIR%%/admin/popen.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/CTK.css
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/datepicker.css
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery-ui-1.7.2.custom.css
@@ -378,6 +261,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-filter.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions-sel.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-left-arrow.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-right-arrow.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del-hover.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-error.png
@@ -386,6 +271,7 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/forbid.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ibutton-slider-default.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/input-bg.png
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/jquery.ui.stars.gif
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/loader.gif
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/loading.gif
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/off.png
@@ -402,26 +288,27 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ui-icons_888888_256x240.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/uploadify.cancel.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/ajaxupload.3.6.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Carousel.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Help.js
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/StarRating.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Submitter.js
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/ajaxupload.3.6.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/common.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-1.3.2.js
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-ui-1.7.2.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-1.3.2.min.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-ui-1.7.2.custom.min.js
+%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery-ui-1.7.2.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery.cookie.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery.form-defaults.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery.ibutton.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery.tablednd_0_5.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/jquery.uploadProgress.js
+%%ADMIN%%%%DATADIR%%/admin/Certs.py
+%%ADMIN%%%%DATADIR%%/admin/Certs.pyc
 %%ADMIN%%%%DATADIR%%/admin/CgiBase.py
 %%ADMIN%%%%DATADIR%%/admin/CgiBase.pyc
 %%ADMIN%%%%DATADIR%%/admin/Cherokee.py
 %%ADMIN%%%%DATADIR%%/admin/Cherokee.pyc
-%%ADMIN%%%%DATADIR%%/admin/Certs.py
-%%ADMIN%%%%DATADIR%%/admin/Certs.pyc
 %%ADMIN%%%%DATADIR%%/admin/Flags.py
 %%ADMIN%%%%DATADIR%%/admin/Flags.pyc
 %%ADMIN%%%%DATADIR%%/admin/Graph.py
@@ -466,14 +353,23 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/Rule.pyc
 %%ADMIN%%%%DATADIR%%/admin/RuleSimple.py
 %%ADMIN%%%%DATADIR%%/admin/RuleSimple.pyc
+%%ADMIN%%%%DATADIR%%/admin/SaveButton.py
+%%ADMIN%%%%DATADIR%%/admin/SaveButton.pyc
 %%ADMIN%%%%DATADIR%%/admin/SavingChecks.py
 %%ADMIN%%%%DATADIR%%/admin/SavingChecks.pyc
 %%ADMIN%%%%DATADIR%%/admin/SelectionPanel.py
 %%ADMIN%%%%DATADIR%%/admin/SelectionPanel.pyc
+%%ADMIN%%%%DATADIR%%/admin/SystemInfo.py
+%%ADMIN%%%%DATADIR%%/admin/SystemInfo.pyc
+%%ADMIN%%%%DATADIR%%/admin/SystemStats.py
+%%ADMIN%%%%DATADIR%%/admin/SystemStats.pyc
+%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.py
+%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.pyc
 %%ADMIN%%%%DATADIR%%/admin/Wizard.py
 %%ADMIN%%%%DATADIR%%/admin/Wizard.pyc
 %%ADMIN%%%%DATADIR%%/admin/XMLServerDigest.py
 %%ADMIN%%%%DATADIR%%/admin/XMLServerDigest.pyc
+%%ADMIN%%%%DATADIR%%/admin/cherokee.conf.sample
 %%ADMIN%%%%DATADIR%%/admin/config_version.py
 %%ADMIN%%%%DATADIR%%/admin/config_version.pyc
 %%ADMIN%%%%DATADIR%%/admin/configured.py
@@ -482,14 +378,15 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/consts.pyc
 %%ADMIN%%%%DATADIR%%/admin/exception.html
 %%ADMIN%%%%DATADIR%%/admin/help.html
+%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-128.png
 %%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-16.png
+%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-256.png
 %%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-32.png
 %%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-48.png
-%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-96.png
-%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-128.png
-%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-256.png
 %%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-512.png
+%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-96.png
 %%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher.svg
+%%ADMIN%%%%DATADIR%%/admin/performance.conf.sample
 %%ADMIN%%%%DATADIR%%/admin/plugins/admin.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/admin.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/authlist.py
@@ -504,6 +401,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/plugins/custom_error.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/dbslayer.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/dbslayer.pyc
+%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.py
+%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/directory.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/directory.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.py
@@ -522,6 +421,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/plugins/exists.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/extensions.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/extensions.pyc
+%%ADMIN%%%%DATADIR%%/admin/plugins/failover.py
+%%ADMIN%%%%DATADIR%%/admin/plugins/failover.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/fcgi.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/fcgi.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/file.py
@@ -532,6 +433,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/plugins/fullpath.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/geoip.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/geoip.pyc
+%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.py
+%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/header.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/header.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/htdigest.py
@@ -586,50 +489,26 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/plugins/uwsgi.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.pyc
-%%ADMIN%%%%DATADIR%%/admin/plugins/failover.py
-%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.py
-%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.py
-%%ADMIN%%%%DATADIR%%/admin/plugins/failover.pyc
-%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.pyc
-%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.pyc
+%%ADMIN%%%%DATADIR%%/admin/popen.py
+%%ADMIN%%%%DATADIR%%/admin/popen.pyc
 %%ADMIN%%%%DATADIR%%/admin/server.py
 %%ADMIN%%%%DATADIR%%/admin/server.pyc
 %%ADMIN%%%%DATADIR%%/admin/static/css/cherokee-admin.css
+%%ADMIN%%%%DATADIR%%/admin/static/help_404.html
 %%ADMIN%%%%DATADIR%%/admin/static/images/advanced.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/bg-bar.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/cherokee-logo-bar.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/jquery.ui.stars.gif
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-left-arrow.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-right-arrow.png
-%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/StarRating.js
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/latest.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/linkedin.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/irc.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/left.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/right.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/web.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/backup.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-bar.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/bg-body.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/bg-help-a.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/bg-help-span.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/bg-th.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/bg-td-even.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/bg-th.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/cherokee-logo-bar.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/cpu.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/disk.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/favicon.ico
 %%ADMIN%%%%DATADIR%%/admin/static/images/featured-list-bg.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/featured-list-selected.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/host.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/information.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/market.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/network.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/panel-clone.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/panel-new.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/ram.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/remote.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-bg.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-market.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/uptime.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/favicon.ico
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/ad.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/ae.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/af.png
@@ -738,9 +617,9 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/ir.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/is.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/it.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/flags/ja.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/jm.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/jo.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/flags/jp.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/ke.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/kg.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/kh.png
@@ -878,18 +757,34 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/flags/zw.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/general.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/home.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/host.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/icons.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/information.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/mime.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/nav-selected.gif
 %%ADMIN%%%%DATADIR%%/admin/static/images/nav-sep.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/network.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-bug.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-list.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/facebook.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/other/octality-logo.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/github.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/googleplus.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/irc.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/latest.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/left.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/linkedin.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/proud.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/right.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/other/twitter.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/other/web.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/panel-clone.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/panel-new.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/ram.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/remote.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-bg.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/sources.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/status.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/uptime.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/vservers.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/alfresco.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/aspnet.png
@@ -898,6 +793,7 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/dbslayer.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/django.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/drupal.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/flcache.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/gallery.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/glassfish.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/hotlinking.png
@@ -916,6 +812,7 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/rails.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/redirect.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/rtorrent.png
+%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/ssl_test.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/static.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/streaming.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/sugar.png
@@ -924,10 +821,7 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/uwsgi.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/wordpress.png
 %%ADMIN%%%%DATADIR%%/admin/static/images/wizards/zend.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/flcache.png
-%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/ssl_test.png
 %%ADMIN%%%%DATADIR%%/admin/static/js/SelectionPanel.js
-%%ADMIN%%%%DATADIR%%/admin/static/help_404.html
 %%ADMIN%%%%DATADIR%%/admin/theme.html
 %%ADMIN%%%%DATADIR%%/admin/upgrade_config.py
 %%ADMIN%%%%DATADIR%%/admin/upgrade_config.pyc
@@ -945,6 +839,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/wizards/concrete5.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/django.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/django.pyc
+%%ADMIN%%%%DATADIR%%/admin/wizards/flcache.py
+%%ADMIN%%%%DATADIR%%/admin/wizards/flcache.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.py
@@ -963,6 +859,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/wizards/redirect.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/rtorrent.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/rtorrent.pyc
+%%ADMIN%%%%DATADIR%%/admin/wizards/ssl_test.py
+%%ADMIN%%%%DATADIR%%/admin/wizards/ssl_test.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/static.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/static.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/streaming.py
@@ -973,17 +871,13 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/zend.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/zend.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/flcache.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/ssl_test.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/flcache.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/ssl_test.pyc
 %%DATADIR%%/deps/cgi.deps
 %%DATADIR%%/deps/combined.deps
 %%DATADIR%%/deps/common.deps
 %%DATADIR%%/deps/error_redir.deps
 %%DATADIR%%/deps/fcgi.deps
-%%DATADIR%%/deps/render_rrd.deps
 %%DATADIR%%/deps/post_report.deps
+%%DATADIR%%/deps/render_rrd.deps
 %%DATADIR%%/deps/scgi.deps
 %%DATADIR%%/deps/secdownload.deps
 %%DATADIR%%/deps/streaming.deps
@@ -1029,21 +923,315 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/themes/plain/footer.html
 %%DATADIR%%/themes/plain/header.html
 %%DATADIR%%/themes/plain/theme.css
-%%DATADIR%%/themes/white/header.html
-%%DATADIR%%/themes/white/footer.html
 %%DATADIR%%/themes/white/entry.html
+%%DATADIR%%/themes/white/footer.html
+%%DATADIR%%/themes/white/header.html
 %%DATADIR%%/themes/white/theme.css
-www/cherokee/images/cherokee-logo.png
-www/cherokee/images/default-bg.png
-www/cherokee/images/favicon.ico
-www/cherokee/images/powered_by_cherokee.png
-www/cherokee/index.html
-@dirrm www/cherokee/images
-@dirrm www/cherokee
-%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv_SE
-%%NLS%%@dirrmtry share/locale/jp/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/jp
+%%PORTDOCS%%%%DOCSDIR%%/basics.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_download.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation_easy-install.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation_freebsd.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation_git.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation_osx.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation_unix.html
+%%PORTDOCS%%%%DOCSDIR%%/basics_installation_windows.html

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408231632.s7NGWf68007961>