Tue Nov 1 21:08:55 2011 UTC ()
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


(scottr)
diff -r0 -r1.1 pkgsrc/www/viewvc/MESSAGE
diff -r1.14 -r1.15 pkgsrc/www/viewvc/Makefile
diff -r1.3 -r1.4 pkgsrc/www/viewvc/PLIST
diff -r1.9 -r1.10 pkgsrc/www/viewvc/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/www/viewvc/options.mk
diff -r1.4 -r1.5 pkgsrc/www/viewvc/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/www/viewvc/patches/patch-ab
File Added: pkgsrc/www/viewvc/MESSAGE
===========================================================================
$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

===========================================================================
cvs diff -r1.14 -r1.15 pkgsrc/www/viewvc/Makefile (expand / switch to unified diff)

--- pkgsrc/www/viewvc/Makefile 2010/12/25 15:00:36 1.14
+++ pkgsrc/www/viewvc/Makefile 2011/11/01 21:08:55 1.15
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.14 2010/12/25 15:00:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2011/11/01 21:08:55 scottr Exp $
2# 2#
3 3
4DISTNAME= viewvc-1.0.12 4DISTNAME= viewvc-1.1.11
5CATEGORIES= devel www 5CATEGORIES= devel www
6MASTER_SITES= # http://viewvc.tigris.org/files/documents/3330/47621/ 6MASTER_SITES= # http://viewvc.tigris.org/files/documents/3330/49022/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.viewvc.org/ 9HOMEPAGE= http://www.viewvc.org/
10COMMENT= Viewing the content of CVS/SVN repositories with a Webbrowser 10COMMENT= Viewing the content of CVS/SVN repositories with a Webbrowser
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15PYTHON_PATCH_SCRIPTS= viewvc-install bin/* bin/cgi/*.cgi lib/*.py 15PYTHON_PATCH_SCRIPTS= viewvc-install bin/* bin/cgi/*.cgi lib/*.py
16 16
17.if !exists(/usr/bin/rlog) 17.if !exists(/usr/bin/rlog)
18DEPENDS+= rcs-[0-9]*:../../devel/rcs 18DEPENDS+= rcs-[0-9]*:../../devel/rcs
19RCS_PKG= YES 19RCS_PKG= YES
@@ -25,47 +25,48 @@ NO_BUILD= YES @@ -25,47 +25,48 @@ NO_BUILD= YES
25VIEWVCDIR= share/viewvc 25VIEWVCDIR= share/viewvc
26PLIST_SUBST+= VIEWVCDIR=${VIEWVCDIR:Q} 26PLIST_SUBST+= VIEWVCDIR=${VIEWVCDIR:Q}
27 27
28CONF_FILES= ${PREFIX}/share/examples/viewvc/viewvc.conf \ 28CONF_FILES= ${PREFIX}/share/examples/viewvc/viewvc.conf \
29 ${PREFIX}/${VIEWVCDIR:Q}/viewvc.conf 29 ${PREFIX}/${VIEWVCDIR:Q}/viewvc.conf
30CONF_FILES+= ${PREFIX}/share/examples/viewvc/cvsgraph.conf \ 30CONF_FILES+= ${PREFIX}/share/examples/viewvc/cvsgraph.conf \
31 ${PREFIX}/${VIEWVCDIR:Q}/cvsgraph.conf 31 ${PREFIX}/${VIEWVCDIR:Q}/cvsgraph.conf
32 32
33.include "options.mk" 33.include "options.mk"
34 34
35SUBST_CLASSES+= conf 35SUBST_CLASSES+= conf
36SUBST_STAGE.conf= post-patch 36SUBST_STAGE.conf= post-patch
37SUBST_MESSAGE.conf= Fixing configuration files. 37SUBST_MESSAGE.conf= Fixing configuration files.
38SUBST_FILES.conf= viewvc.conf.dist 38SUBST_FILES.conf= conf/viewvc.conf.dist
 39SUBST_FILES.conf+= conf/cvsgraph.conf.dist
39SUBST_SED.conf= -e "s|@VIEWVCDIR@|${VIEWVCDIR}|g" 40SUBST_SED.conf= -e "s|@VIEWVCDIR@|${VIEWVCDIR}|g"
40SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" 41SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g"
41SUBST_SED.conf+= -e "s|@PHP_OPT@|${PHP_OPT}|g" 42SUBST_SED.conf+= -e "s|@PHP_OPT@|${PHP_OPT}|g"
42SUBST_SED.conf+= -e "s|@CVSGRAPH_OPT@|${CVSGRAPH_OPT}|g" 43SUBST_SED.conf+= -e "s|@CVSGRAPH_OPT@|${CVSGRAPH_OPT}|g"
43 44
44.if defined(RCS_PKG) && ${RCS_PKG} == "YES" 45.if defined(RCS_PKG) && ${RCS_PKG} == "YES"
45SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g" 46SUBST_SED.conf+= -e "s|@RCS_PREFIX@|${PREFIX}|g"
46.else 47.else
47SUBST_SED.conf+= -e "s|@RCS_PREFIX@|/usr|g" 48SUBST_SED.conf+= -e "s|@RCS_PREFIX@|/usr|g"
48.endif 49.endif
49 50
50CHECK_PORTABILITY_SKIP= tools/make-release 51CHECK_PORTABILITY_SKIP= tools/make-release
51 52
52INSTALLATION_DIRS= share/examples/viewvc 53INSTALLATION_DIRS= share/examples/viewvc
53 54
54do-install: 55do-install:
55 (cd ${WRKSRC} && \ 56 (cd ${WRKSRC} && \
56 ${PYTHONBIN} \ 57 ${PYTHONBIN} \
57 viewvc-install --prefix=${PREFIX}/${VIEWVCDIR} --destdir=${DESTDIR}) 58 viewvc-install --prefix=${PREFIX}/${VIEWVCDIR} --destdir=${DESTDIR})
58 59
59 ${INSTALL_DATA} ${WRKSRC}/viewvc.conf.dist \ 60 ${INSTALL_DATA} ${WRKSRC}/conf/viewvc.conf.dist \
60 ${DESTDIR}${PREFIX}/share/examples/viewvc/viewvc.conf 61 ${DESTDIR}${PREFIX}/share/examples/viewvc/viewvc.conf
61 ${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf.dist \ 62 ${INSTALL_DATA} ${WRKSRC}/conf/cvsgraph.conf.dist \
62 ${DESTDIR}${PREFIX}/share/examples/viewvc/cvsgraph.conf 63 ${DESTDIR}${PREFIX}/share/examples/viewvc/cvsgraph.conf
63 64
64post-install: 65post-install:
65 ${CHMOD} ${SHAREMODE} \ 66 ${CHMOD} ${SHAREMODE} \
66 ${DESTDIR}/${PREFIX}/share/viewvc/bin/mod_python/.htaccess 67 ${DESTDIR}/${PREFIX}/share/viewvc/bin/mod_python/.htaccess
67 ${CHMOD} ${SHAREMODE} \ 68 ${CHMOD} ${SHAREMODE} \
68 ${DESTDIR}/${PREFIX}/share/viewvc/bin/mod_python/*.py 69 ${DESTDIR}/${PREFIX}/share/viewvc/bin/mod_python/*.py
69 70
70.include "../../lang/python/application.mk" 71.include "../../lang/python/application.mk"
71.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/www/viewvc/PLIST (expand / switch to unified diff)

--- pkgsrc/www/viewvc/PLIST 2009/06/14 22:00:39 1.3
+++ pkgsrc/www/viewvc/PLIST 2011/11/01 21:08:55 1.4
@@ -1,27 +1,31 @@ @@ -1,27 +1,31 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:39 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2011/11/01 21:08:55 scottr Exp $
2share/examples/viewvc/viewvc.conf 
3share/examples/viewvc/cvsgraph.conf 2share/examples/viewvc/cvsgraph.conf
 3share/examples/viewvc/viewvc.conf
4${VIEWVCDIR}/bin/cgi/query.cgi 4${VIEWVCDIR}/bin/cgi/query.cgi
5${VIEWVCDIR}/bin/cgi/viewvc.cgi 5${VIEWVCDIR}/bin/cgi/viewvc.cgi
6${VIEWVCDIR}/bin/cvsdbadmin 6${VIEWVCDIR}/bin/cvsdbadmin
7${VIEWVCDIR}/bin/loginfo-handler 7${VIEWVCDIR}/bin/loginfo-handler
8${VIEWVCDIR}/bin/make-database 8${VIEWVCDIR}/bin/make-database
9${VIEWVCDIR}/bin/mod_python/.htaccess 9${VIEWVCDIR}/bin/mod_python/.htaccess
10${VIEWVCDIR}/bin/mod_python/handler.py 10${VIEWVCDIR}/bin/mod_python/handler.py
11${VIEWVCDIR}/bin/mod_python/query.py 11${VIEWVCDIR}/bin/mod_python/query.py
12${VIEWVCDIR}/bin/mod_python/viewvc.py 12${VIEWVCDIR}/bin/mod_python/viewvc.py
13${VIEWVCDIR}/bin/standalone.py 13${VIEWVCDIR}/bin/standalone.py
14${VIEWVCDIR}/bin/svndbadmin 14${VIEWVCDIR}/bin/svndbadmin
 15${VIEWVCDIR}/bin/wsgi/query.fcgi
 16${VIEWVCDIR}/bin/wsgi/query.wsgi
 17${VIEWVCDIR}/bin/wsgi/viewvc.fcgi
 18${VIEWVCDIR}/bin/wsgi/viewvc.wsgi
15${VIEWVCDIR}/lib/PyFontify.py 19${VIEWVCDIR}/lib/PyFontify.py
16${VIEWVCDIR}/lib/PyFontify.pyc 20${VIEWVCDIR}/lib/PyFontify.pyc
17${VIEWVCDIR}/lib/accept.py 21${VIEWVCDIR}/lib/accept.py
18${VIEWVCDIR}/lib/accept.pyc 22${VIEWVCDIR}/lib/accept.pyc
19${VIEWVCDIR}/lib/blame.py 23${VIEWVCDIR}/lib/blame.py
20${VIEWVCDIR}/lib/blame.pyc 24${VIEWVCDIR}/lib/blame.pyc
21${VIEWVCDIR}/lib/compat.py 25${VIEWVCDIR}/lib/compat.py
22${VIEWVCDIR}/lib/compat.pyc 26${VIEWVCDIR}/lib/compat.pyc
23${VIEWVCDIR}/lib/compat_difflib.py 27${VIEWVCDIR}/lib/compat_difflib.py
24${VIEWVCDIR}/lib/compat_difflib.pyc 28${VIEWVCDIR}/lib/compat_difflib.pyc
25${VIEWVCDIR}/lib/compat_ndiff.py 29${VIEWVCDIR}/lib/compat_ndiff.py
26${VIEWVCDIR}/lib/compat_ndiff.pyc 30${VIEWVCDIR}/lib/compat_ndiff.pyc
27${VIEWVCDIR}/lib/config.py 31${VIEWVCDIR}/lib/config.py
@@ -34,114 +38,120 @@ ${VIEWVCDIR}/lib/debug.py @@ -34,114 +38,120 @@ ${VIEWVCDIR}/lib/debug.py
34${VIEWVCDIR}/lib/debug.pyc 38${VIEWVCDIR}/lib/debug.pyc
35${VIEWVCDIR}/lib/ezt.py 39${VIEWVCDIR}/lib/ezt.py
36${VIEWVCDIR}/lib/ezt.pyc 40${VIEWVCDIR}/lib/ezt.pyc
37${VIEWVCDIR}/lib/idiff.py 41${VIEWVCDIR}/lib/idiff.py
38${VIEWVCDIR}/lib/idiff.pyc 42${VIEWVCDIR}/lib/idiff.pyc
39${VIEWVCDIR}/lib/popen.py 43${VIEWVCDIR}/lib/popen.py
40${VIEWVCDIR}/lib/popen.pyc 44${VIEWVCDIR}/lib/popen.pyc
41${VIEWVCDIR}/lib/py2html.py 45${VIEWVCDIR}/lib/py2html.py
42${VIEWVCDIR}/lib/py2html.pyc 46${VIEWVCDIR}/lib/py2html.pyc
43${VIEWVCDIR}/lib/query.py 47${VIEWVCDIR}/lib/query.py
44${VIEWVCDIR}/lib/query.pyc 48${VIEWVCDIR}/lib/query.pyc
45${VIEWVCDIR}/lib/sapi.py 49${VIEWVCDIR}/lib/sapi.py
46${VIEWVCDIR}/lib/sapi.pyc 50${VIEWVCDIR}/lib/sapi.pyc
 51${VIEWVCDIR}/lib/vcauth/__init__.py
 52${VIEWVCDIR}/lib/vcauth/__init__.pyc
 53${VIEWVCDIR}/lib/vcauth/forbidden/__init__.py
 54${VIEWVCDIR}/lib/vcauth/forbidden/__init__.pyc
 55${VIEWVCDIR}/lib/vcauth/forbiddenre/__init__.py
 56${VIEWVCDIR}/lib/vcauth/forbiddenre/__init__.pyc
 57${VIEWVCDIR}/lib/vcauth/svnauthz/__init__.py
 58${VIEWVCDIR}/lib/vcauth/svnauthz/__init__.pyc
47${VIEWVCDIR}/lib/vclib/__init__.py 59${VIEWVCDIR}/lib/vclib/__init__.py
48${VIEWVCDIR}/lib/vclib/__init__.pyc 60${VIEWVCDIR}/lib/vclib/__init__.pyc
49${VIEWVCDIR}/lib/vclib/bincvs/__init__.py 
50${VIEWVCDIR}/lib/vclib/bincvs/__init__.pyc 
51${VIEWVCDIR}/lib/vclib/ccvs/__init__.py 61${VIEWVCDIR}/lib/vclib/ccvs/__init__.py
52${VIEWVCDIR}/lib/vclib/ccvs/__init__.pyc 62${VIEWVCDIR}/lib/vclib/ccvs/__init__.pyc
 63${VIEWVCDIR}/lib/vclib/ccvs/bincvs.py
 64${VIEWVCDIR}/lib/vclib/ccvs/bincvs.pyc
53${VIEWVCDIR}/lib/vclib/ccvs/blame.py 65${VIEWVCDIR}/lib/vclib/ccvs/blame.py
54${VIEWVCDIR}/lib/vclib/ccvs/blame.pyc 66${VIEWVCDIR}/lib/vclib/ccvs/blame.pyc
 67${VIEWVCDIR}/lib/vclib/ccvs/ccvs.py
 68${VIEWVCDIR}/lib/vclib/ccvs/ccvs.pyc
55${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__init__.py 69${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__init__.py
56${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__init__.pyc 70${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__init__.pyc
57${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.py 71${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.py
58${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.pyc 72${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.pyc
59${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/debug.py 73${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/debug.py
60${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/debug.pyc 74${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/debug.pyc
61${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/default.py 75${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/default.py
62${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/default.pyc 76${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/default.pyc
 77${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/parse_rcs_file.py
 78${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/parse_rcs_file.pyc
 79${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/run-tests.py
 80${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/run-tests.pyc
 81${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/default,v
 82${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/default.out
 83${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/empty-file,v
 84${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/test-data/empty-file.out
63${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/texttools.py 85${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/texttools.py
64${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/texttools.pyc 86${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/texttools.pyc
65${VIEWVCDIR}/lib/vclib/svn/__init__.py 87${VIEWVCDIR}/lib/vclib/svn/__init__.py
66${VIEWVCDIR}/lib/vclib/svn/__init__.pyc 88${VIEWVCDIR}/lib/vclib/svn/__init__.pyc
67${VIEWVCDIR}/lib/vclib/svn_ra/__init__.py 89${VIEWVCDIR}/lib/vclib/svn/svn_ra.py
68${VIEWVCDIR}/lib/vclib/svn_ra/__init__.pyc 90${VIEWVCDIR}/lib/vclib/svn/svn_ra.pyc
 91${VIEWVCDIR}/lib/vclib/svn/svn_repos.py
 92${VIEWVCDIR}/lib/vclib/svn/svn_repos.pyc
69${VIEWVCDIR}/lib/viewvc.py 93${VIEWVCDIR}/lib/viewvc.py
70${VIEWVCDIR}/lib/viewvc.pyc 94${VIEWVCDIR}/lib/viewvc.pyc
71${VIEWVCDIR}/lib/win32popen.py 95${VIEWVCDIR}/lib/win32popen.py
72${VIEWVCDIR}/lib/win32popen.pyc 96${VIEWVCDIR}/lib/win32popen.pyc
73${VIEWVCDIR}/templates/annotate.ezt 
74${VIEWVCDIR}/templates/diff.ezt 
75${VIEWVCDIR}/templates/dir_new.ezt 
76${VIEWVCDIR}/templates/directory.ezt 
77${VIEWVCDIR}/templates/docroot/help.css 
78${VIEWVCDIR}/templates/docroot/help_dirview.html 
79${VIEWVCDIR}/templates/docroot/help_log.html 
80${VIEWVCDIR}/templates/docroot/help_query.html 
81${VIEWVCDIR}/templates/docroot/help_rootview.html 
82${VIEWVCDIR}/templates/docroot/images/annotate.png 
83${VIEWVCDIR}/templates/docroot/images/back.png 
84${VIEWVCDIR}/templates/docroot/images/back_small.png 
85${VIEWVCDIR}/templates/docroot/images/broken.png 
86${VIEWVCDIR}/templates/docroot/images/chalk.jpg 
87${VIEWVCDIR}/templates/docroot/images/cvsgraph_16x16.png 
88${VIEWVCDIR}/templates/docroot/images/cvsgraph_32x32.png 
89${VIEWVCDIR}/templates/docroot/images/diff.png 
90${VIEWVCDIR}/templates/docroot/images/dir.png 
91${VIEWVCDIR}/templates/docroot/images/down.png 
92${VIEWVCDIR}/templates/docroot/images/download.png 
93${VIEWVCDIR}/templates/docroot/images/feed-icon-16x16.jpg 
94${VIEWVCDIR}/templates/docroot/images/forward.png 
95${VIEWVCDIR}/templates/docroot/images/list.png 
96${VIEWVCDIR}/templates/docroot/images/log.png 
97${VIEWVCDIR}/templates/docroot/images/logo.png 
98${VIEWVCDIR}/templates/docroot/images/text.png 
99${VIEWVCDIR}/templates/docroot/images/up.png 
100${VIEWVCDIR}/templates/docroot/images/view.png 
101${VIEWVCDIR}/templates/docroot/styles.css 
102${VIEWVCDIR}/templates/error.ezt 
103${VIEWVCDIR}/templates/graph.ezt 
104${VIEWVCDIR}/templates/include/diff_form.ezt 
105${VIEWVCDIR}/templates/include/dir_footer.ezt 
106${VIEWVCDIR}/templates/include/dir_header.ezt 
107${VIEWVCDIR}/templates/include/file_header.ezt 
108${VIEWVCDIR}/templates/include/footer.ezt 
109${VIEWVCDIR}/templates/include/header.ezt 
110${VIEWVCDIR}/templates/include/log_footer.ezt 
111${VIEWVCDIR}/templates/include/log_header.ezt 
112${VIEWVCDIR}/templates/include/paging.ezt 
113${VIEWVCDIR}/templates/include/pathrev_form.ezt 
114${VIEWVCDIR}/templates/include/sort.ezt 
115${VIEWVCDIR}/templates/log.ezt 
116${VIEWVCDIR}/templates/log_table.ezt 
117${VIEWVCDIR}/templates/markup.ezt 
118${VIEWVCDIR}/templates/query.ezt 
119${VIEWVCDIR}/templates/query_form.ezt 
120${VIEWVCDIR}/templates/query_results.ezt 
121${VIEWVCDIR}/templates/revision.ezt 
122${VIEWVCDIR}/templates/roots.ezt 
123${VIEWVCDIR}/templates/rss.ezt 
124${VIEWVCDIR}/templates-contrib/README 97${VIEWVCDIR}/templates-contrib/README
 98${VIEWVCDIR}/templates-contrib/newvc/README
 99${VIEWVCDIR}/templates-contrib/newvc/templates/diff.ezt
 100${VIEWVCDIR}/templates-contrib/newvc/templates/directory.ezt
 101${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help.css
 102${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_dirview.html
 103${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_log.html
 104${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_query.html
 105${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/help_rootview.html
 106${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/back.png
 107${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/back_small.png
 108${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/broken.png
 109${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/cvs-logo.png
 110${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/dir.png
 111${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/down.png
 112${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/feed-icon-16x16.jpg
 113${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/forward.png
 114${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/svn-logo.png
 115${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/text.png
 116${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/up.png
 117${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/images/viewvc-logo.png
 118${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/scripts.js
 119${VIEWVCDIR}/templates-contrib/newvc/templates/docroot/styles.css
 120${VIEWVCDIR}/templates-contrib/newvc/templates/error.ezt
 121${VIEWVCDIR}/templates-contrib/newvc/templates/file.ezt
 122${VIEWVCDIR}/templates-contrib/newvc/templates/graph.ezt
 123${VIEWVCDIR}/templates-contrib/newvc/templates/include/diff_form.ezt
 124${VIEWVCDIR}/templates-contrib/newvc/templates/include/fileview.ezt
 125${VIEWVCDIR}/templates-contrib/newvc/templates/include/footer.ezt
 126${VIEWVCDIR}/templates-contrib/newvc/templates/include/header.ezt
 127${VIEWVCDIR}/templates-contrib/newvc/templates/include/pathrev_form.ezt
 128${VIEWVCDIR}/templates-contrib/newvc/templates/include/props.ezt
 129${VIEWVCDIR}/templates-contrib/newvc/templates/log.ezt
 130${VIEWVCDIR}/templates-contrib/newvc/templates/markup.ezt
 131${VIEWVCDIR}/templates-contrib/newvc/templates/query.ezt
 132${VIEWVCDIR}/templates-contrib/newvc/templates/query_form.ezt
 133${VIEWVCDIR}/templates-contrib/newvc/templates/query_results.ezt
 134${VIEWVCDIR}/templates-contrib/newvc/templates/revision.ezt
 135${VIEWVCDIR}/templates-contrib/newvc/templates/roots.ezt
 136${VIEWVCDIR}/templates-contrib/newvc/templates/rss.ezt
125${VIEWVCDIR}/templates-contrib/viewsvn/INSTALL 137${VIEWVCDIR}/templates-contrib/viewsvn/INSTALL
126${VIEWVCDIR}/templates-contrib/viewsvn/README 138${VIEWVCDIR}/templates-contrib/viewsvn/README
127${VIEWVCDIR}/templates-contrib/viewsvn/extras/fix-blame-output.diff 
128${VIEWVCDIR}/templates-contrib/viewsvn/extras/svnindex.css 139${VIEWVCDIR}/templates-contrib/viewsvn/extras/svnindex.css
129${VIEWVCDIR}/templates-contrib/viewsvn/extras/svnindex.xsl 140${VIEWVCDIR}/templates-contrib/viewsvn/extras/svnindex.xsl
130${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/diff.png 141${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/diff.png
131${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/dir.png 142${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/dir.png
132${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/log.png 143${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/log.png
133${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/markup.png 144${VIEWVCDIR}/templates-contrib/viewsvn/screenshots/markup.png
134${VIEWVCDIR}/templates-contrib/viewsvn/templates/annotate.ezt 
135${VIEWVCDIR}/templates-contrib/viewsvn/templates/diff.ezt 145${VIEWVCDIR}/templates-contrib/viewsvn/templates/diff.ezt
136${VIEWVCDIR}/templates-contrib/viewsvn/templates/directory.ezt 146${VIEWVCDIR}/templates-contrib/viewsvn/templates/directory.ezt
137${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/broken.png 147${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/broken.png
138${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/dir.png 148${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/dir.png
139${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/down.png 149${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/down.png
140${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/download.png 150${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/download.png
141${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/favicon-svn.ico 151${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/favicon-svn.ico
142${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/feed-icon-16x16.jpg 152${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/feed-icon-16x16.jpg
143${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/logo-svn.png 153${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/logo-svn.png
144${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/logo-viewvc.png 154${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/logo-viewvc.png
145${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/svn.png 155${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/svn.png
146${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/text.png 156${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/text.png
147${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back.png 157${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back.png
@@ -149,32 +159,85 @@ ${VIEWVCDIR}/templates-contrib/viewsvn/t @@ -149,32 +159,85 @@ ${VIEWVCDIR}/templates-contrib/viewsvn/t
149${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/blame.png 159${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/blame.png
150${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/checkout.png 160${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/checkout.png
151${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/diff.png 161${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/diff.png
152${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/forward.png 162${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/forward.png
153${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/license.txt 163${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/license.txt
154${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/log.png 164${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/log.png
155${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/patch.png 165${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/patch.png
156${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/repos.png 166${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/repos.png
157${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/tsvn.png 167${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/tsvn.png
158${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/up.png 168${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/up.png
159${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/viewvc.png 169${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/images/viewvc.png
160${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/styles.css 170${VIEWVCDIR}/templates-contrib/viewsvn/templates/docroot/styles.css
161${VIEWVCDIR}/templates-contrib/viewsvn/templates/error.ezt 171${VIEWVCDIR}/templates-contrib/viewsvn/templates/error.ezt
162${VIEWVCDIR}/templates-contrib/viewsvn/templates/graph.ezt 172${VIEWVCDIR}/templates-contrib/viewsvn/templates/file.ezt
163${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/diff_form.ezt 173${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/diff_form.ezt
164${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/dir_footer.ezt 174${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/dir_footer.ezt
165${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/dir_header.ezt 175${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/dir_header.ezt
166${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/file_header.ezt 176${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/file_header.ezt
167${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/footer.ezt 177${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/footer.ezt
168${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/header.ezt 178${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/header.ezt
169${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/log_footer.ezt 179${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/log_footer.ezt
170${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/log_header.ezt 180${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/log_header.ezt
171${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/paging.ezt 181${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/paging.ezt
172${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/pathrev_form.ezt 182${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/pathrev_form.ezt
 183${VIEWVCDIR}/templates-contrib/viewsvn/templates/include/props.ezt
173${VIEWVCDIR}/templates-contrib/viewsvn/templates/log.ezt 184${VIEWVCDIR}/templates-contrib/viewsvn/templates/log.ezt
174${VIEWVCDIR}/templates-contrib/viewsvn/templates/markup.ezt 
175${VIEWVCDIR}/templates-contrib/viewsvn/templates/query.ezt 185${VIEWVCDIR}/templates-contrib/viewsvn/templates/query.ezt
176${VIEWVCDIR}/templates-contrib/viewsvn/templates/query_form.ezt 186${VIEWVCDIR}/templates-contrib/viewsvn/templates/query_form.ezt
177${VIEWVCDIR}/templates-contrib/viewsvn/templates/query_results.ezt 187${VIEWVCDIR}/templates-contrib/viewsvn/templates/query_results.ezt
178${VIEWVCDIR}/templates-contrib/viewsvn/templates/revision.ezt 188${VIEWVCDIR}/templates-contrib/viewsvn/templates/revision.ezt
179${VIEWVCDIR}/templates-contrib/viewsvn/templates/roots.ezt 189${VIEWVCDIR}/templates-contrib/viewsvn/templates/roots.ezt
180${VIEWVCDIR}/templates-contrib/viewsvn/templates/rss.ezt 190${VIEWVCDIR}/templates-contrib/viewsvn/templates/rss.ezt
 191${VIEWVCDIR}/templates/diff.ezt
 192${VIEWVCDIR}/templates/dir_new.ezt
 193${VIEWVCDIR}/templates/directory.ezt
 194${VIEWVCDIR}/templates/docroot/help.css
 195${VIEWVCDIR}/templates/docroot/help_dirview.html
 196${VIEWVCDIR}/templates/docroot/help_log.html
 197${VIEWVCDIR}/templates/docroot/help_query.html
 198${VIEWVCDIR}/templates/docroot/help_rootview.html
 199${VIEWVCDIR}/templates/docroot/images/annotate.png
 200${VIEWVCDIR}/templates/docroot/images/back.png
 201${VIEWVCDIR}/templates/docroot/images/back_small.png
 202${VIEWVCDIR}/templates/docroot/images/broken.png
 203${VIEWVCDIR}/templates/docroot/images/chalk.jpg
 204${VIEWVCDIR}/templates/docroot/images/cvsgraph_16x16.png
 205${VIEWVCDIR}/templates/docroot/images/cvsgraph_32x32.png
 206${VIEWVCDIR}/templates/docroot/images/diff.png
 207${VIEWVCDIR}/templates/docroot/images/dir.png
 208${VIEWVCDIR}/templates/docroot/images/down.png
 209${VIEWVCDIR}/templates/docroot/images/download.png
 210${VIEWVCDIR}/templates/docroot/images/favicon.ico
 211${VIEWVCDIR}/templates/docroot/images/feed-icon-16x16.jpg
 212${VIEWVCDIR}/templates/docroot/images/forward.png
 213${VIEWVCDIR}/templates/docroot/images/list.png
 214${VIEWVCDIR}/templates/docroot/images/lock.png
 215${VIEWVCDIR}/templates/docroot/images/log.png
 216${VIEWVCDIR}/templates/docroot/images/text.png
 217${VIEWVCDIR}/templates/docroot/images/up.png
 218${VIEWVCDIR}/templates/docroot/images/view.png
 219${VIEWVCDIR}/templates/docroot/images/viewvc-logo.png
 220${VIEWVCDIR}/templates/docroot/styles.css
 221${VIEWVCDIR}/templates/error.ezt
 222${VIEWVCDIR}/templates/file.ezt
 223${VIEWVCDIR}/templates/graph.ezt
 224${VIEWVCDIR}/templates/include/diff_form.ezt
 225${VIEWVCDIR}/templates/include/dir_footer.ezt
 226${VIEWVCDIR}/templates/include/dir_header.ezt
 227${VIEWVCDIR}/templates/include/file_header.ezt
 228${VIEWVCDIR}/templates/include/footer.ezt
 229${VIEWVCDIR}/templates/include/header.ezt
 230${VIEWVCDIR}/templates/include/log_footer.ezt
 231${VIEWVCDIR}/templates/include/log_header.ezt
 232${VIEWVCDIR}/templates/include/paging.ezt
 233${VIEWVCDIR}/templates/include/pathrev_form.ezt
 234${VIEWVCDIR}/templates/include/props.ezt
 235${VIEWVCDIR}/templates/include/sort.ezt
 236${VIEWVCDIR}/templates/log.ezt
 237${VIEWVCDIR}/templates/log_table.ezt
 238${VIEWVCDIR}/templates/query.ezt
 239${VIEWVCDIR}/templates/query_form.ezt
 240${VIEWVCDIR}/templates/query_results.ezt
 241${VIEWVCDIR}/templates/revision.ezt
 242${VIEWVCDIR}/templates/roots.ezt
 243${VIEWVCDIR}/templates/rss.ezt
cvs diff -r1.9 -r1.10 pkgsrc/www/viewvc/distinfo (expand / switch to unified diff)

--- pkgsrc/www/viewvc/distinfo 2010/12/25 15:00:36 1.9
+++ pkgsrc/www/viewvc/distinfo 2011/11/01 21:08:55 1.10
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.9 2010/12/25 15:00:36 wiz Exp $ 1$NetBSD: distinfo,v 1.10 2011/11/01 21:08:55 scottr Exp $
2 2
3SHA1 (viewvc-1.0.12.tar.gz) = 069ae5239b3085136082fcd88bde57d9c6b784ac 3SHA1 (viewvc-1.1.11.tar.gz) = 222765d9b4d922ec2066ddd8dcad1238ebdad687
4RMD160 (viewvc-1.0.12.tar.gz) = 787de2b623b0035de277af3de4eac5d383be4044 4RMD160 (viewvc-1.1.11.tar.gz) = ae2dd6a23d926d947ed09e9ad6ebe3a62e059243
5Size (viewvc-1.0.12.tar.gz) = 523289 bytes 5Size (viewvc-1.1.11.tar.gz) = 603863 bytes
6SHA1 (patch-aa) = b4f5e36e5d744249aec8128d6ccaa670398afafe 6SHA1 (patch-aa) = ff0a6e52ea66c838ba3ab7b1d055c27bf561a376
7SHA1 (patch-ab) = cf4c56e5b4254d0deb1a7b51121b6b1d2113fd3e 7SHA1 (patch-ab) = f5abf6bd824d121338882423c34e3464c8ba5fd4
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/viewvc/options.mk (expand / switch to unified diff)

--- pkgsrc/www/viewvc/options.mk 2006/10/21 09:05:44 1.1.1.1
+++ pkgsrc/www/viewvc/options.mk 2011/11/01 21:08:55 1.2
@@ -1,28 +1,17 @@ @@ -1,28 +1,17 @@
1# $NetBSD: options.mk,v 1.1.1.1 2006/10/21 09:05:44 adrianp Exp $ 1# $NetBSD: options.mk,v 1.2 2011/11/01 21:08:55 scottr Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.viewvc 3PKG_OPTIONS_VAR= PKG_OPTIONS.viewvc
4 4
5PKG_SUPPORTED_OPTIONS= cvsgraph viewvc-php 5PKG_SUPPORTED_OPTIONS= cvsgraph
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8.include "../../lang/php/phpversion.mk" 
9 8
10### 9###
11### Use cvsgraph for printing pretty little pictures 10### Use cvsgraph for printing pretty little pictures
12### 11###
13.if !empty(PKG_OPTIONS:Mcvsgraph) 12.if !empty(PKG_OPTIONS:Mcvsgraph)
14DEPENDS+= cvsgraph-[0-9]*:../../devel/cvsgraph 13DEPENDS+= cvsgraph-[0-9]*:../../devel/cvsgraph
15CVSGRAPH_OPT= 1 14CVSGRAPH_OPT= 1
16.else 15.else
17CVSGRAPH_OPT= 0 16CVSGRAPH_OPT= 0
18.endif 17.endif
19 
20### 
21### Use php to colorize .php and .inc files 
22### 
23.if !empty(PKG_OPTIONS:Mviewvc-php) 
24.include "${PHPPKGSRCDIR}/buildlink3.mk" 
25PHP_OPT= 1 
26.else 
27PHP_OPT= 0 
28.endif 
cvs diff -r1.4 -r1.5 pkgsrc/www/viewvc/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/viewvc/patches/patch-aa 2008/10/21 20:46:28 1.4
+++ pkgsrc/www/viewvc/patches/patch-aa 2011/11/01 21:08:55 1.5
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-aa,v 1.4 2008/10/21 20:46:28 adrianp Exp $ 1$NetBSD: patch-aa,v 1.5 2011/11/01 21:08:55 scottr Exp $
2 2
3--- viewvc-install.orig 2007-05-03 19:03:36.000000000 +0100 3--- viewvc-install.orig 2010-09-07 14:20:22.000000000 -0500
4+++ viewvc-install 4+++ viewvc-install 2011-10-17 14:52:40.000000000 -0500
5@@ -58,10 +58,6 @@ FILE_INFO_LIST = [ 5@@ -62,12 +62,6 @@
6 ("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0), 6 ("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0),
7 ("bin/svndbadmin", "bin/svndbadmin", 0755, 1, 0, 0), 7 ("bin/svndbadmin", "bin/svndbadmin", 0755, 1, 0, 0),
8 ("bin/make-database", "bin/make-database", 0755, 1, 0, 0), 8 ("bin/make-database", "bin/make-database", 0755, 1, 0, 0),
9- ("viewvc.conf.dist", "viewvc.conf.dist", 0644, 0, 0, 0), 9- ("conf/viewvc.conf.dist", "viewvc.conf.dist", 0644, 0, 0, 0),
10- ("viewvc.conf.dist", "viewvc.conf", 0644, 0, 1, 0), 10- ("conf/viewvc.conf.dist", "viewvc.conf", 0644, 0, 1, 0),
11- ("cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 0, 0), 11- ("conf/cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 0, 0),
12- ("cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0), 12- ("conf/cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0),
 13- ("conf/mimetypes.conf.dist", "mimetypes.conf.dist", 0644, 0, 0, 0),
 14- ("conf/mimetypes.conf.dist", "mimetypes.conf", 0644, 0, 1, 0),
13 ] 15 ]
14 if sys.platform == "win32": 16 if sys.platform == "win32":
15 FILE_INFO_LIST.extend([ 17 FILE_INFO_LIST.extend([
cvs diff -r1.2 -r1.3 pkgsrc/www/viewvc/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/viewvc/patches/patch-ab 2008/10/21 20:46:28 1.2
+++ pkgsrc/www/viewvc/patches/patch-ab 2011/11/01 21:08:55 1.3
@@ -1,73 +1,52 @@ @@ -1,73 +1,52 @@
1$NetBSD: patch-ab,v 1.2 2008/10/21 20:46:28 adrianp Exp $ 1$NetBSD: patch-ab,v 1.3 2011/11/01 21:08:55 scottr Exp $
2 2
3--- viewvc.conf.dist.orig 2008-02-25 20:47:24.000000000 +0000 3--- conf/viewvc.conf.dist.orig 2011-04-20 09:56:39.000000000 -0500
4+++ viewvc.conf.dist 4+++ conf/viewvc.conf.dist 2011-10-31 21:43:19.000000000 -0500
5@@ -105,6 +105,7 @@ cvs_roots = cvs: /home/cvsroot 5@@ -186,6 +186,7 @@
6 default_root = cvs 6 ## /usr/local/apache2/conf/mime.types
7  7 ##
8 # uncomment if the RCS binaries are not on the standard path 8 #mime_types_files = mimetypes.conf
9+rcs_path = @RCS_PREFIX@/bin/ 
10 #rcs_path = /usr/bin/ 
11  
12 # ViewVC can use CVSNT (www.cvsnt.org) instead of the RCS  
13@@ -125,7 +126,8 @@ default_root = cvs 
14 use_rcsparse = 0 
15  
16 # uncomment if the svn command-line utilities are not on the standard path 
17-#svn_path = /usr/bin/ 
18+#svn_path = @PREFIX@/bin/ 
19+svn_path = @PREFIX@/bin/ 
20  
21 # 
22 # This is a pathname to a MIME types file to help viewvc to guess the 
23@@ -135,7 +137,7 @@ use_rcsparse = 0 
24 # uncomment this option and point it at a MIME type file. 
25 # 
26 # For example, you can use the mime.types from apache here: 
27-#mime_types_file = /usr/local/apache/conf/mime.types 
28+#mime_types_file = @PREFIX@/etc/httpd/mime.types 9+#mime_types_file = @PREFIX@/etc/httpd/mime.types
29  10
30 # This address is shown in the footer of the generated pages.  11 ## address: The address of the local repository maintainer. (This
31 # It must be replaced with the address of the local repository maintainer. 12 ## option is provided only as a convenience for ViewVC installations
32@@ -495,14 +497,14 @@ highlight_line_numbers = 1 13@@ -280,6 +281,7 @@
33 highlight_convert_tabs = 2 14 ## rcs_dir = /usr/bin/
34  15 ##
35 # use php to colorize .php and .inc files? 16 #rcs_dir =
36-use_php = 0 17+rcs_dir = @RCS_PREFIX@/bin/
37+use_php = @PHP_OPT@ 18
38  19 ## cvsnt: Location of cvsnt program. ViewVC can use CVSNT (www.cvsnt.org)
39 # path to php executable 20 ## instead of the RCS utilities to retrieve information from CVS
40 # (This should be set to the path of a PHP CLI executable, not the path 21@@ -302,6 +304,7 @@
41 # to a CGI executable. If you use a CGI executable, you may see "no input file 22 ## svn = /usr/bin/svn
42 # specified" or "force-cgi-redirect" errors instead of colorized source. The 23 ##
43 # output of "php -v" tells you whether an given executable is CLI or CGI.) 24 #svn =
44-php_exe_path = php 25+svn = @PREFIX@/bin/
45+php_exe_path = @PREFIX@/bin/php 26
46 # php_exe_path = /usr/local/bin/php 27 ## diff: Location of the GNU diff program, used for showing file
47 # php_exe_path = C:\Program Files\php\cli\php.exe 28 ## version differences.
48  29@@ -317,7 +320,7 @@
49@@ -510,20 +512,20 @@ php_exe_path = php 30 ## Example:
50 # Use CvsGraph. See http://www.akhphd.au.dk/~bertho/cvsgraph/ for 31 ## cvsgraph = /usr/local/bin/cvsgraph
51 # documentation and download.  32 ##
52 # 33-#cvsgraph =
53-use_cvsgraph = 0 34+cvsgraph = @PREFIX@/bin/
 35
 36
 37 ##---------------------------------------------------------------------------
 38@@ -622,12 +625,14 @@
 39 ## use_cvsgraph: Use CvsGraph to offer visual graphs of CVS revision history.
 40 ##
 41 #use_cvsgraph = 0
54+use_cvsgraph = @CVSGRAPH_OPT@ 42+use_cvsgraph = @CVSGRAPH_OPT@
55 # use_cvsgraph = 1 
56  43
57 # 44 ## cvsgraph_conf: Location of the customized cvsgraph configuration file.
58 # if the cvsgraph program is not on the path, set this value 45 ## May be specified as an absolute path or as a path relative to this
59 # 46 ## configuration file.
60-cvsgraph_path = 47 ##
61-# cvsgraph_path = /usr/local/bin/ 48 #cvsgraph_conf = cvsgraph.conf
62+cvsgraph_path = @PREFIX@/bin/ 
63+# cvsgraph_path = @PREFIX@/bin/ 
64  
65 # 
66 # Location of the customized cvsgraph configuration file.  
67 # You will need an absolute pathname here: 
68 # 
69-cvsgraph_conf = cvsgraph.conf 
70+cvsgraph_conf = @PREFIX@/@VIEWVCDIR@/cvsgraph.conf 49+cvsgraph_conf = @PREFIX@/@VIEWVCDIR@/cvsgraph.conf
71  50
72 # 51 ## use_re_search: Enable regular expression search of files in a directory.
73 # Set to enable regular expression search of all files in a directory 52 ##