ports/156045: Update port: www/cherokee

Diego Schulz dschulz at gmail.com
Wed Mar 30 17:45:25 UTC 2011


On Tue, Mar 29, 2011 at 4:30 PM, <FreeBSD-gnats-submit at freebsd.org> wrote:

> Thank you very much for your problem report.
> It has the internal identification `ports/156045'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=156045
>
> >Category:       ports
> >Responsible:    freebsd-ports-bugs
> >Synopsis:       Update port: www/cherokee
> >Arrival-Date:   Tue Mar 29 19:30:11 UTC 2011
>


Apparently the send-pr HTML form didn't upload the patch.

Please fiind the patch attached in this mail.

regards,

diego
-------------- next part --------------
diff -ruN cherokee/Makefile cherokee-new/Makefile
--- cherokee/Makefile	2011-02-25 01:40:27.000000000 -0300
+++ cherokee-new/Makefile	2011-03-29 16:14:29.000000000 -0300
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	1.0.19
+PORTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \
+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.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}/
+		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
diff -ruN cherokee/Makefile.orig cherokee-new/Makefile.orig
--- cherokee/Makefile.orig	2011-02-01 10:00:51.000000000 -0300
+++ cherokee-new/Makefile.orig	1969-12-31 20:00:00.000000000 -0400
@@ -1,253 +0,0 @@
-# New ports collection makefile for:	cherokee
-# Date created:			01 Jun 2002
-# Whom:				silence <oksala at 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 at 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>
diff -ruN cherokee/distinfo cherokee-new/distinfo
--- cherokee/distinfo	2011-02-01 11:06:03.000000000 -0300
+++ cherokee-new/distinfo	2011-03-29 15:39:45.000000000 -0300
@@ -1,2 +1,2 @@
-SHA256 (cherokee-1.0.19.tar.gz) = 0e8a121955d004ea233ff1cacf115457a15f97026da565c55b90ee4d745dc0c5
-SIZE (cherokee-1.0.19.tar.gz) = 5855606
+SHA256 (cherokee-1.2.2.tar.gz) = 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475
+SIZE (cherokee-1.2.2.tar.gz) = 6108853
diff -ruN cherokee/distinfo.orig cherokee-new/distinfo.orig
--- cherokee/distinfo.orig	2011-02-01 10:00:51.000000000 -0300
+++ cherokee-new/distinfo.orig	1969-12-31 20:00:00.000000000 -0400
@@ -1,2 +0,0 @@
-SHA256 (cherokee-1.0.18.tar.gz) = 8bedf485ffbfa0a915a5714532186d8bd2b7b4a7cc5a2197bc9f026c68fd1a2c
-SIZE (cherokee-1.0.18.tar.gz) = 5841896
diff -ruN cherokee/files/patch-admin-systemstats.py.diff cherokee-new/files/patch-admin-systemstats.py.diff
--- cherokee/files/patch-admin-systemstats.py.diff	2011-01-27 11:22:25.000000000 -0300
+++ cherokee-new/files/patch-admin-systemstats.py.diff	1969-12-31 20:00:00.000000000 -0400
@@ -1,34 +0,0 @@
---- 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 at 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:':
diff -ruN cherokee/pkg-plist cherokee-new/pkg-plist
--- cherokee/pkg-plist	2011-02-01 10:00:51.000000000 -0300
+++ cherokee-new/pkg-plist	2011-03-29 16:09:44.000000000 -0300
@@ -79,6 +79,8 @@
 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
@@ -237,6 +239,8 @@
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Link.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/List.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/List.pyc
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/MailHTML.py
+%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/MailHTML.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Notice.py
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Notice.pyc
 %%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Page.py
@@ -306,6 +310,7 @@
 %%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
@@ -322,6 +327,7 @@
 %%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
@@ -494,6 +500,8 @@
 %%ADMIN%%%%DATADIR%%/admin/plugins/directory.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/dirlist.pyc
+%%ADMIN%%%%DATADIR%%/admin/plugins/drop.py
+%%ADMIN%%%%DATADIR%%/admin/plugins/drop.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/empty_gif.py
 %%ADMIN%%%%DATADIR%%/admin/plugins/empty_gif.pyc
 %%ADMIN%%%%DATADIR%%/admin/plugins/error_nn.py
@@ -927,34 +935,18 @@
 %%ADMIN%%%%DATADIR%%/admin/wizards/concrete5.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/django.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/django.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/drupal.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/drupal.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/glassfish.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/hotlinking.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/icons.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/icons.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/joomla.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/joomla.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/liferay.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/liferay.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/mailman.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/mailman.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/mediawiki.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/mediawiki.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/mono.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/mono.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/php.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/php.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/phpmyadmin.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/phpmyadmin.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/rails.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/rails.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/redirect.py
@@ -965,16 +957,10 @@
 %%ADMIN%%%%DATADIR%%/admin/wizards/static.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/streaming.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/streaming.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/sugar.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/sugar.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/symfony.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/symfony.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/trac.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/trac.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/uwsgi.pyc
-%%ADMIN%%%%DATADIR%%/admin/wizards/wordpress.py
-%%ADMIN%%%%DATADIR%%/admin/wizards/wordpress.pyc
 %%ADMIN%%%%DATADIR%%/admin/wizards/zend.py
 %%ADMIN%%%%DATADIR%%/admin/wizards/zend.pyc
 %%DATADIR%%/deps/cgi.deps


More information about the freebsd-ports-bugs mailing list