Attachment #114388 for bug #156045

View | Details | Raw Unified | Return to bug 156045
Collapse All | Expand All




#

PORTNAME=	cherokee
PORTVERSION=	1.2.2
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	http://www.cherokee-project.com/download/1.2/${PORTVERSION}/ \
		http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
		http://mirror.its.uidaho.edu/pub/cherokee/1.2/\${PORTVERSION}/ \
		http://www.gtlib.gatech.edu/pub/cherokee/1.2/\${PORTVERSION}/ \
		ftp://mirrors.secution.com/cherokee/1.2/${PORTVERSION}/ \
		ftp://ftp.easynet.be/cherokee/1.2/${PORTVERSION}/ \
		http://ftp.heanet.ie/mirrors/cherokee/1.2/${PORTVERSION}/ \
		http://www.ftp.ne.jp/infosystems/cherokee/1.2/${PORTVERSION}/ \
		http://www.ring.gr.jp/archives/net/cherokee/1.2/${PORTVERSION}/ \
		http://ftp.nluug.nl/pub/internet/cherokee/1.2/${PORTVERSION}/ \
		http://ftp.surfnet.nl/pub/internet/cherokee/1.2/${PORTVERSION}/ \
		http://mirror.is.co.za/mirrors/cherokee/1.2/${PORTVERSION}/ \
		http://mirror.aarnet.edu.au/pub/cherokee/1.2/\${PORTVERSION}/ \
		http://ftp.ntua.gr/pub/www/cherokee/1.2/\${PORTVERSION}/ \
		http://ftp.cc.uoc.gr/mirrors/cherokee/1.2/\${PORTVERSION}/ \
		http://cherokee.mirror.garr.it/mirrors/cherokee/1.2/\${PORTVERSION}/ \
		http://ftp.yz.yamagata-u.ac.jp/pub/network/cherokee/1.2/\${PORTVERSION}/ \
		http://ftp.icm.edu.pl/packages/cherokee/1.2/\${PORTVERSION}/ \
		ftp://download.srv.ro/pub/cherokee/1.2/\${PORTVERSION}/ \
		http://mirror.yandex.ru/mirrors/cherokee-project.com/1.2/\${PORTVERSION}/ \
		http://cherokee.hyperial.com/1.2/\${PORTVERSION}/ \
		http://cherokee.labs.itb.ac.id/1.2/\${PORTVERSION}/ \
		http://mirror.cpsc.ucalgary.ca/mirror/cherokee/1.2/\${PORTVERSION}/ \
		http://www.feel3.de/mirrors/cherokee/1.2/\${PORTVERSION}/ \
		http://cherokee.pubcrawler.com/1.2/\${PORTVERSION}/

# Disabled mirrors
# due to 404




# New ports collection makefile for:	cherokee
# Date created:			01 Jun 2002
# Whom:				silence <oksala@videotron.ca>
#
# $FreeBSD: ports/www/cherokee/Makefile,v 1.93 2011/01/27 14:22:25 pav Exp $
#

PORTNAME=	cherokee
PORTVERSION=	1.0.18
CATEGORIES=	www
MASTER_SITES=	http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \
		http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
		http://mirror.its.uidaho.edu/pub/cherokee/1.0/\${PORTVERSION}/ \
		http://www.gtlib.gatech.edu/pub/cherokee/1.0/\${PORTVERSION}/ \
		ftp://mirrors.secution.com/cherokee/1.0/${PORTVERSION}/ \
		ftp://ftp.easynet.be/cherokee/1.0/${PORTVERSION}/ \
		http://ftp.heanet.ie/mirrors/cherokee/1.0/${PORTVERSION}/ \
		http://www.ftp.ne.jp/infosystems/cherokee/1.0/${PORTVERSION}/ \
		http://www.ring.gr.jp/archives/net/cherokee/1.0/${PORTVERSION}/ \
		http://ftp.nluug.nl/pub/internet/cherokee/1.0/${PORTVERSION}/ \
		http://ftp.surfnet.nl/pub/internet/cherokee/1.0/${PORTVERSION}/ \
		http://mirror.is.co.za/mirrors/cherokee/1.0/${PORTVERSION}/ \
		http://mirror.aarnet.edu.au/pub/cherokee/1.0/\${PORTVERSION}/ \
		http://ftp.ntua.gr/pub/www/cherokee/1.0/\${PORTVERSION}/ \
		http://ftp.cc.uoc.gr/mirrors/cherokee/1.0/\${PORTVERSION}/ \
		http://cherokee.mirror.garr.it/mirrors/cherokee/1.0/\${PORTVERSION}/ \
		http://ftp.yz.yamagata-u.ac.jp/pub/network/cherokee/1.0/\${PORTVERSION}/ \
		http://ftp.icm.edu.pl/packages/cherokee/1.0/\${PORTVERSION}/ \
		ftp://download.srv.ro/pub/cherokee/1.0/\${PORTVERSION}/ \
		http://mirror.yandex.ru/mirrors/cherokee-project.com/1.0/\${PORTVERSION}/ \
		http://cherokee.hyperial.com/1.0/\${PORTVERSION}/ \
		http://cherokee.labs.itb.ac.id/1.0/\${PORTVERSION}/ \
		http://mirror.cpsc.ucalgary.ca/mirror/cherokee/1.0/\${PORTVERSION}/ \
		http://www.feel3.de/mirrors/cherokee/1.0/\${PORTVERSION}/ \
		http://cherokee.pubcrawler.com/1.0/\${PORTVERSION}/

# Disabled mirrors
# due to 404
#		http://cherokee-project.pl/mirror/cherokee/1.0/${PORTVERSION}/ \
#		http://ftp.saix.net/Cherokee/1.0/${PORTVERSION}/ \
#		http://sunsite.rediris.es/mirror/cherokee/1.0/\${PORTVERSION}/

# due to site down
#		http://mirror.apung.web.id/cherokee/1.0/\${PORTVERSION}/ \

MAINTAINER=	dschulz@gmail.com
COMMENT=	Extremely fast and flexible web server

USE_GNOME=	gnomehack gnometarget pkgconfig
USE_OPENSSL=	yes
USE_LDCONFIG=	yes
USE_GETTEXT=	yes
USE_RC_SUBR=	cherokee.sh
SUB_FILES=	pkg-install pkg-message
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

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

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=	IPV6	  "IPv6 support"	on	\
		MYSQL	  "MySQL Database"	off	\
		LDAP	  "LDAP Support"	off	\
		GEOIP	  "GeoIP Support (recommended)"	on	\
		FFMPEG	  "FFMpeg Support"	off	\
		NLS	  "NLS Support"	on	\
		INTPCRE	  "Use Internal PCRE Library"	off	\
		ADMIN	  "Build the Admin Interface"	on	\
		RRDTOOL   "Usage Graphs Support"  off	\
		UWSGI     "uWSGI Support" off

.include <bsd.port.options.mk>

.ifdef WITH_ADMIN
USE_PYTHON=	2.4+
PLIST_SUB+=	ADMIN=""
.else
CONFIGURE_ARGS+=--disable-admin
PLIST_SUB+=	ADMIN="@comment "
.endif

.include <bsd.port.pre.mk>

CONFIGURE_ARGS+=	--with-wwwuser=${CHEROKEE_USER} --with-wwwgroup=${CHEROKEE_GROUP}

.ifdef WITHOUT_IPV6
CONFIGURE_ARGS+=	--disable-ipv6
.endif

.ifdef WITH_MYSQL
USE_MYSQL=	yes
CONFIGURE_ARGS+=	--with-mysql=yes
PLIST_SUB+=	MYSQL=""
.else
CONFIGURE_ARGS+=	--with-mysql=no
PLIST_SUB+=	MYSQL="@comment "
.endif

.ifdef WITH_LDAP
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=	--with-ldap=yes
PLIST_SUB+=	LDAP=""
.else
CONFIGURE_ARGS+=	--with-ldap=no
PLIST_SUB+=	LDAP="@comment "
.endif

.ifdef WITH_GEOIP
LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
CONFIGURE_ARGS+=	--with-geoip=yes
PLIST_SUB+=	GEOIP=""
.else
CONFIGURE_ARGS+=	--with-geoip=no
PLIST_SUB+=	GEOIP="@comment "
.endif

.ifdef WITH_FFMPEG
LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg \
		avcodec:${PORTSDIR}/multimedia/ffmpeg \
		avutil:${PORTSDIR}/multimedia/ffmpeg
CONFIGURE_ARGS+=	--with-ffmpeg=yes
.else
CONFIGURE_ARGS+=	--with-ffmpeg=no
.endif

.ifdef WITH_NLS
PLIST_SUB+=	NLS=""
.else
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB+=	NLS="@comment "
.endif

.ifdef WITH_INTPCRE
CONFIGURE_ARGS+=	--enable-internal-pcre
.else
LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
.endif

.ifdef WITH_RRDTOOL
RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
.endif

.ifdef WITH_UWSGI
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}/gitlog2changelog.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
	@${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \
		${WRKSRC}/svnlog2changelog.py

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 !defined(NOPORTDOCS)
	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
.endif

.ifdef WITH_ADMIN
	@cd ${DATADIR}/admin && ${FIND} . -name "*.py" |\
	${XARGS} ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py
.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.post.mk>

Lines 1-2 Link Here

(-)cherokee-new/distinfo (-2 / +2 lines)
1	SHA256 (cherokee-1.0.19.tar.gz) = 0e8a121955d004ea233ff1cacf115457a15f97026da565c55b90ee4d745dc0c5	1	SHA256 (cherokee-1.2.2.tar.gz) = 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475
2	SIZE (cherokee-1.0.19.tar.gz) = 5855606	2	SIZE (cherokee-1.2.2.tar.gz) = 6108853

Lines 1-2 Link Here

(-)cherokee-new/distinfo.orig (-2 lines)
1	SHA256 (cherokee-1.0.18.tar.gz) = 8bedf485ffbfa0a915a5714532186d8bd2b7b4a7cc5a2197bc9f026c68fd1a2c
2	SIZE (cherokee-1.0.18.tar.gz) = 5841896




--- admin/SystemStats.py	2011-01-14 12:07:33.000000000 -0300
+++ admin/SystemStats.py-new	2011-01-21 16:44:01.000000000 -0300
@@ -5,7 +5,7 @@
 # Authors:
 #      Alvaro Lopez Ortega <alvaro@alobbs.com>
 #
-# Copyright (C) 2001-2011 Alvaro Lopez Ortega
+# Copyright (C) 2001-2010 Alvaro Lopez Ortega
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 2 of the GNU General Public
@@ -331,7 +331,7 @@
 
     def _read_cpu_and_mem_info (self):
         # Execute sysctl
-        ret = popen.popen_sync ("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu hw.pagesize vm.stats.vm.v_page_count")
+        ret = popen.popen_sync ("/sbin/sysctl -i hw.ncpu hw.clockrate kern.smp.cpus hw.pagesize vm.stats.vm.v_page_count")
         lines = filter (lambda x: x, ret['stdout'].split('\n'))
 
         # Parse output
@@ -349,10 +349,11 @@
 	    parts = line.split()
 	    if parts[0] == 'hw.ncpu:':
 		ncpus = int(parts[1])
+		vcpus = int(parts[1])
             elif parts[0] == 'hw.clockrate:':
 		clock = parts[1]
-            elif parts[0] == 'kern.threads.virtual_cpu:':
-		vcpus = parts[1]
+            elif parts[0] == 'kern.smp.cpus:':
+	  	vcpus = parts[1]
             elif parts[0] == 'vm.stats.vm.v_page_count:':
 		pcount = int(parts[1])
             elif parts[0] == 'hw.pagesize:':

Return to bug 156045

Lines 6-39 Link Here

(-)cherokee-new/Makefile (-25 / +25 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 1.0.19	9	PORTVERSION= 1.2.2
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \	12	MASTER_SITES= http://www.cherokee-project.com/download/1.2/${PORTVERSION}/ \
13	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \	13	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
14	http://mirror.its.uidaho.edu/pub/cherokee/1.0/\${PORTVERSION}/ \	14	http://mirror.its.uidaho.edu/pub/cherokee/1.2/\${PORTVERSION}/ \
15	http://www.gtlib.gatech.edu/pub/cherokee/1.0/\${PORTVERSION}/ \	15	http://www.gtlib.gatech.edu/pub/cherokee/1.2/\${PORTVERSION}/ \
16	ftp://mirrors.secution.com/cherokee/1.0/${PORTVERSION}/ \	16	ftp://mirrors.secution.com/cherokee/1.2/${PORTVERSION}/ \
17	ftp://ftp.easynet.be/cherokee/1.0/${PORTVERSION}/ \	17	ftp://ftp.easynet.be/cherokee/1.2/${PORTVERSION}/ \
18	http://ftp.heanet.ie/mirrors/cherokee/1.0/${PORTVERSION}/ \	18	http://ftp.heanet.ie/mirrors/cherokee/1.2/${PORTVERSION}/ \
19	http://www.ftp.ne.jp/infosystems/cherokee/1.0/${PORTVERSION}/ \	19	http://www.ftp.ne.jp/infosystems/cherokee/1.2/${PORTVERSION}/ \
20	http://www.ring.gr.jp/archives/net/cherokee/1.0/${PORTVERSION}/ \	20	http://www.ring.gr.jp/archives/net/cherokee/1.2/${PORTVERSION}/ \
21	http://ftp.nluug.nl/pub/internet/cherokee/1.0/${PORTVERSION}/ \	21	http://ftp.nluug.nl/pub/internet/cherokee/1.2/${PORTVERSION}/ \
22	http://ftp.surfnet.nl/pub/internet/cherokee/1.0/${PORTVERSION}/ \	22	http://ftp.surfnet.nl/pub/internet/cherokee/1.2/${PORTVERSION}/ \
23	http://mirror.is.co.za/mirrors/cherokee/1.0/${PORTVERSION}/ \	23	http://mirror.is.co.za/mirrors/cherokee/1.2/${PORTVERSION}/ \
24	http://mirror.aarnet.edu.au/pub/cherokee/1.0/\${PORTVERSION}/ \	24	http://mirror.aarnet.edu.au/pub/cherokee/1.2/\${PORTVERSION}/ \
25	http://ftp.ntua.gr/pub/www/cherokee/1.0/\${PORTVERSION}/ \	25	http://ftp.ntua.gr/pub/www/cherokee/1.2/\${PORTVERSION}/ \
26	http://ftp.cc.uoc.gr/mirrors/cherokee/1.0/\${PORTVERSION}/ \	26	http://ftp.cc.uoc.gr/mirrors/cherokee/1.2/\${PORTVERSION}/ \
27	http://cherokee.mirror.garr.it/mirrors/cherokee/1.0/\${PORTVERSION}/ \	27	http://cherokee.mirror.garr.it/mirrors/cherokee/1.2/\${PORTVERSION}/ \
28	http://ftp.yz.yamagata-u.ac.jp/pub/network/cherokee/1.0/\${PORTVERSION}/ \	28	http://ftp.yz.yamagata-u.ac.jp/pub/network/cherokee/1.2/\${PORTVERSION}/ \
29	http://ftp.icm.edu.pl/packages/cherokee/1.0/\${PORTVERSION}/ \	29	http://ftp.icm.edu.pl/packages/cherokee/1.2/\${PORTVERSION}/ \
30	ftp://download.srv.ro/pub/cherokee/1.0/\${PORTVERSION}/ \	30	ftp://download.srv.ro/pub/cherokee/1.2/\${PORTVERSION}/ \
31	http://mirror.yandex.ru/mirrors/cherokee-project.com/1.0/\${PORTVERSION}/ \	31	http://mirror.yandex.ru/mirrors/cherokee-project.com/1.2/\${PORTVERSION}/ \
32	http://cherokee.hyperial.com/1.0/\${PORTVERSION}/ \	32	http://cherokee.hyperial.com/1.2/\${PORTVERSION}/ \
33	http://cherokee.labs.itb.ac.id/1.0/\${PORTVERSION}/ \	33	http://cherokee.labs.itb.ac.id/1.2/\${PORTVERSION}/ \
34	http://mirror.cpsc.ucalgary.ca/mirror/cherokee/1.0/\${PORTVERSION}/ \	34	http://mirror.cpsc.ucalgary.ca/mirror/cherokee/1.2/\${PORTVERSION}/ \
35	http://www.feel3.de/mirrors/cherokee/1.0/\${PORTVERSION}/ \	35	http://www.feel3.de/mirrors/cherokee/1.2/\${PORTVERSION}/ \
36	http://cherokee.pubcrawler.com/1.0/\${PORTVERSION}/	36	http://cherokee.pubcrawler.com/1.2/\${PORTVERSION}/
37		37
38	# Disabled mirrors	38	# Disabled mirrors
39	# due to 404	39	# due to 404

Lines 1-253 Link Here

(-)cherokee-new/Makefile.orig (-253 lines)
1	# New ports collection makefile for: cherokee
2	# Date created: 01 Jun 2002
3	# Whom: silence <oksala@videotron.ca>
4	#
5	# $FreeBSD: ports/www/cherokee/Makefile,v 1.93 2011/01/27 14:22:25 pav Exp $
6	#
7
8	PORTNAME= cherokee
9	PORTVERSION= 1.0.18
10	CATEGORIES= www
11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \
12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
13	http://mirror.its.uidaho.edu/pub/cherokee/1.0/\${PORTVERSION}/ \
14	http://www.gtlib.gatech.edu/pub/cherokee/1.0/\${PORTVERSION}/ \
15	ftp://mirrors.secution.com/cherokee/1.0/${PORTVERSION}/ \
16	ftp://ftp.easynet.be/cherokee/1.0/${PORTVERSION}/ \
17	http://ftp.heanet.ie/mirrors/cherokee/1.0/${PORTVERSION}/ \
18	http://www.ftp.ne.jp/infosystems/cherokee/1.0/${PORTVERSION}/ \
19	http://www.ring.gr.jp/archives/net/cherokee/1.0/${PORTVERSION}/ \
20	http://ftp.nluug.nl/pub/internet/cherokee/1.0/${PORTVERSION}/ \
21	http://ftp.surfnet.nl/pub/internet/cherokee/1.0/${PORTVERSION}/ \
22	http://mirror.is.co.za/mirrors/cherokee/1.0/${PORTVERSION}/ \
23	http://mirror.aarnet.edu.au/pub/cherokee/1.0/\${PORTVERSION}/ \
24	http://ftp.ntua.gr/pub/www/cherokee/1.0/\${PORTVERSION}/ \
25	http://ftp.cc.uoc.gr/mirrors/cherokee/1.0/\${PORTVERSION}/ \
26	http://cherokee.mirror.garr.it/mirrors/cherokee/1.0/\${PORTVERSION}/ \
27	http://ftp.yz.yamagata-u.ac.jp/pub/network/cherokee/1.0/\${PORTVERSION}/ \
28	http://ftp.icm.edu.pl/packages/cherokee/1.0/\${PORTVERSION}/ \
29	ftp://download.srv.ro/pub/cherokee/1.0/\${PORTVERSION}/ \
30	http://mirror.yandex.ru/mirrors/cherokee-project.com/1.0/\${PORTVERSION}/ \
31	http://cherokee.hyperial.com/1.0/\${PORTVERSION}/ \
32	http://cherokee.labs.itb.ac.id/1.0/\${PORTVERSION}/ \
33	http://mirror.cpsc.ucalgary.ca/mirror/cherokee/1.0/\${PORTVERSION}/ \
34	http://www.feel3.de/mirrors/cherokee/1.0/\${PORTVERSION}/ \
35	http://cherokee.pubcrawler.com/1.0/\${PORTVERSION}/
36
37	# Disabled mirrors
38	# due to 404
39	# http://cherokee-project.pl/mirror/cherokee/1.0/${PORTVERSION}/ \
40	# http://ftp.saix.net/Cherokee/1.0/${PORTVERSION}/ \
41	# http://sunsite.rediris.es/mirror/cherokee/1.0/\${PORTVERSION}/
42
43	# due to site down
44	# http://mirror.apung.web.id/cherokee/1.0/\${PORTVERSION}/ \
45
46	MAINTAINER= dschulz@gmail.com
47	COMMENT= Extremely fast and flexible web server
48
49	USE_GNOME= gnomehack gnometarget pkgconfig
50	USE_OPENSSL= yes
51	USE_LDCONFIG= yes
52	USE_GETTEXT= yes
53	USE_RC_SUBR= cherokee.sh
54	SUB_FILES= pkg-install pkg-message
55	USE_GMAKE= yes
56	GNU_CONFIGURE= yes
57	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
58	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
59	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
60
61	CHEROKEE_VARDIR?= /var
62	CHEROKEE_LOGDIR?= ${CHEROKEE_VARDIR}/log
63	CHEROKEE_ACCESSLOG?= ${CHEROKEE_LOGDIR}/cherokee.access
64	CHEROKEE_ERRORLOG?= ${CHEROKEE_LOGDIR}/cherokee.error
65
66	# Adjust this if you need to run Cherokee as a distinct user:group
67	CHEROKEE_USER= www
68	CHEROKEE_GROUP= www
69
70	# This should be ok since 1.0.9, cherokee drops privileges
71	# after opening logfiles as a security measure
72	CHEROKEE_LOGFILE_FILEMODE= 0600
73	CHEROKEE_LOGFILE_USER= root
74	CHEROKEE_LOGFILE_GROUP= wheel
75
76	# Directory where to put RRD files, by default
77	CHEROKEE_RRDDIR=/var/lib/cherokee/graphs
78
79	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \
80	--localstatedir=${CHEROKEE_VARDIR} \
81	--disable-static
82	DEFCONFS= cherokee.conf
83	CONFSUBDIRS= ssl mods-available mods-enabled sites-available sites-enabled
84	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee-admin.1 cherokee-admin-launcher.1 \
85	cherokee-tweak.1 cherokee-worker.1
86	PORTDOCS= *
87
88	OPTIONS= IPV6 "IPv6 support" on \
89	MYSQL "MySQL Database" off \
90	LDAP "LDAP Support" off \
91	GEOIP "GeoIP Support (recommended)" on \
92	FFMPEG "FFMpeg Support" off \
93	NLS "NLS Support" on \
94	INTPCRE "Use Internal PCRE Library" off \
95	ADMIN "Build the Admin Interface" on \
96	RRDTOOL "Usage Graphs Support" off \
97	UWSGI "uWSGI Support" off
98
99	.include <bsd.port.options.mk>
100
101	.ifdef WITH_ADMIN
102	USE_PYTHON= 2.4+
103	PLIST_SUB+= ADMIN=""
104	.else
105	CONFIGURE_ARGS+=--disable-admin
106	PLIST_SUB+= ADMIN="@comment "
107	.endif
108
109	.include <bsd.port.pre.mk>
110
111	CONFIGURE_ARGS+= --with-wwwuser=${CHEROKEE_USER} --with-wwwgroup=${CHEROKEE_GROUP}
112
113	.ifdef WITHOUT_IPV6
114	CONFIGURE_ARGS+= --disable-ipv6
115	.endif
116
117	.ifdef WITH_MYSQL
118	USE_MYSQL= yes
119	CONFIGURE_ARGS+= --with-mysql=yes
120	PLIST_SUB+= MYSQL=""
121	.else
122	CONFIGURE_ARGS+= --with-mysql=no
123	PLIST_SUB+= MYSQL="@comment "
124	.endif
125
126	.ifdef WITH_LDAP
127	USE_OPENLDAP= yes
128	CONFIGURE_ARGS+= --with-ldap=yes
129	PLIST_SUB+= LDAP=""
130	.else
131	CONFIGURE_ARGS+= --with-ldap=no
132	PLIST_SUB+= LDAP="@comment "
133	.endif
134
135	.ifdef WITH_GEOIP
136	LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP
137	CONFIGURE_ARGS+= --with-geoip=yes
138	PLIST_SUB+= GEOIP=""
139	.else
140	CONFIGURE_ARGS+= --with-geoip=no
141	PLIST_SUB+= GEOIP="@comment "
142	.endif
143
144	.ifdef WITH_FFMPEG
145	LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg \
146	avcodec:${PORTSDIR}/multimedia/ffmpeg \
147	avutil:${PORTSDIR}/multimedia/ffmpeg
148	CONFIGURE_ARGS+= --with-ffmpeg=yes
149	.else
150	CONFIGURE_ARGS+= --with-ffmpeg=no
151	.endif
152
153	.ifdef WITH_NLS
154	PLIST_SUB+= NLS=""
155	.else
156	CONFIGURE_ARGS+= --disable-nls
157	PLIST_SUB+= NLS="@comment "
158	.endif
159
160	.ifdef WITH_INTPCRE
161	CONFIGURE_ARGS+= --enable-internal-pcre
162	.else
163	LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
164	.endif
165
166	.ifdef WITH_RRDTOOL
167	RUN_DEPENDS+= rrdtool:${PORTSDIR}/databases/rrdtool
168	.endif
169
170	.ifdef WITH_UWSGI
171	RUN_DEPENDS+= uwsgi:${PORTSDIR}/www/uwsgi
172	.endif
173
174	post-patch:
175	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} \
176	${REINPLACE_CMD} -e 's\|@mkdir_p@\|${MKDIR} --\|g'
177	@${REINPLACE_CMD} -e '/cherokee_replace.*%sysconfdir%/d;/^SUBDIRS/s\|doc \|\|;\
178	/^install-data-am/s\|install-data-local\|install-data-local-config\|;\
179	/^SUBDIRS/s\|windows\|\|'\
180	${WRKSRC}/Makefile.in
181	@for i in ${BUILD_WRKSRC}/*.sample.pre;do ${SED} -e \
182	's:%wwwroot%:${PREFIX}/www/cherokee:g; \
183	s:%prefix%:${PREFIX}:g; \
184	s:%localstatedir%:/var:g' \
185	$$i > $${i%.pre};done
186
187	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
188	${WRKSRC}/admin/CTK/CTK-run.pre
189	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
190	${WRKSRC}/cherokee/cherokee-admin-launcher
191	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
192	${WRKSRC}/admin/server.py
193	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
194	${WRKSRC}/admin/upgrade_config.py
195	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
196	${WRKSRC}/cherokee/cherokee-tweak
197	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
198	${WRKSRC}/doc/cookbook_dbslayer.html
199	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
200	${WRKSRC}/doc/test_images.py
201	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
202	${WRKSRC}/contrib/tracelor.py
203	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
204	${WRKSRC}/gitlog2changelog.py
205	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
206	${WRKSRC}/po/po_stats.py
207	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
208	${WRKSRC}/qa/fcgi.py
209	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
210	${WRKSRC}/qa/run-tests.py
211	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
212	${WRKSRC}/svnlog2changelog.py
213
214	post-install:
215	@${INSTALL} -d ${CONFSUBDIRS:S\|^\|${PREFIX}/etc/cherokee/\|}
216	@for i in ${DEFCONFS};do\
217	${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done
218	@${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample
219	@:>${PREFIX}/etc/cherokee/mods-enabled/.empty
220	@:>${PREFIX}/etc/cherokee/sites-available/.empty
221	@:>${PREFIX}/etc/cherokee/sites-enabled/.empty
222	@:>${PREFIX}/etc/cherokee/ssl/.empty
223	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\
224	if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done
225	@for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\
226	if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done
227
228	.if !defined(NOPORTDOCS)
229	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
230	.endif
231
232	.ifdef WITH_ADMIN
233	@cd ${DATADIR}/admin && ${FIND} . -name "*.py" \|\
234	${XARGS} ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py
235	.endif
236
237	@${SETENV} \
238	CHEROKEE_LOGFILE_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE} \
239	CHEROKEE_LOGFILE_USER=${CHEROKEE_LOGFILE_USER} \
240	CHEROKEE_LOGFILE_GROUP=${CHEROKEE_LOGFILE_GROUP} \
241	CHEROKEE_ERRORLOG=${CHEROKEE_ERRORLOG} \
242	CHEROKEE_ACCESSLOG=${CHEROKEE_ACCESSLOG} \
243	CHEROKEE_WITH_RRDTOOL=${WITH_RRDTOOL} \
244	CHEROKEE_RRDDIR=${CHEROKEE_RRDDIR} \
245	CHEROKEE_RRDDIR_USER=${CHEROKEE_USER} \
246	CHEROKEE_RRDDIR_GROUP=${CHEROKEE_GROUP} \
247	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
248
249	@${ECHO_MSG} "==============================================================="
250	@${CAT} ${PKGMESSAGE}
251	@${ECHO_MSG} "==============================================================="
252
253	.include <bsd.port.post.mk>

Lines 1-34 Link Here

(-)cherokee-new/files/patch-admin-systemstats.py.diff (-34 lines)
1	--- admin/SystemStats.py 2011-01-14 12:07:33.000000000 -0300
2	+++ admin/SystemStats.py-new 2011-01-21 16:44:01.000000000 -0300
3	@@ -5,7 +5,7 @@
4	# Authors:
5	# Alvaro Lopez Ortega <alvaro@alobbs.com>
6	#
7	-# Copyright (C) 2001-2011 Alvaro Lopez Ortega
8	+# Copyright (C) 2001-2010 Alvaro Lopez Ortega
9	#
10	# This program is free software; you can redistribute it and/or
11	# modify it under the terms of version 2 of the GNU General Public
12	@@ -331,7 +331,7 @@
13
14	def _read_cpu_and_mem_info (self):
15	# Execute sysctl
16	- ret = popen.popen_sync ("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu hw.pagesize vm.stats.vm.v_page_count")
17	+ ret = popen.popen_sync ("/sbin/sysctl -i hw.ncpu hw.clockrate kern.smp.cpus hw.pagesize vm.stats.vm.v_page_count")
18	lines = filter (lambda x: x, ret['stdout'].split('\n'))
19
20	# Parse output
21	@@ -349,10 +349,11 @@
22	parts = line.split()
23	if parts[0] == 'hw.ncpu:':
24	ncpus = int(parts[1])
25	+ vcpus = int(parts[1])
26	elif parts[0] == 'hw.clockrate:':
27	clock = parts[1]
28	- elif parts[0] == 'kern.threads.virtual_cpu:':
29	- vcpus = parts[1]
30	+ elif parts[0] == 'kern.smp.cpus:':
31	+ vcpus = parts[1]
32	elif parts[0] == 'vm.stats.vm.v_page_count:':
33	pcount = int(parts[1])
34	elif parts[0] == 'hw.pagesize:':

Lines 79-84 Link Here

(-)cherokee-new/pkg-plist (-22 / +8 lines)
79	lib/cherokee/libplugin_directory.so	79	lib/cherokee/libplugin_directory.so
80	lib/cherokee/libplugin_dirlist.la	80	lib/cherokee/libplugin_dirlist.la
81	lib/cherokee/libplugin_dirlist.so	81	lib/cherokee/libplugin_dirlist.so
		82	lib/cherokee/libplugin_drop.la
		83	lib/cherokee/libplugin_drop.so
82	lib/cherokee/libplugin_empty_gif.la	84	lib/cherokee/libplugin_empty_gif.la
83	lib/cherokee/libplugin_empty_gif.so	85	lib/cherokee/libplugin_empty_gif.so
84	lib/cherokee/libplugin_error_nn.la	86	lib/cherokee/libplugin_error_nn.la
Lines 237-242 Link Here
237	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Link.pyc	239	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Link.pyc
238	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/List.py	240	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/List.py
239	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/List.pyc	241	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/List.pyc
		242	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/MailHTML.py
		243	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/MailHTML.pyc
240	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Notice.py	244	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Notice.py
241	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Notice.pyc	245	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Notice.pyc
242	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Page.py	246	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Page.py
Lines 306-311 Link Here
306	%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.py	310	%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.py
307	%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.py	311	%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.py
308	%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.py	312	%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.py
		313	%%ADMIN%%%%DATADIR%%/admin/market/Report.py
309	%%ADMIN%%%%DATADIR%%/admin/market/Review.py	314	%%ADMIN%%%%DATADIR%%/admin/market/Review.py
310	%%ADMIN%%%%DATADIR%%/admin/market/Library.py	315	%%ADMIN%%%%DATADIR%%/admin/market/Library.py
311	%%ADMIN%%%%DATADIR%%/admin/market/Util.py	316	%%ADMIN%%%%DATADIR%%/admin/market/Util.py
Lines 322-327 Link Here
322	%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.pyc	327	%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.pyc
323	%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.pyc	328	%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.pyc
324	%%ADMIN%%%%DATADIR%%/admin/market/Review.pyc	329	%%ADMIN%%%%DATADIR%%/admin/market/Review.pyc
		330	%%ADMIN%%%%DATADIR%%/admin/market/Report.pyc
325	%%ADMIN%%%%DATADIR%%/admin/market/Library.pyc	331	%%ADMIN%%%%DATADIR%%/admin/market/Library.pyc
326	%%ADMIN%%%%DATADIR%%/admin/market/Util.pyc	332	%%ADMIN%%%%DATADIR%%/admin/market/Util.pyc
327	%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.pyc	333	%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.pyc
Lines 494-499 Link Here
494	%%ADMIN%%%%DATADIR%%/admin/plugins/directory.pyc	500	%%ADMIN%%%%DATADIR%%/admin/plugins/directory.pyc
495	%%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.py	501	%%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.py
496	%%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.pyc	502	%%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.pyc
		503	%%ADMIN%%%%DATADIR%%/admin/plugins/drop.py
		504	%%ADMIN%%%%DATADIR%%/admin/plugins/drop.pyc
497	%%ADMIN%%%%DATADIR%%/admin/plugins/empty_gif.py	505	%%ADMIN%%%%DATADIR%%/admin/plugins/empty_gif.py
498	%%ADMIN%%%%DATADIR%%/admin/plugins/empty_gif.pyc	506	%%ADMIN%%%%DATADIR%%/admin/plugins/empty_gif.pyc
499	%%ADMIN%%%%DATADIR%%/admin/plugins/error_nn.py	507	%%ADMIN%%%%DATADIR%%/admin/plugins/error_nn.py
Lines 927-960 Link Here
927	%%ADMIN%%%%DATADIR%%/admin/wizards/concrete5.pyc	935	%%ADMIN%%%%DATADIR%%/admin/wizards/concrete5.pyc
928	%%ADMIN%%%%DATADIR%%/admin/wizards/django.py	936	%%ADMIN%%%%DATADIR%%/admin/wizards/django.py
929	%%ADMIN%%%%DATADIR%%/admin/wizards/django.pyc	937	%%ADMIN%%%%DATADIR%%/admin/wizards/django.pyc
930	%%ADMIN%%%%DATADIR%%/admin/wizards/drupal.py
931	%%ADMIN%%%%DATADIR%%/admin/wizards/drupal.pyc
932	%%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.py	938	%%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.py
933	%%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.pyc	939	%%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.pyc
934	%%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.py	940	%%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.py
935	%%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.pyc	941	%%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.pyc
936	%%ADMIN%%%%DATADIR%%/admin/wizards/icons.py	942	%%ADMIN%%%%DATADIR%%/admin/wizards/icons.py
937	%%ADMIN%%%%DATADIR%%/admin/wizards/icons.pyc	943	%%ADMIN%%%%DATADIR%%/admin/wizards/icons.pyc
938	%%ADMIN%%%%DATADIR%%/admin/wizards/joomla.py
939	%%ADMIN%%%%DATADIR%%/admin/wizards/joomla.pyc
940	%%ADMIN%%%%DATADIR%%/admin/wizards/liferay.py
941	%%ADMIN%%%%DATADIR%%/admin/wizards/liferay.pyc
942	%%ADMIN%%%%DATADIR%%/admin/wizards/mailman.py	944	%%ADMIN%%%%DATADIR%%/admin/wizards/mailman.py
943	%%ADMIN%%%%DATADIR%%/admin/wizards/mailman.pyc	945	%%ADMIN%%%%DATADIR%%/admin/wizards/mailman.pyc
944	%%ADMIN%%%%DATADIR%%/admin/wizards/mediawiki.py
945	%%ADMIN%%%%DATADIR%%/admin/wizards/mediawiki.pyc
946	%%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.py
947	%%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.pyc
948	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.py	946	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.py
949	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.pyc	947	%%ADMIN%%%%DATADIR%%/admin/wizards/mono.pyc
950	%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.py
951	%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.pyc
952	%%ADMIN%%%%DATADIR%%/admin/wizards/php.py	948	%%ADMIN%%%%DATADIR%%/admin/wizards/php.py
953	%%ADMIN%%%%DATADIR%%/admin/wizards/php.pyc	949	%%ADMIN%%%%DATADIR%%/admin/wizards/php.pyc
954	%%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.py
955	%%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.pyc
956	%%ADMIN%%%%DATADIR%%/admin/wizards/phpmyadmin.py
957	%%ADMIN%%%%DATADIR%%/admin/wizards/phpmyadmin.pyc
958	%%ADMIN%%%%DATADIR%%/admin/wizards/rails.py	950	%%ADMIN%%%%DATADIR%%/admin/wizards/rails.py
959	%%ADMIN%%%%DATADIR%%/admin/wizards/rails.pyc	951	%%ADMIN%%%%DATADIR%%/admin/wizards/rails.pyc
960	%%ADMIN%%%%DATADIR%%/admin/wizards/redirect.py	952	%%ADMIN%%%%DATADIR%%/admin/wizards/redirect.py
Lines 965-980 Link Here
965	%%ADMIN%%%%DATADIR%%/admin/wizards/static.pyc	957	%%ADMIN%%%%DATADIR%%/admin/wizards/static.pyc
966	%%ADMIN%%%%DATADIR%%/admin/wizards/streaming.py	958	%%ADMIN%%%%DATADIR%%/admin/wizards/streaming.py
967	%%ADMIN%%%%DATADIR%%/admin/wizards/streaming.pyc	959	%%ADMIN%%%%DATADIR%%/admin/wizards/streaming.pyc
968	%%ADMIN%%%%DATADIR%%/admin/wizards/sugar.py
969	%%ADMIN%%%%DATADIR%%/admin/wizards/sugar.pyc
970	%%ADMIN%%%%DATADIR%%/admin/wizards/symfony.py	960	%%ADMIN%%%%DATADIR%%/admin/wizards/symfony.py
971	%%ADMIN%%%%DATADIR%%/admin/wizards/symfony.pyc	961	%%ADMIN%%%%DATADIR%%/admin/wizards/symfony.pyc
972	%%ADMIN%%%%DATADIR%%/admin/wizards/trac.py
973	%%ADMIN%%%%DATADIR%%/admin/wizards/trac.pyc
974	%%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.py	962	%%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.py
975	%%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.pyc	963	%%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.pyc
976	%%ADMIN%%%%DATADIR%%/admin/wizards/wordpress.py
977	%%ADMIN%%%%DATADIR%%/admin/wizards/wordpress.pyc
978	%%ADMIN%%%%DATADIR%%/admin/wizards/zend.py	964	%%ADMIN%%%%DATADIR%%/admin/wizards/zend.py
979	%%ADMIN%%%%DATADIR%%/admin/wizards/zend.pyc	965	%%ADMIN%%%%DATADIR%%/admin/wizards/zend.pyc
980	%%DATADIR%%/deps/cgi.deps	966	%%DATADIR%%/deps/cgi.deps