Update viewvc package to 1.1.11.

Significant changes from version 1.0 include:

  * Pluggable, Python-based authorization subsystem
  * Support for path-based authorization, including parsing and honoring
    Subversion authz configuration files
  * Support for per-virtual host and per-root configurations
  * Template improvements

7 files changed, 203 insertions, 160 deletions

diff --git a/www/viewvc/MESSAGE b/www/viewvc/MESSAGE
new file mode 100644
index 00000000000..13bf687e728
--- /dev/null
+++ b/www/viewvc/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2011/11/01 21:08:55 scottr Exp $
+
+If you are upgrading from a previous version of viewvc, you must update
+your configuration. For more information, check the ViewVC FAQ:
+
+  http://www.viewvc.org/faq.html
+
+===========================================================================
diff --git a/www/viewvc/Makefile b/www/viewvc/Makefile
index 24fb815b12c..03bf918e74f 100644
--- a/www/viewvc/Makefile
+++ b/www/viewvc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/12/25 15:00:36 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2011/11/01 21:08:55 scottr Exp $
 #
 
-DISTNAME=	viewvc-1.0.12
+DISTNAME=	viewvc-1.1.11
 CATEGORIES=	devel www
-MASTER_SITES=	# http://viewvc.tigris.org/files/documents/3330/47621/
+MASTER_SITES=	# http://viewvc.tigris.org/files/documents/3330/49022/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.viewvc.org/
@@ -35,7 +35,8 @@ CONF_FILES+=	${PREFIX}/share/examples/viewvc/cvsgraph.conf \
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_MESSAGE.conf=	Fixing configuration files.
-SUBST_FILES.conf=	viewvc.conf.dist
+SUBST_FILES.conf=	conf/viewvc.conf.dist
+SUBST_FILES.conf+=	conf/cvsgraph.conf.dist
 SUBST_SED.conf=		-e "s|@VIEWVCDIR@|${VIEWVCDIR}|g"
 SUBST_SED.conf+=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_SED.conf+=	-e "s|@PHP_OPT@|${PHP_OPT}|g"
@@ -56,9 +57,9 @@ do-install:
 		${PYTHONBIN} \
 		viewvc-install --prefix=${PREFIX}/${VIEWVCDIR} --destdir=${DESTDIR})
 
-	${INSTALL_DATA} ${WRKSRC}/viewvc.conf.dist \
+	${INSTALL_DATA} ${WRKSRC}/conf/viewvc.conf.dist \
 		${DESTDIR}${PREFIX}/share/examples/viewvc/viewvc.conf
-	${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf.dist \
+	${INSTALL_DATA} ${WRKSRC}/conf/cvsgraph.conf.dist \
 		${DESTDIR}${PREFIX}/share/examples/viewvc/cvsgraph.conf
 
 post-install:
diff --git a/www/viewvc/PLIST b/www/viewvc/PLIST
index 29f428123b6..5f96262f1aa 100644
--- a/www/viewvc/PLIST
+++ b/www/viewvc/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:39 joerg Exp $
-share/examples/viewvc/viewvc.conf
+@comment $NetBSD: PLIST,v 1.4 2011/11/01 21:08:55 scottr Exp $
 share/examples/viewvc/cvsgraph.conf
+share/examples/viewvc/viewvc.conf
 ${VIEWVCDIR}/bin/cgi/query.cgi
 ${VIEWVCDIR}/bin/cgi/viewvc.cgi
 ${VIEWVCDIR}/bin/cvsdbadmin
@@ -12,6 +12,10 @@ ${VIEWVCDIR}/bin/mod_python/query.py
 ${VIEWVCDIR}/bin/mod_python/viewvc.py
 ${VIEWVCDIR}/bin/standalone.py
 ${VIEWVCDIR}/bin/svndbadmin
+${VIEWVCDIR}/bin/wsgi/query.fcgi
+${VIEWVCDIR}/bin/wsgi/query.wsgi
+${VIEWVCDIR}/bin/wsgi/viewvc.fcgi
+${VIEWVCDIR}/bin/wsgi/viewvc.wsgi
 ${VIEWVCDIR}/lib/PyFontify.py
 ${VIEWVCDIR}/lib/PyFontify.pyc
 ${VIEWVCDIR}/lib/accept.py
@@ -44,14 +48,24 @@ ${VIEWVCDIR}/lib/query.py
 ${VIEWVCDIR}/lib/query.pyc
 ${VIEWVCDIR}/lib/sapi.py
 ${VIEWVCDIR}/lib/sapi.pyc
+${VIEWVCDIR}/lib/vcauth/__init__.py
+${VIEWVCDIR}/lib/vcauth/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/forbidden/__init__.py
+${VIEWVCDIR}/lib/vcauth/forbidden/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/forbiddenre/__init__.py
+${VIEWVCDIR}/lib/vcauth/forbiddenre/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/svnauthz/__init__.py
+${VIEWVCDIR}/lib/vcauth/svnauthz/__init__.pyc
 ${VIEWVCDIR}/lib/vclib/__init__.py
 ${VIEWVCDIR}/lib/vclib/__init__.pyc
-${VIEWVCDIR}/lib/vclib/bincvs/__init__.py
-${VIEWVCDIR}/lib/vclib/bincvs/__init__.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/__init__.py
 ${VIEWVCDIR}/lib/vclib/ccvs/__init__.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/bincvs.py
+${VIEWVCDIR}/lib/vclib/ccvs/bincvs.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/blame.py
 ${VIEWVCDIR}/lib/vclib/ccvs/blame.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/ccvs.py
+${VIEWVCDIR}/lib/vclib/ccvs/ccvs.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__init__.py
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__init__.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.py
@@ -60,78 +74,74 @@ ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/debug.py
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/debug.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/default.py
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/default.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/parse_rcs_file.py
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/parse_rcs_file.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/run-tests.py
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/run-tests.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/default,v
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/default.out
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/empty-file,v
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/empty-file.out
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/texttools.py
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/texttools.pyc
 ${VIEWVCDIR}/lib/vclib/svn/__init__.py
 ${VIEWVCDIR}/lib/vclib/svn/__init__.pyc
-${VIEWVCDIR}/lib/vclib/svn_ra/__init__.py
-${VIEWVCDIR}/lib/vclib/svn_ra/__init__.pyc
+${VIEWVCDIR}/lib/vclib/svn/svn_ra.py
+${VIEWVCDIR}/lib/vclib/svn/svn_ra.pyc
+${VIEWVCDIR}/lib/vclib/svn/svn_repos.py
+${VIEWVCDIR}/lib/vclib/svn/svn_repos.pyc
 ${VIEWVCDIR}/lib/viewvc.py
 ${VIEWVCDIR}/lib/viewvc.pyc
 ${VIEWVCDIR}/lib/win32popen.py
 ${VIEWVCDIR}/lib/win32popen.pyc
-${VIEWVCDIR}/templates/annotate.ezt
-${VIEWVCDIR}/templates/diff.ezt
-${VIEWVCDIR}/templates/dir_new.ezt
-${VIEWVCDIR}/templates/directory.ezt
-${VIEWVCDIR}/templates/docroot/help.css
-${VIEWVCDIR}/templates/docroot/help_dirview.html
-${VIEWVCDIR}/templates/docroot/help_log.html
-${VIEWVCDIR}/templates/docroot/help_query.html
-${VIEWVCDIR}/templates/docroot/help_rootview.html
-${VIEWVCDIR}/templates/docroot/images/annotate.png
-${VIEWVCDIR}/templates/docroot/images/back.png
-${VIEWVCDIR}/templates/docroot/images/back_small.png
-${VIEWVCDIR}/templates/docroot/images/broken.png
-${VIEWVCDIR}/templates/docroot/images/chalk.jpg
-${VIEWVCDIR}/templates/docroot/images/cvsgraph_16x16.png
-${VIEWVCDIR}/templates/docroot/images/cvsgraph_32x32.png
-${VIEWVCDIR}/templates/docroot/images/diff.png
-${VIEWVCDIR}/templates/docroot/images/dir.png
-${VIEWVCDIR}/templates/docroot/images/down.png
-${VIEWVCDIR}/templates/docroot/images/download.png
-${VIEWVCDIR}/templates/docroot/images/feed-icon-16x16.jpg
-${VIEWVCDIR}/templates/docroot/images/forward.png
-${VIEWVCDIR}/templates/docroot/images/list.png
-${VIEWVCDIR}/templates/docroot/images/log.png
-${VIEWVCDIR}/templates/docroot/images/logo.png
-${VIEWVCDIR}/templates/docroot/images/text.png
-${VIEWVCDIR}/templates/docroot/images/up.png
-${VIEWVCDIR}/templates/docroot/images/view.png
-${VIEWVCDIR}/templates/docroot/styles.css
-${VIEWVCDIR}/templates/error.ezt
-${VIEWVCDIR}/templates/graph.ezt
-${VIEWVCDIR}/templates/include/diff_form.ezt
-${VIEWVCDIR}/templates/include/dir_footer.ezt
-${VIEWVCDIR}/templates/include/dir_header.ezt
-${VIEWVCDIR}/templates/include/file_header.ezt
-${VIEWVCDIR}/templates/include/footer.ezt
-${VIEWVCDIR}/templates/include/header.ezt
-${VIEWVCDIR}/templates/include/log_footer.ezt
-${VIEWVCDIR}/templates/include/log_header.ezt
-${VIEWVCDIR}/templates/include/paging.ezt
-${VIEWVCDIR}/templates/include/pathrev_form.ezt
-${VIEWVCDIR}/templates/include/sort.ezt
-${VIEWVCDIR}/templates/log.ezt
-${VIEWVCDIR}/templates/log_table.ezt
-${VIEWVCDIR}/templates/markup.ezt
-${VIEWVCDIR}/templates/query.ezt
-${VIEWVCDIR}/templates/query_form.ezt
-${VIEWVCDIR}/templates/query_results.ezt
-${VIEWVCDIR}/templates/revision.ezt
-${VIEWVCDIR}/templates/roots.ezt
-${VIEWVCDIR}/templates/rss.ezt
 ${VIEWVCDIR}/templates-contrib/README
+${VIEWVCDIR}/templates-contrib/newvc/README
+${VIEWVCDIR}/templates-contrib/newvc/templates/diff.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/directory.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help.css
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_dirview.html
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_log.html
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_query.html
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_rootview.html
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/back.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/back_small.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/broken.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/cvs-logo.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/dir.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/down.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/feed-icon-16x16.jpg
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/forward.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/svn-logo.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/text.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/up.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/viewvc-logo.png
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/scripts.js
+${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/styles.css
+${VIEWVCDIR}/templates-contrib/newvc/templates/error.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/file.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/graph.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/include/diff_form.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/include/fileview.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/include/footer.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/include/header.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/include/pathrev_form.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/include/props.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/log.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/markup.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/query.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/query_form.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/query_results.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/revision.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/roots.ezt
+${VIEWVCDIR}/templates-contrib/newvc/templates/rss.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/INSTALL
 ${VIEWVCDIR}/templates-contrib/viewsvn/README
-${VIEWVCDIR}/templates-contrib/viewsvn/extras/fix-blame-output.diff
 ${VIEWVCDIR}/templates-contrib/viewsvn/extras/svnindex.css
 ${VIEWVCDIR}/templates-contrib/viewsvn/extras/svnindex.xsl
 ${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/diff.png
 ${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/dir.png
 ${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/log.png
 ${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/markup.png
-${VIEWVCDIR}/templates-contrib/viewsvn/templates/annotate.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/diff.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/directory.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/broken.png
@@ -159,7 +169,7 @@ ${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/up.png
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/viewvc.png
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/styles.css
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/error.ezt
-${VIEWVCDIR}/templates-contrib/viewsvn/templates/graph.ezt
+${VIEWVCDIR}/templates-contrib/viewsvn/templates/file.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/diff_form.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/dir_footer.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/dir_header.ezt
@@ -170,11 +180,64 @@ ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/log_footer.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/log_header.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/paging.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/pathrev_form.ezt
+${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/props.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/log.ezt
-${VIEWVCDIR}/templates-contrib/viewsvn/templates/markup.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/query.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/query_form.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/query_results.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/revision.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/roots.ezt
 ${VIEWVCDIR}/templates-contrib/viewsvn/templates/rss.ezt
+${VIEWVCDIR}/templates/diff.ezt
+${VIEWVCDIR}/templates/dir_new.ezt
+${VIEWVCDIR}/templates/directory.ezt
+${VIEWVCDIR}/templates/docroot/help.css
+${VIEWVCDIR}/templates/docroot/help_dirview.html
+${VIEWVCDIR}/templates/docroot/help_log.html
+${VIEWVCDIR}/templates/docroot/help_query.html
+${VIEWVCDIR}/templates/docroot/help_rootview.html
+${VIEWVCDIR}/templates/docroot/images/annotate.png
+${VIEWVCDIR}/templates/docroot/images/back.png
+${VIEWVCDIR}/templates/docroot/images/back_small.png
+${VIEWVCDIR}/templates/docroot/images/broken.png
+${VIEWVCDIR}/templates/docroot/images/chalk.jpg
+${VIEWVCDIR}/templates/docroot/images/cvsgraph_16x16.png
+${VIEWVCDIR}/templates/docroot/images/cvsgraph_32x32.png
+${VIEWVCDIR}/templates/docroot/images/diff.png
+${VIEWVCDIR}/templates/docroot/images/dir.png
+${VIEWVCDIR}/templates/docroot/images/down.png
+${VIEWVCDIR}/templates/docroot/images/download.png
+${VIEWVCDIR}/templates/docroot/images/favicon.ico
+${VIEWVCDIR}/templates/docroot/images/feed-icon-16x16.jpg
+${VIEWVCDIR}/templates/docroot/images/forward.png
+${VIEWVCDIR}/templates/docroot/images/list.png
+${VIEWVCDIR}/templates/docroot/images/lock.png
+${VIEWVCDIR}/templates/docroot/images/log.png
+${VIEWVCDIR}/templates/docroot/images/text.png
+${VIEWVCDIR}/templates/docroot/images/up.png
+${VIEWVCDIR}/templates/docroot/images/view.png
+${VIEWVCDIR}/templates/docroot/images/viewvc-logo.png
+${VIEWVCDIR}/templates/docroot/styles.css
+${VIEWVCDIR}/templates/error.ezt
+${VIEWVCDIR}/templates/file.ezt
+${VIEWVCDIR}/templates/graph.ezt
+${VIEWVCDIR}/templates/include/diff_form.ezt
+${VIEWVCDIR}/templates/include/dir_footer.ezt
+${VIEWVCDIR}/templates/include/dir_header.ezt
+${VIEWVCDIR}/templates/include/file_header.ezt
+${VIEWVCDIR}/templates/include/footer.ezt
+${VIEWVCDIR}/templates/include/header.ezt
+${VIEWVCDIR}/templates/include/log_footer.ezt
+${VIEWVCDIR}/templates/include/log_header.ezt
+${VIEWVCDIR}/templates/include/paging.ezt
+${VIEWVCDIR}/templates/include/pathrev_form.ezt
+${VIEWVCDIR}/templates/include/props.ezt
+${VIEWVCDIR}/templates/include/sort.ezt
+${VIEWVCDIR}/templates/log.ezt
+${VIEWVCDIR}/templates/log_table.ezt
+${VIEWVCDIR}/templates/query.ezt
+${VIEWVCDIR}/templates/query_form.ezt
+${VIEWVCDIR}/templates/query_results.ezt
+${VIEWVCDIR}/templates/revision.ezt
+${VIEWVCDIR}/templates/roots.ezt
+${VIEWVCDIR}/templates/rss.ezt
diff --git a/www/viewvc/distinfo b/www/viewvc/distinfo
index 5b56440e7f9..113db694d0b 100644
--- a/www/viewvc/distinfo
+++ b/www/viewvc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2010/12/25 15:00:36 wiz Exp $
+$NetBSD: distinfo,v 1.10 2011/11/01 21:08:55 scottr Exp $
 
-SHA1 (viewvc-1.0.12.tar.gz) = 069ae5239b3085136082fcd88bde57d9c6b784ac
-RMD160 (viewvc-1.0.12.tar.gz) = 787de2b623b0035de277af3de4eac5d383be4044
-Size (viewvc-1.0.12.tar.gz) = 523289 bytes
-SHA1 (patch-aa) = b4f5e36e5d744249aec8128d6ccaa670398afafe
-SHA1 (patch-ab) = cf4c56e5b4254d0deb1a7b51121b6b1d2113fd3e
+SHA1 (viewvc-1.1.11.tar.gz) = 222765d9b4d922ec2066ddd8dcad1238ebdad687
+RMD160 (viewvc-1.1.11.tar.gz) = ae2dd6a23d926d947ed09e9ad6ebe3a62e059243
+Size (viewvc-1.1.11.tar.gz) = 603863 bytes
+SHA1 (patch-aa) = ff0a6e52ea66c838ba3ab7b1d055c27bf561a376
+SHA1 (patch-ab) = f5abf6bd824d121338882423c34e3464c8ba5fd4
diff --git a/www/viewvc/options.mk b/www/viewvc/options.mk
index ba0ce693da0..d29781b885c 100644
--- a/www/viewvc/options.mk
+++ b/www/viewvc/options.mk
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/10/21 09:05:44 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2011/11/01 21:08:55 scottr Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.viewvc
 
-PKG_SUPPORTED_OPTIONS=	cvsgraph viewvc-php
+PKG_SUPPORTED_OPTIONS=	cvsgraph
 
 .include "../../mk/bsd.options.mk"
-.include "../../lang/php/phpversion.mk"
 
 ###
 ### Use cvsgraph for printing pretty little pictures
@@ -16,13 +15,3 @@ CVSGRAPH_OPT=		1
 .else
 CVSGRAPH_OPT=		0
 .endif
-
-###
-### Use php to colorize .php and .inc files
-###
-.if !empty(PKG_OPTIONS:Mviewvc-php)
-.include "${PHPPKGSRCDIR}/buildlink3.mk"
-PHP_OPT=		1
-.else
-PHP_OPT=		0
-.endif
diff --git a/www/viewvc/patches/patch-aa b/www/viewvc/patches/patch-aa
index cf45f27542f..c06abdf473b 100644
--- a/www/viewvc/patches/patch-aa
+++ b/www/viewvc/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2008/10/21 20:46:28 adrianp Exp $
+$NetBSD: patch-aa,v 1.5 2011/11/01 21:08:55 scottr Exp $
 
---- viewvc-install.orig	2007-05-03 19:03:36.000000000 +0100
-+++ viewvc-install
-@@ -58,10 +58,6 @@ FILE_INFO_LIST = [
+--- viewvc-install.orig	2010-09-07 14:20:22.000000000 -0500
++++ viewvc-install	2011-10-17 14:52:40.000000000 -0500
+@@ -62,12 +62,6 @@
      ("bin/cvsdbadmin",            "bin/cvsdbadmin",            0755, 1, 0, 0),
      ("bin/svndbadmin",            "bin/svndbadmin",            0755, 1, 0, 0),
      ("bin/make-database",         "bin/make-database",         0755, 1, 0, 0),
--    ("viewvc.conf.dist",          "viewvc.conf.dist",          0644, 0, 0, 0),
--    ("viewvc.conf.dist",          "viewvc.conf",               0644, 0, 1, 0),
--    ("cvsgraph.conf.dist",        "cvsgraph.conf.dist",        0644, 0, 0, 0),
--    ("cvsgraph.conf.dist",        "cvsgraph.conf",             0644, 0, 1, 0),
+-    ("conf/viewvc.conf.dist",     "viewvc.conf.dist",          0644, 0, 0, 0),
+-    ("conf/viewvc.conf.dist",     "viewvc.conf",               0644, 0, 1, 0),
+-    ("conf/cvsgraph.conf.dist",   "cvsgraph.conf.dist",        0644, 0, 0, 0),
+-    ("conf/cvsgraph.conf.dist",   "cvsgraph.conf",             0644, 0, 1, 0),
+-    ("conf/mimetypes.conf.dist",  "mimetypes.conf.dist",       0644, 0, 0, 0),
+-    ("conf/mimetypes.conf.dist",  "mimetypes.conf",            0644, 0, 1, 0),
      ]
  if sys.platform == "win32":
    FILE_INFO_LIST.extend([
diff --git a/www/viewvc/patches/patch-ab b/www/viewvc/patches/patch-ab
index 6b6aa5efc75..8d969c11a67 100644
--- a/www/viewvc/patches/patch-ab
+++ b/www/viewvc/patches/patch-ab
@@ -1,73 +1,52 @@
-$NetBSD: patch-ab,v 1.2 2008/10/21 20:46:28 adrianp Exp $
+$NetBSD: patch-ab,v 1.3 2011/11/01 21:08:55 scottr Exp $
 
---- viewvc.conf.dist.orig	2008-02-25 20:47:24.000000000 +0000
-+++ viewvc.conf.dist
-@@ -105,6 +105,7 @@ cvs_roots = cvs: /home/cvsroot
- default_root = cvs
- 
- # uncomment if the RCS binaries are not on the standard path
-+rcs_path = @RCS_PREFIX@/bin/
- #rcs_path = /usr/bin/
- 
- # ViewVC can use CVSNT (www.cvsnt.org) instead of the RCS 
-@@ -125,7 +126,8 @@ default_root = cvs
- use_rcsparse = 0
- 
- # uncomment if the svn command-line utilities are not on the standard path
--#svn_path = /usr/bin/
-+#svn_path = @PREFIX@/bin/
-+svn_path = @PREFIX@/bin/
- 
- #
- # This is a pathname to a MIME types file to help viewvc to guess the
-@@ -135,7 +137,7 @@ use_rcsparse = 0
- # uncomment this option and point it at a MIME type file.
- #
- # For example, you can use the mime.types from apache here:
--#mime_types_file = /usr/local/apache/conf/mime.types
+--- conf/viewvc.conf.dist.orig	2011-04-20 09:56:39.000000000 -0500
++++ conf/viewvc.conf.dist	2011-10-31 21:43:19.000000000 -0500
+@@ -186,6 +186,7 @@
+ ##                    /usr/local/apache2/conf/mime.types
+ ##
+ #mime_types_files = mimetypes.conf
 +#mime_types_file = @PREFIX@/etc/httpd/mime.types
  
- # This address is shown in the footer of the generated pages. 
- # It must be replaced with the address of the local repository maintainer.
-@@ -495,14 +497,14 @@ highlight_line_numbers = 1
- highlight_convert_tabs = 2
- 
- # use php to colorize .php and .inc files?
--use_php = 0
-+use_php = @PHP_OPT@
- 
- # path to php executable
- # (This should be set to the path of a PHP CLI executable, not the path
- # to a CGI executable. If you use a CGI executable, you may see "no input file
- # specified" or "force-cgi-redirect" errors instead of colorized source. The
- # output of "php -v" tells you whether an given executable is CLI or CGI.)
--php_exe_path = php
-+php_exe_path = @PREFIX@/bin/php
- # php_exe_path = /usr/local/bin/php
- # php_exe_path = C:\Program Files\php\cli\php.exe
- 
-@@ -510,20 +512,20 @@ php_exe_path = php
- # Use CvsGraph. See http://www.akhphd.au.dk/~bertho/cvsgraph/ for
- # documentation and download. 
- #
--use_cvsgraph = 0
+ ## address: The address of the local repository maintainer.  (This
+ ## option is provided only as a convenience for ViewVC installations
+@@ -280,6 +281,7 @@
+ ## rcs_dir = /usr/bin/
+ ##
+ #rcs_dir =
++rcs_dir = @RCS_PREFIX@/bin/
+ 
+ ## cvsnt: Location of cvsnt program.  ViewVC can use CVSNT (www.cvsnt.org)
+ ## instead of the RCS utilities to retrieve information from CVS
+@@ -302,6 +304,7 @@
+ ## svn = /usr/bin/svn
+ ##
+ #svn =
++svn = @PREFIX@/bin/
+ 
+ ## diff: Location of the GNU diff program, used for showing file
+ ## version differences.
+@@ -317,7 +320,7 @@
+ ## Example:
+ ## cvsgraph = /usr/local/bin/cvsgraph
+ ##
+-#cvsgraph =
++cvsgraph = @PREFIX@/bin/
+ 
+ 
+ ##---------------------------------------------------------------------------
+@@ -622,12 +625,14 @@
+ ## use_cvsgraph: Use CvsGraph to offer visual graphs of CVS revision history.
+ ##
+ #use_cvsgraph = 0
 +use_cvsgraph = @CVSGRAPH_OPT@
- # use_cvsgraph = 1
- 
- #
- # if the cvsgraph program is not on the path, set this value
- #
--cvsgraph_path =
--# cvsgraph_path = /usr/local/bin/
-+cvsgraph_path = @PREFIX@/bin/
-+# cvsgraph_path = @PREFIX@/bin/
  
- #
- # Location of the customized cvsgraph configuration file.  
- # You will need an absolute pathname here:
- #
--cvsgraph_conf = cvsgraph.conf
+ ## cvsgraph_conf: Location of the customized cvsgraph configuration file.
+ ## May be specified as an absolute path or as a path relative to this
+ ## configuration file.
+ ##
+ #cvsgraph_conf = cvsgraph.conf
 +cvsgraph_conf = @PREFIX@/@VIEWVCDIR@/cvsgraph.conf
  
- #
- # Set to enable regular expression search of all files in a directory
+ ## use_re_search: Enable regular expression search of files in a directory.
+ ##