CVS commit: pkgsrc/www/viewvc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/viewvc
From: "Hauke Fath" <hauke%netbsd.org@localhost>
Date: Wed, 21 Oct 2026 16:00:17 +0000

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Oct 21 16:00:17 UTC 2026

Modified Files:
        pkgsrc/www/viewvc: Makefile PLIST distinfo
        pkgsrc/www/viewvc/patches: patch-conf_viewvc.conf.dist
            patch-lib_viewvc.py patch-viewvc-install

Log Message:
www/viewvc -- update to v1.3.0

ChangeLog:

    updated dependency requirements
        minimum Python version is now 3.10 (#138,#400)
        minimum Subversion version now 1.14.0 with py3 bindings
        minimum Pygments version now 1.1
        minimum MySQL version now MySQL 5.7/MariaDB 10.2 (#213)
        now using passlib (instead of fcrypt) for standalone authn
                support (#361)
    removed support for mod_python-based deployments (#234)
    removed support for ASP-based deployments (#235)
    removed support for the command-line blame script (#381)
    make-database now requires --force to destroy existing DB (#212)
    removed deprecated checkout_magic option/behavior (#215)
    new 'allow_mojibake' option (#216)
    require explicit match for web-friendly images in
        'binary_mime_types' (#216)
    fix a problem on CVS checkout files with rcsparse (#272)
    new 'max_context' option, for GNU diffutils 3.8 and newer (#293)
    fix problems on diff view when hr_intraline is set (#275)
    new 'root_path_locale' option (Tigris #500)
    support Unicode root path both in CVS and Subversion (Tigris #500)
    fix encoding problems on diff view and generating patch (#301)
    new 'image' view for limited as-is image display (#360)
    disallow patch view on non-file paths (#370)
    separate CGI script for IIS server without PATH_INFO fix settings (#386)
    diff link in revision view uses r1 as old and r2 as new revision (#389)
    new 'allowed host' option, for validate Host: header value (#398)


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/viewvc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/viewvc/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/viewvc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/viewvc/patches/patch-conf_viewvc.conf.dist \
    pkgsrc/www/viewvc/patches/patch-lib_viewvc.py \
    pkgsrc/www/viewvc/patches/patch-viewvc-install

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

Modified files:

Index: pkgsrc/www/viewvc/Makefile
diff -u pkgsrc/www/viewvc/Makefile:1.46 pkgsrc/www/viewvc/Makefile:1.47
--- pkgsrc/www/viewvc/Makefile:1.46     Tue Sep 30 16:07:40 2025
+++ pkgsrc/www/viewvc/Makefile  Wed Oct 21 16:00:17 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2025/09/30 16:07:40 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2026/10/21 16:00:17 hauke Exp $
 
-DISTNAME=      viewvc-1.2.3
-PKGREVISION=   2
+DISTNAME=      viewvc-1.3.0
 CATEGORIES=    www devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=viewvc/}
 
@@ -11,8 +10,6 @@ COMMENT=      View the content of CVS/SVN rep
 LICENSE=       2-clause-bsd
 
 REPLACE_PYTHON=        viewvc-install bin/* bin/cgi/*.cgi lib/*.py
-# https://github.com/viewvc/viewvc/issues/138
-PYTHON_VERSIONS_ACCEPTED=      27      # not yet ported as of 1.2.3
 
 .if exists(/usr/bin/rlog)
 RCSPATH=       /usr/bin
@@ -63,7 +60,7 @@ SUBST_VARS.conf+=     VIEWVCDIR DIFF RCSPATH
 
 CHECK_PORTABILITY_SKIP=        tools/make-release
 
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR}
+INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${VIEWVCDIR}/bin
 
 do-install:
        (cd ${WRKSRC} && ${PYTHONBIN} viewvc-install \
@@ -77,9 +74,5 @@ do-install:
                ${DESTDIR}${PREFIX}/${DOCDIR}/${doc:T}
 .endfor
 
-post-install:
-       ( cd ${DESTDIR}${PREFIX}/${VIEWVCDIR}/bin/mod_python ; \
-               ${CHMOD} ${SHAREMODE} .htaccess *.py)
-
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/viewvc/PLIST
diff -u pkgsrc/www/viewvc/PLIST:1.7 pkgsrc/www/viewvc/PLIST:1.8
--- pkgsrc/www/viewvc/PLIST:1.7 Fri Aug 18 22:20:49 2023
+++ pkgsrc/www/viewvc/PLIST     Wed Oct 21 16:00:17 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2023/08/18 22:20:49 hauke Exp $
+@comment $NetBSD: PLIST,v 1.8 2026/10/21 16:00:17 hauke Exp $
 share/doc/viewvc/CHANGES
 share/doc/viewvc/INSTALL
 share/doc/viewvc/template-authoring-guide.html
@@ -7,89 +7,91 @@ share/doc/viewvc/url-reference.html
 share/examples/viewvc/cvsgraph.conf
 share/examples/viewvc/mimetypes.conf
 share/examples/viewvc/viewvc.conf
+${VIEWVCDIR}/bin/cgi/iis/viewvc.cgi
 ${VIEWVCDIR}/bin/cgi/viewvc.cgi
-${VIEWVCDIR}/bin/cvsdbadmin
-${VIEWVCDIR}/bin/loginfo-handler
-${VIEWVCDIR}/bin/make-database
-${VIEWVCDIR}/bin/mod_python/.htaccess
-${VIEWVCDIR}/bin/mod_python/handler.py
-${VIEWVCDIR}/bin/mod_python/viewvc.py
+${VIEWVCDIR}/bin/db/cvsdbadmin
+${VIEWVCDIR}/bin/db/loginfo-handler
+${VIEWVCDIR}/bin/db/make-database
+${VIEWVCDIR}/bin/db/schema_0.sql
+${VIEWVCDIR}/bin/db/schema_1.sql
+${VIEWVCDIR}/bin/db/schema_2.sql
+${VIEWVCDIR}/bin/db/svndbadmin
 ${VIEWVCDIR}/bin/standalone.py
-${VIEWVCDIR}/bin/svndbadmin
 ${VIEWVCDIR}/bin/wsgi/viewvc.fcgi
 ${VIEWVCDIR}/bin/wsgi/viewvc.wsgi
+${VIEWVCDIR}/lib/__pycache__/accept.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/common.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/config.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/cvsdb.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/dbi.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/ezt.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/idiff.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/popen.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/sapi.cpython-313.pyc
+${VIEWVCDIR}/lib/__pycache__/viewvc.cpython-313.pyc
 ${VIEWVCDIR}/lib/accept.py
-${VIEWVCDIR}/lib/accept.pyc
-${VIEWVCDIR}/lib/blame.py
-${VIEWVCDIR}/lib/blame.pyc
 ${VIEWVCDIR}/lib/common.py
-${VIEWVCDIR}/lib/common.pyc
-${VIEWVCDIR}/lib/compat_difflib.py
-${VIEWVCDIR}/lib/compat_difflib.pyc
-${VIEWVCDIR}/lib/compat_ndiff.py
-${VIEWVCDIR}/lib/compat_ndiff.pyc
 ${VIEWVCDIR}/lib/config.py
-${VIEWVCDIR}/lib/config.pyc
 ${VIEWVCDIR}/lib/cvsdb.py
-${VIEWVCDIR}/lib/cvsdb.pyc
 ${VIEWVCDIR}/lib/dbi.py
-${VIEWVCDIR}/lib/dbi.pyc
-${VIEWVCDIR}/lib/debug.py
-${VIEWVCDIR}/lib/debug.pyc
 ${VIEWVCDIR}/lib/ezt.py
-${VIEWVCDIR}/lib/ezt.pyc
 ${VIEWVCDIR}/lib/idiff.py
-${VIEWVCDIR}/lib/idiff.pyc
 ${VIEWVCDIR}/lib/popen.py
-${VIEWVCDIR}/lib/popen.pyc
 ${VIEWVCDIR}/lib/sapi.py
-${VIEWVCDIR}/lib/sapi.pyc
 ${VIEWVCDIR}/lib/vcauth/__init__.py
-${VIEWVCDIR}/lib/vcauth/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/__pycache__/__init__.cpython-313.pyc
 ${VIEWVCDIR}/lib/vcauth/forbidden/__init__.py
-${VIEWVCDIR}/lib/vcauth/forbidden/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/forbidden/__pycache__/__init__.cpython-313.pyc
 ${VIEWVCDIR}/lib/vcauth/forbiddenre/__init__.py
-${VIEWVCDIR}/lib/vcauth/forbiddenre/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/forbiddenre/__pycache__/__init__.cpython-313.pyc
 ${VIEWVCDIR}/lib/vcauth/svnauthz/__init__.py
-${VIEWVCDIR}/lib/vcauth/svnauthz/__init__.pyc
+${VIEWVCDIR}/lib/vcauth/svnauthz/__pycache__/__init__.cpython-313.pyc
 ${VIEWVCDIR}/lib/vclib/__init__.py
-${VIEWVCDIR}/lib/vclib/__init__.pyc
+${VIEWVCDIR}/lib/vclib/__pycache__/__init__.cpython-313.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/__init__.py
-${VIEWVCDIR}/lib/vclib/ccvs/__init__.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/__pycache__/__init__.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/__pycache__/bincvs.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/__pycache__/blame.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/__pycache__/ccvs.cpython-313.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/__pycache__/__init__.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__pycache__/common.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__pycache__/debug.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__pycache__/default.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__pycache__/parse_rcs_file.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/__pycache__/run-tests.cpython-313.pyc
 ${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.py
-${VIEWVCDIR}/lib/vclib/ccvs/rcsparse/common.pyc
 ${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/__pycache__/__init__.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/svn/__pycache__/svn_ra.cpython-313.pyc
+${VIEWVCDIR}/lib/vclib/svn/__pycache__/svn_repos.cpython-313.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/classic/_diff_display.ezt
+${VIEWVCDIR}/templates/classic/_diff_form.ezt
+${VIEWVCDIR}/templates/classic/_dir_footer.ezt
+${VIEWVCDIR}/templates/classic/_dir_header.ezt
+${VIEWVCDIR}/templates/classic/_file_header.ezt
+${VIEWVCDIR}/templates/classic/_footer.ezt
+${VIEWVCDIR}/templates/classic/_header.ezt
+${VIEWVCDIR}/templates/classic/_log_footer.ezt
+${VIEWVCDIR}/templates/classic/_log_header.ezt
+${VIEWVCDIR}/templates/classic/_paging.ezt
+${VIEWVCDIR}/templates/classic/_pathrev_form.ezt
+${VIEWVCDIR}/templates/classic/_props.ezt
+${VIEWVCDIR}/templates/classic/_sort.ezt
 ${VIEWVCDIR}/templates/classic/diff.ezt
 ${VIEWVCDIR}/templates/classic/dir_new.ezt
 ${VIEWVCDIR}/templates/classic/directory.ezt
@@ -124,19 +126,6 @@ ${VIEWVCDIR}/templates/classic/docroot/s
 ${VIEWVCDIR}/templates/classic/error.ezt
 ${VIEWVCDIR}/templates/classic/file.ezt
 ${VIEWVCDIR}/templates/classic/graph.ezt
-${VIEWVCDIR}/templates/classic/include/diff_display.ezt
-${VIEWVCDIR}/templates/classic/include/diff_form.ezt
-${VIEWVCDIR}/templates/classic/include/dir_footer.ezt
-${VIEWVCDIR}/templates/classic/include/dir_header.ezt
-${VIEWVCDIR}/templates/classic/include/file_header.ezt
-${VIEWVCDIR}/templates/classic/include/footer.ezt
-${VIEWVCDIR}/templates/classic/include/header.ezt
-${VIEWVCDIR}/templates/classic/include/log_footer.ezt
-${VIEWVCDIR}/templates/classic/include/log_header.ezt
-${VIEWVCDIR}/templates/classic/include/paging.ezt
-${VIEWVCDIR}/templates/classic/include/pathrev_form.ezt
-${VIEWVCDIR}/templates/classic/include/props.ezt
-${VIEWVCDIR}/templates/classic/include/sort.ezt
 ${VIEWVCDIR}/templates/classic/log.ezt
 ${VIEWVCDIR}/templates/classic/log_table.ezt
 ${VIEWVCDIR}/templates/classic/query_form.ezt
@@ -144,6 +133,12 @@ ${VIEWVCDIR}/templates/classic/query_res
 ${VIEWVCDIR}/templates/classic/revision.ezt
 ${VIEWVCDIR}/templates/classic/roots.ezt
 ${VIEWVCDIR}/templates/classic/rss.ezt
+${VIEWVCDIR}/templates/default/_diff_display.ezt
+${VIEWVCDIR}/templates/default/_diff_form.ezt
+${VIEWVCDIR}/templates/default/_footer.ezt
+${VIEWVCDIR}/templates/default/_header.ezt
+${VIEWVCDIR}/templates/default/_pathrev_form.ezt
+${VIEWVCDIR}/templates/default/_props.ezt
 ${VIEWVCDIR}/templates/default/diff.ezt
 ${VIEWVCDIR}/templates/default/directory.ezt
 ${VIEWVCDIR}/templates/default/docroot/help.css
@@ -170,12 +165,6 @@ ${VIEWVCDIR}/templates/default/docroot/s
 ${VIEWVCDIR}/templates/default/error.ezt
 ${VIEWVCDIR}/templates/default/file.ezt
 ${VIEWVCDIR}/templates/default/graph.ezt
-${VIEWVCDIR}/templates/default/include/diff_display.ezt
-${VIEWVCDIR}/templates/default/include/diff_form.ezt
-${VIEWVCDIR}/templates/default/include/footer.ezt
-${VIEWVCDIR}/templates/default/include/header.ezt
-${VIEWVCDIR}/templates/default/include/pathrev_form.ezt
-${VIEWVCDIR}/templates/default/include/props.ezt
 ${VIEWVCDIR}/templates/default/log.ezt
 ${VIEWVCDIR}/templates/default/query_form.ezt
 ${VIEWVCDIR}/templates/default/query_results.ezt

Index: pkgsrc/www/viewvc/distinfo
diff -u pkgsrc/www/viewvc/distinfo:1.23 pkgsrc/www/viewvc/distinfo:1.24
--- pkgsrc/www/viewvc/distinfo:1.23     Fri Aug 18 22:20:49 2023
+++ pkgsrc/www/viewvc/distinfo  Wed Oct 21 16:00:17 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2023/08/18 22:20:49 hauke Exp $
+$NetBSD: distinfo,v 1.24 2026/10/21 16:00:17 hauke Exp $
 
-BLAKE2s (viewvc-1.2.3.tar.gz) = 4efe844e1fedca51c40245d61c96e951b30db0fb9081e54230459a508be19144
-SHA512 (viewvc-1.2.3.tar.gz) = dd5fd1d01629e7e6894e3bd244579a3581883ffb18f66e4ca44b911a5bc41810fcdd1176bfdbf0b88c943780b61c1af2a35c4dd8d757b9e10ff00d560eee0a0f
-Size (viewvc-1.2.3.tar.gz) = 361272 bytes
-SHA1 (patch-conf_viewvc.conf.dist) = 44d16cc79e02bac4639a61235b6685ab8c56c26d
-SHA1 (patch-lib_viewvc.py) = d6ba030b22b4284d36edec3f482394b97f30c19a
-SHA1 (patch-viewvc-install) = e05fa7219d8a55b0359336b2f08cef20c4bf6cfa
+BLAKE2s (viewvc-1.3.0.tar.gz) = 20aa7bfe596fb7033daa8fba3054e399750b08c1f0f4c0d0b0ac3d25e220148f
+SHA512 (viewvc-1.3.0.tar.gz) = 40c00626fc442342bf10fa3ae470af9b5f0473f4fa3b1ebe36cab62fc45d93cb794663ea46e27f5c681c951cc9c069af7eda6486db9039de0885e0008b00730f
+Size (viewvc-1.3.0.tar.gz) = 349829 bytes
+SHA1 (patch-conf_viewvc.conf.dist) = e1225d50b70ac1c29185b5604a011f5306640941
+SHA1 (patch-lib_viewvc.py) = f9131f76a00a6e0855c6e4ed6545bd7130fb3b2e
+SHA1 (patch-viewvc-install) = 5b95b495c1d7320654363f73fc1dc1830739ac11

Index: pkgsrc/www/viewvc/patches/patch-conf_viewvc.conf.dist
diff -u pkgsrc/www/viewvc/patches/patch-conf_viewvc.conf.dist:1.1 pkgsrc/www/viewvc/patches/patch-conf_viewvc.conf.dist:1.2
--- pkgsrc/www/viewvc/patches/patch-conf_viewvc.conf.dist:1.1   Fri Aug 18 22:20:49 2023
+++ pkgsrc/www/viewvc/patches/patch-conf_viewvc.conf.dist       Wed Oct 21 16:00:17 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-conf_viewvc.conf.dist,v 1.1 2023/08/18 22:20:49 hauke Exp $
+$NetBSD: patch-conf_viewvc.conf.dist,v 1.2 2026/10/21 16:00:17 hauke Exp $
 
 Make paths adaptable for pkgsrc installation.
 
---- conf/viewvc.conf.dist.orig 2023-01-04 14:48:34.000000000 +0000
+--- conf/viewvc.conf.dist.orig 2026-10-21 15:44:45.447515462 +0000
 +++ conf/viewvc.conf.dist
-@@ -218,7 +218,8 @@
+@@ -222,7 +222,8 @@
  ##                    /etc/mime.types,
  ##                    /usr/local/apache2/conf/mime.types
  ##
@@ -12,9 +12,9 @@ Make paths adaptable for pkgsrc installa
 +#mime_types_files = @PKG_SYSCONFDIR@/mimetypes.conf,
 +#                   @PKG_SYSCONFBASE@/httpd/mime.types
  
- ## address: The address of the local repository maintainer.  (This
- ## option is provided only as a convenience for ViewVC installations
-@@ -312,7 +313,7 @@
+ ## allowed_hosts: A list of allowed hostname or hostname:port values
+ ## specified in server URL. If there are no values specified, any hostname
+@@ -333,7 +334,7 @@
  ## Example:
  ## rcs_dir = /usr/bin/
  ##
@@ -23,16 +23,16 @@ Make paths adaptable for pkgsrc installa
  
  ## cvsnt: Location of cvsnt program.  ViewVC can use CVSNT (www.cvsnt.org)
  ## instead of the RCS utilities to retrieve information from CVS
-@@ -334,7 +335,7 @@
+@@ -355,7 +356,7 @@
  ## Example:
  ## diff = /usr/bin/diff
  ##
 -#diff = 
-+diff = @DIFF@
++diff = @DIFF@ 
  
- ## cvsgraph: Location of the CvsGraph program, a graphical CVS version
- ## graph generator (see options.use_cvsgraph).
-@@ -342,7 +343,7 @@
+ ## max_context: Number of context lines to pass to diff program with
+ ## "--unified" option, for "Full human readable" format.
+@@ -375,7 +376,7 @@
  ## Example:
  ## cvsgraph = /usr/local/bin/cvsgraph
  ##
@@ -41,7 +41,7 @@ Make paths adaptable for pkgsrc installa
  
  
  ##---------------------------------------------------------------------------
-@@ -662,7 +663,7 @@
+@@ -744,7 +745,7 @@
  ## template_dir = templates/default
  ## template_dir = /opt/custom-viewvc-templates/templates
  #
@@ -50,7 +50,7 @@ Make paths adaptable for pkgsrc installa
  
  ## docroot: Web path to a directory that contains ViewVC static files
  ## (stylesheets, images, etc.)  If set, static files will get
-@@ -753,13 +754,13 @@
+@@ -846,13 +847,13 @@
  
  ## use_cvsgraph: Use CvsGraph to offer visual graphs of CVS revision history.
  ##
Index: pkgsrc/www/viewvc/patches/patch-lib_viewvc.py
diff -u pkgsrc/www/viewvc/patches/patch-lib_viewvc.py:1.1 pkgsrc/www/viewvc/patches/patch-lib_viewvc.py:1.2
--- pkgsrc/www/viewvc/patches/patch-lib_viewvc.py:1.1   Fri Aug 18 22:20:49 2023
+++ pkgsrc/www/viewvc/patches/patch-lib_viewvc.py       Wed Oct 21 16:00:17 2026
@@ -1,14 +1,14 @@
-$NetBSD: patch-lib_viewvc.py,v 1.1 2023/08/18 22:20:49 hauke Exp $
+$NetBSD: patch-lib_viewvc.py,v 1.2 2026/10/21 16:00:17 hauke Exp $
 
 Look for config file under PKG_SYSCONFDIR
 
---- lib/viewvc.py.orig 2023-01-04 14:48:34.000000000 +0000
+--- lib/viewvc.py.orig 2026-10-21 15:41:55.661125227 +0000
 +++ lib/viewvc.py
-@@ -5158,6 +5158,7 @@ def load_config(pathname=None, server=No
-   # default.
-   pathname = (env_pathname
-               or pathname
-+              or "@PKG_SYSCONFDIR@/viewvc.conf"
-               or os.path.join(os.path.dirname(os.path.dirname(__file__)),
-                               "viewvc.conf"))
+@@ -5574,6 +5574,7 @@ def load_config(pathname=None, server=No
+     pathname = (
+         env_pathname
+         or pathname
++        or "@PKG_SYSCONFDIR@/viewvc.conf"
+         or os.path.join(os.path.dirname(os.path.dirname(__file__)), "viewvc.conf")
+     )
  
Index: pkgsrc/www/viewvc/patches/patch-viewvc-install
diff -u pkgsrc/www/viewvc/patches/patch-viewvc-install:1.1 pkgsrc/www/viewvc/patches/patch-viewvc-install:1.2
--- pkgsrc/www/viewvc/patches/patch-viewvc-install:1.1  Fri Aug 18 22:20:49 2023
+++ pkgsrc/www/viewvc/patches/patch-viewvc-install      Wed Oct 21 16:00:17 2026
@@ -1,28 +1,28 @@
-$NetBSD: patch-viewvc-install,v 1.1 2023/08/18 22:20:49 hauke Exp $
+$NetBSD: patch-viewvc-install,v 1.2 2026/10/21 16:00:17 hauke Exp $
 
 Let pkgsrc machinery take care of config files 
 
---- viewvc-install.orig        2023-01-04 14:48:34.000000000 +0000
+--- viewvc-install.orig        2026-10-21 15:38:54.232041894 +0000
 +++ viewvc-install
-@@ -56,12 +56,6 @@ FILE_INFO_LIST = [
-     ("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),
--    ("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([
-@@ -128,7 +122,7 @@ def replace_paths(contents):
-         shbang = '#!' + sys.executable
-         contents = re.sub('^#![^\n]*', _escape(shbang), contents)
-     contents = replace_var(contents, 'LIBRARY_DIR', 'lib')
--    contents = replace_var(contents, 'CONF_PATHNAME', 'viewvc.conf')
-+    contents = replace_var(contents, 'CONF_PATHNAME', '@PKG_SYSCONFDIR@/viewvc.conf')
+@@ -67,12 +67,6 @@ FILE_INFO_LIST = [
+     ("bin/db/schema_0.sql", "bin/db/schema_0.sql", 0o0644, 1, 0, 0),
+     ("bin/db/schema_1.sql", "bin/db/schema_1.sql", 0o0644, 1, 0, 0),
+     ("bin/db/schema_2.sql", "bin/db/schema_2.sql", 0o0644, 1, 0, 0),
+-    ("conf/viewvc.conf.dist", "viewvc.conf.dist", 0o0644, 0, 0, 0),
+-    ("conf/viewvc.conf.dist", "viewvc.conf", 0o0644, 0, 1, 0),
+-    ("conf/cvsgraph.conf.dist", "cvsgraph.conf.dist", 0o0644, 0, 0, 0),
+-    ("conf/cvsgraph.conf.dist", "cvsgraph.conf", 0o0644, 0, 1, 0),
+-    ("conf/mimetypes.conf.dist", "mimetypes.conf.dist", 0o0644, 0, 0, 0),
+-    ("conf/mimetypes.conf.dist", "mimetypes.conf", 0o0644, 0, 1, 0),
+ ]
+ 
+ 
+@@ -140,7 +134,7 @@ def replace_paths(contents):
+         shbang = b"#!" + sys.executable.encode("utf-8", "surrogateescape")
+         contents = re.sub(b"^#![^\n]*", _escape(shbang), contents)
+     contents = replace_var(contents, b"LIBRARY_DIR", b"lib")
+-    contents = replace_var(contents, b"CONF_PATHNAME", b"viewvc.conf")
++    contents = replace_var(contents, b"CONF_PATHNAME", b"@PKG_SYSCONFDIR@/viewvc.conf")
      return contents

Prev by Date: CVS commit: [pkgsrc-2026Q3] pkgsrc/security/p5-Mozilla-CA
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: [pkgsrc-2026Q3] pkgsrc/security/p5-Mozilla-CA
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index