3 files changed, 20 insertions, 9 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 0638364b07b3..2d0de2ebea6b 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.101
 CATEGORIES=	www
 MASTER_SITES=	http://www.cherokee-project.com/download/1.2/${PORTVERSION}/ \
 		http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
@@ -82,7 +81,7 @@ CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www/cherokee \
 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
+		cherokee-tweak.1 cherokee-worker.1 
 PORTDOCS=	*
 
 OPTIONS=	IPV6	  "IPv6 support"	on	\
@@ -201,15 +200,11 @@ post-patch:
 	@${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/|}
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index c103f4e67a3a..9ed0bfbb6c9b 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cherokee-1.2.2.tar.gz) = 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475
-SIZE (cherokee-1.2.2.tar.gz) = 6108853
+SHA256 (cherokee-1.2.101.tar.gz) = ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
+SIZE (cherokee-1.2.101.tar.gz) = 6320209
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 1c86f1ee129c..6c3b9bd0c5b4 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -197,6 +197,7 @@ share/aclocal/cherokee.m4
 %%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/Auth.py
 %%ADMIN%%%%DATADIR%%/admin/Auth.pyc
 %%ADMIN%%%%DATADIR%%/admin/Balancer.py
@@ -333,6 +334,8 @@ share/aclocal/cherokee.m4
 %%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
@@ -380,6 +383,7 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-error.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-information.png
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-warning.png
+%%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/loader.gif
@@ -403,6 +407,8 @@ share/aclocal/cherokee.m4
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Help.js
 %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Submitter.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.cookie.js
@@ -414,6 +420,8 @@ share/aclocal/cherokee.m4
 %%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
@@ -916,6 +924,8 @@ 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
@@ -963,6 +973,10 @@ 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
@@ -1028,6 +1042,8 @@ www/cherokee/index.html
 @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
 @dirrm %%DATADIR%%/themes/white
 @dirrm %%DATADIR%%/themes/plain
 @dirrm %%DATADIR%%/themes/firefox3