link my recent packages. fix cherokee to make cherokee-admin work again.

[Gianni D'Aprile <giannidaprile+pkgsrc-wip%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Gianni D'Aprile <giannidaprile+pkgsrc-wip%gmail.com@localhost>
Pushed By:	giannidaprile
Date:		Tue Jan 5 18:28:07 2016 -0600
Changeset:	c625ffa9823dbbe0657fe627d02e51065cc0d0fc

Modified Files:
	Makefile
	cherokee/Makefile
	cherokee/distinfo
	cherokee/patches/patch-admin_wizards_php.py
	cherokee/patches/patch-autogen.sh
	cherokee/patches/patch-cherokee_main__admin.c
	cherokee/patches/patch-po_admin_generate__POTFILESin.py

Log Message:
link my recent packages.  fix cherokee to make cherokee-admin work again.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c625ffa9823dbbe0657fe627d02e51065cc0d0fc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                                |  3 +++
 cherokee/Makefile                                       |  6 ++++--
 cherokee/distinfo                                       | 14 +++++++-------
 cherokee/patches/patch-admin_wizards_php.py             |  2 +-
 cherokee/patches/patch-autogen.sh                       |  2 +-
 cherokee/patches/patch-cherokee_main__admin.c           |  2 +-
 cherokee/patches/patch-po_admin_generate__POTFILESin.py |  4 ++--
 7 files changed, 19 insertions(+), 14 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index ba39db8..45b7eb1 100755
--- a/Makefile
+++ b/Makefile
@@ -2277,6 +2277,7 @@ SUBDIR+=	p5-mha4mysql-node
 SUBDIR+=	p5-mozldap
 SUBDIR+=	p5-qt3
 SUBDIR+=	p5-spf-policyd
+SUBDIR+=	p5-xmlsig
 SUBDIR+=	packman
 SUBDIR+=	pagetools
 SUBDIR+=	pal
@@ -3877,6 +3878,7 @@ SUBDIR+=	tuxguitar
 SUBDIR+=	tuxpaint-cvs
 SUBDIR+=	tuxtype2
 SUBDIR+=	tvmet
+SUBDIR+=	twemproxy
 SUBDIR+=	twinkle
 SUBDIR+=	twintk
 SUBDIR+=	twitim
@@ -3958,6 +3960,7 @@ SUBDIR+=	vlevel
 SUBDIR+=	vm-pop3d
 SUBDIR+=	vmsbackup
 SUBDIR+=	vncselector
+SUBDIR+=	vpnc
 SUBDIR+=	vpnc-svn
 SUBDIR+=	vpr
 SUBDIR+=	vreng
diff --git a/cherokee/Makefile b/cherokee/Makefile
index 9e47270..6e35fe4 100644
--- a/cherokee/Makefile
+++ b/cherokee/Makefile
@@ -4,10 +4,11 @@
 PKGNAME=	cherokee-1.2.104
 GIT_COMMIT=	a917d76ed9b4272478ca973084ec1037a950c443
 DISTNAME=	${PKGNAME}-${GIT_COMMIT}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	-https://github.com/cherokee/webserver/archive/${GIT_COMMIT}.tar.gz
 
-MAINTAINER=	gianni-pkgsrc-wio%daprile.net@localhost
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.cherokee-project.com/
 COMMENT=	Flexible and fast web server
 LICENSE=	gnu-gpl-v2
@@ -54,7 +55,8 @@ SUBST_MESSAGE.python= 	Fixing Python references
 SUBST_FILES.python= 	po/admin/generate_POTFILESin.py
 SUBST_VARS.python= 	PYTHONBIN
 
-REPLACE_PYTHON= 	cherokee/cherokee-admin-launcher \
+REPLACE_PYTHON= 	admin/server.py \
+			cherokee/cherokee-admin-launcher \
 			cherokee/cherokee-tweak
 
 # Needs installation:
diff --git a/cherokee/distinfo b/cherokee/distinfo
index 95d1e4a..24fc5f0 100644
--- a/cherokee/distinfo
+++ b/cherokee/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (cherokee-1.2.104-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = 3b9ee1f48003ec75b68eeb09cfc0e751f1758658
-RMD160 (cherokee-1.2.104-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = ca1a78b2350814e492469146458f1afdcb3dfe6a
-Size (cherokee-1.2.104-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = 5313230 bytes
-SHA1 (patch-admin_wizards_php.py) = ee0cbb2f728889a57dad3712aa7d355b5c6473a8
-SHA1 (patch-autogen.sh) = 7bb7456f85bd90dd23370e2b58812d27367486b5
-SHA1 (patch-cherokee_main__admin.c) = 18fab221ca914038822457a904af322813d8acd8
-SHA1 (patch-po_admin_generate__POTFILESin.py) = badfafc7f9d002923fb8d5b1fc5d38a2e6a3146d
+SHA1 (cherokee-1.2.104nb1-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = 3b9ee1f48003ec75b68eeb09cfc0e751f1758658
+RMD160 (cherokee-1.2.104nb1-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = ca1a78b2350814e492469146458f1afdcb3dfe6a
+Size (cherokee-1.2.104nb1-a917d76ed9b4272478ca973084ec1037a950c443.tar.gz) = 5313230 bytes
+SHA1 (patch-admin_wizards_php.py) = 360cab90695efa1dfaf4295c3c124e6634302655
+SHA1 (patch-autogen.sh) = eb21f6ba7e9b4dc865be0009aae55ea09bc19822
+SHA1 (patch-cherokee_main__admin.c) = 3c648df7bc5e4d35c89e7232caf990cda416f2a9
+SHA1 (patch-po_admin_generate__POTFILESin.py) = 3fb0aeffe739f3b15a2ccd6d64fc5106402b4aff
diff --git a/cherokee/patches/patch-admin_wizards_php.py b/cherokee/patches/patch-admin_wizards_php.py
index c8f2d0f..9e592d5 100644
--- a/cherokee/patches/patch-admin_wizards_php.py
+++ b/cherokee/patches/patch-admin_wizards_php.py
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- admin/wizards/php.py.orig	2014-10-17 17:20:36.000000000 +0000
+--- admin/wizards/php.py.orig	2014-12-10 12:35:45.000000000 +0000
 +++ admin/wizards/php.py
 @@ -88,7 +88,8 @@ STD_ETC_PATHS = ['/etc/php.ini',
                   '/opt/local/etc/php*/php.ini',
diff --git a/cherokee/patches/patch-autogen.sh b/cherokee/patches/patch-autogen.sh
index 8c7970d..a2612a3 100644
--- a/cherokee/patches/patch-autogen.sh
+++ b/cherokee/patches/patch-autogen.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- autogen.sh.orig	2014-10-17 17:20:36.000000000 +0000
+--- autogen.sh.orig	2014-12-10 12:35:45.000000000 +0000
 +++ autogen.sh
 @@ -29,14 +29,8 @@ test -z "$AUTOMAKE" && AUTOMAKE=automake
  test -z "$ACLOCAL" && ACLOCAL=aclocal
diff --git a/cherokee/patches/patch-cherokee_main__admin.c b/cherokee/patches/patch-cherokee_main__admin.c
index 5b7aa87..f780926 100644
--- a/cherokee/patches/patch-cherokee_main__admin.c
+++ b/cherokee/patches/patch-cherokee_main__admin.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- cherokee/main_admin.c.orig	2014-10-17 17:20:36.000000000 +0000
+--- cherokee/main_admin.c.orig	2014-12-10 12:35:45.000000000 +0000
 +++ cherokee/main_admin.c
 @@ -556,7 +556,7 @@ check_for_python (void)
  	int         re;
diff --git a/cherokee/patches/patch-po_admin_generate__POTFILESin.py b/cherokee/patches/patch-po_admin_generate__POTFILESin.py
index d4148ed..c3bfe92 100644
--- a/cherokee/patches/patch-po_admin_generate__POTFILESin.py
+++ b/cherokee/patches/patch-po_admin_generate__POTFILESin.py
@@ -1,10 +1,10 @@
 $NetBSD$
 
---- po/admin/generate_POTFILESin.py.orig	2014-10-17 17:20:36.000000000 +0000
+--- po/admin/generate_POTFILESin.py.orig	2014-12-10 12:35:45.000000000 +0000
 +++ po/admin/generate_POTFILESin.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2
-+#!@PYTHONBIN@
++#!/usr/pkg/bin/python2.7
  
  # Cherokee POTFILES.in generator
  #