4 files changed, 35 insertions, 84 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 5a8da6425767..0ff5da4f1f46 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,34 +6,33 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	1.0.19
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 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 --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index 4bf82fe851c8..c103f4e67a3a 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -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 --git a/www/cherokee/files/patch-admin-systemstats.py.diff b/www/cherokee/files/patch-admin-systemstats.py.diff
deleted file mode 100644
index 58d781b9e3cb..000000000000
--- a/www/cherokee/files/patch-admin-systemstats.py.diff
+++ /dev/null
@@ -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@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 --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 38cf51a9b327..1c86f1ee129c 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -79,6 +79,8 @@ 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
@@ -237,6 +239,8 @@ share/aclocal/cherokee.m4
 %%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 @@ share/aclocal/cherokee.m4
 %%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 @@ share/aclocal/cherokee.m4
 %%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 @@ share/aclocal/cherokee.m4
 %%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 @@ 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/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 @@ share/aclocal/cherokee.m4
 %%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