Index: branches/2020Q2/devel/viewvc/Makefile
===================================================================
--- branches/2020Q2/devel/viewvc/Makefile	(revision 532128)
+++ branches/2020Q2/devel/viewvc/Makefile	(revision 532129)
@@ -1,81 +1,81 @@
 # Created by: will
 # $FreeBSD$
 
 PORTNAME=	viewvc
-DISTVERSION=	1.1.27
+DISTVERSION=	1.1.28
 PORTREVISION=	0
 CATEGORIES=	devel python
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe python:2.7
 USE_GITHUB=	yes
 USE_RC_SUBR=	viewvc
 
 NO_BUILD=		yes
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		WEBSRV APMOD SVN MYSQL
 OPTIONS_DEFAULT=	WEBSRV APACHE SVN
 
 OPTIONS_SINGLE=		WEBSRV APMOD
 OPTIONS_SINGLE_WEBSRV=	APACHE LIGHTTPD
 OPTIONS_SINGLE_APMOD=	MODPYTHON35 MODWSGI
 
 WEBSRV_DESC=		Enable web server support
 APMOD_DESC=		depend on Apache module
 
 MODWSGI_DESC=		Add mod_wsgi to the list of package dependencies
 MODPYTHON35_DESC=	Add mod_python35 to the list of package dependencies
 MYSQL_DESC=		Bonsai-like repository query facilities
 
 APACHE_USE=		APACHE_RUN=24+
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python35
 MODWSGI_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
 
 
 .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 19
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion19>=0:devel/py-subversion@${PY_FLAVOR}
 .else
 # default version
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
 .endif
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
 		CHOWN=${CHOWN} RM=${RM:Q}
 
 pre-everything::
 .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE}
 IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
 .endif
 
 post-patch:
 .for i in cvsgraph.conf mimetypes.conf viewvc.conf
 	${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
 		${WRKSRC}/viewvc-install \
 		${WRKSRC}/bin/standalone.py
 # to much files, use own shebangfix
 	${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
 		| ${XARGS} ${SED} -i '' \
 		-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
 		-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
 
 .include <bsd.port.mk>
Index: branches/2020Q2/devel/viewvc/distinfo
===================================================================
--- branches/2020Q2/devel/viewvc/distinfo	(revision 532128)
+++ branches/2020Q2/devel/viewvc/distinfo	(revision 532129)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559914651
-SHA256 (viewvc-viewvc-1.1.27_GH0.tar.gz) = 00d6ea604f3b987c2cff834678b92ab1191e2009c5fdbc0e87d1b7f2226496e4
-SIZE (viewvc-viewvc-1.1.27_GH0.tar.gz) = 668188
+TIMESTAMP = 1587305824
+SHA256 (viewvc-viewvc-1.1.28_GH0.tar.gz) = 6d53db40ac9f81155060c0af6eadce8b95a0bda7a6f3ae5d3b89a91c625d3711
+SIZE (viewvc-viewvc-1.1.28_GH0.tar.gz) = 661267
Index: branches/2020Q2/devel/viewvc/pkg-plist
===================================================================
--- branches/2020Q2/devel/viewvc/pkg-plist	(revision 532128)
+++ branches/2020Q2/devel/viewvc/pkg-plist	(revision 532129)
@@ -1,247 +1,243 @@
 viewvc/bin/cgi/query.cgi
 viewvc/bin/cgi/viewvc.cgi
 viewvc/bin/cvsdbadmin
 viewvc/bin/loginfo-handler
 viewvc/bin/make-database
 viewvc/bin/mod_python/.htaccess
 viewvc/bin/mod_python/handler.py
 viewvc/bin/mod_python/query.py
 viewvc/bin/mod_python/viewvc.py
 viewvc/bin/standalone.py
 viewvc/bin/svndbadmin
 viewvc/bin/wsgi/query.fcgi
 viewvc/bin/wsgi/query.wsgi
 viewvc/bin/wsgi/viewvc.fcgi
 viewvc/bin/wsgi/viewvc.wsgi
 @sample viewvc/cvsgraph.conf.sample
-viewvc/lib/PyFontify.py
-viewvc/lib/PyFontify.pyc
 viewvc/lib/accept.py
 viewvc/lib/accept.pyc
 viewvc/lib/blame.py
 viewvc/lib/blame.pyc
 viewvc/lib/compat.py
 viewvc/lib/compat.pyc
 viewvc/lib/compat_difflib.py
 viewvc/lib/compat_difflib.pyc
 viewvc/lib/compat_ndiff.py
 viewvc/lib/compat_ndiff.pyc
 viewvc/lib/config.py
 viewvc/lib/config.pyc
 viewvc/lib/cvsdb.py
 viewvc/lib/cvsdb.pyc
 viewvc/lib/dbi.py
 viewvc/lib/dbi.pyc
 viewvc/lib/debug.py
 viewvc/lib/debug.pyc
 viewvc/lib/ezt.py
 viewvc/lib/ezt.pyc
 viewvc/lib/idiff.py
 viewvc/lib/idiff.pyc
 viewvc/lib/popen.py
 viewvc/lib/popen.pyc
-viewvc/lib/py2html.py
-viewvc/lib/py2html.pyc
 viewvc/lib/query.py
 viewvc/lib/query.pyc
 viewvc/lib/sapi.py
 viewvc/lib/sapi.pyc
 viewvc/lib/vcauth/__init__.py
 viewvc/lib/vcauth/__init__.pyc
 viewvc/lib/vcauth/forbidden/__init__.py
 viewvc/lib/vcauth/forbidden/__init__.pyc
 viewvc/lib/vcauth/forbiddenre/__init__.py
 viewvc/lib/vcauth/forbiddenre/__init__.pyc
 viewvc/lib/vcauth/svnauthz/__init__.py
 viewvc/lib/vcauth/svnauthz/__init__.pyc
 viewvc/lib/vclib/__init__.py
 viewvc/lib/vclib/__init__.pyc
 viewvc/lib/vclib/ccvs/__init__.py
 viewvc/lib/vclib/ccvs/__init__.pyc
 viewvc/lib/vclib/ccvs/bincvs.py
 viewvc/lib/vclib/ccvs/bincvs.pyc
 viewvc/lib/vclib/ccvs/blame.py
 viewvc/lib/vclib/ccvs/blame.pyc
 viewvc/lib/vclib/ccvs/ccvs.py
 viewvc/lib/vclib/ccvs/ccvs.pyc
 viewvc/lib/vclib/ccvs/rcsparse/__init__.py
 viewvc/lib/vclib/ccvs/rcsparse/__init__.pyc
 viewvc/lib/vclib/ccvs/rcsparse/common.py
 viewvc/lib/vclib/ccvs/rcsparse/common.pyc
 viewvc/lib/vclib/ccvs/rcsparse/debug.py
 viewvc/lib/vclib/ccvs/rcsparse/debug.pyc
 viewvc/lib/vclib/ccvs/rcsparse/default.py
 viewvc/lib/vclib/ccvs/rcsparse/default.pyc
 viewvc/lib/vclib/ccvs/rcsparse/parse_rcs_file.py
 viewvc/lib/vclib/ccvs/rcsparse/parse_rcs_file.pyc
 viewvc/lib/vclib/ccvs/rcsparse/run-tests.py
 viewvc/lib/vclib/ccvs/rcsparse/run-tests.pyc
 viewvc/lib/vclib/ccvs/rcsparse/test-data/default,v
 viewvc/lib/vclib/ccvs/rcsparse/test-data/default.out
 viewvc/lib/vclib/ccvs/rcsparse/test-data/empty-file,v
 viewvc/lib/vclib/ccvs/rcsparse/test-data/empty-file.out
 viewvc/lib/vclib/ccvs/rcsparse/texttools.py
 viewvc/lib/vclib/ccvs/rcsparse/texttools.pyc
 viewvc/lib/vclib/svn/__init__.py
 viewvc/lib/vclib/svn/__init__.pyc
 viewvc/lib/vclib/svn/svn_ra.py
 viewvc/lib/vclib/svn/svn_ra.pyc
 viewvc/lib/vclib/svn/svn_repos.py
 viewvc/lib/vclib/svn/svn_repos.pyc
 viewvc/lib/viewvc.py
 viewvc/lib/viewvc.pyc
 viewvc/lib/win32popen.py
 viewvc/lib/win32popen.pyc
 @sample viewvc/mimetypes.conf.sample
 viewvc/templates-contrib/README
 viewvc/templates-contrib/newvc/README
 viewvc/templates-contrib/newvc/templates/diff.ezt
 viewvc/templates-contrib/newvc/templates/directory.ezt
 viewvc/templates-contrib/newvc/templates/docroot/help.css
 viewvc/templates-contrib/newvc/templates/docroot/help_dirview.html
 viewvc/templates-contrib/newvc/templates/docroot/help_log.html
 viewvc/templates-contrib/newvc/templates/docroot/help_query.html
 viewvc/templates-contrib/newvc/templates/docroot/help_rootview.html
 viewvc/templates-contrib/newvc/templates/docroot/images/back.png
 viewvc/templates-contrib/newvc/templates/docroot/images/back_small.png
 viewvc/templates-contrib/newvc/templates/docroot/images/binary.png
 viewvc/templates-contrib/newvc/templates/docroot/images/broken.png
 viewvc/templates-contrib/newvc/templates/docroot/images/cvs-logo.png
 viewvc/templates-contrib/newvc/templates/docroot/images/dir.png
 viewvc/templates-contrib/newvc/templates/docroot/images/down.png
 viewvc/templates-contrib/newvc/templates/docroot/images/feed-icon-16x16.jpg
 viewvc/templates-contrib/newvc/templates/docroot/images/forward.png
 viewvc/templates-contrib/newvc/templates/docroot/images/image.png
 viewvc/templates-contrib/newvc/templates/docroot/images/svn-logo.png
 viewvc/templates-contrib/newvc/templates/docroot/images/text.png
 viewvc/templates-contrib/newvc/templates/docroot/images/up.png
 viewvc/templates-contrib/newvc/templates/docroot/images/viewvc-logo.png
 viewvc/templates-contrib/newvc/templates/docroot/scripts.js
 viewvc/templates-contrib/newvc/templates/docroot/styles.css
 viewvc/templates-contrib/newvc/templates/error.ezt
 viewvc/templates-contrib/newvc/templates/file.ezt
 viewvc/templates-contrib/newvc/templates/graph.ezt
 viewvc/templates-contrib/newvc/templates/include/diff_form.ezt
 viewvc/templates-contrib/newvc/templates/include/fileview.ezt
 viewvc/templates-contrib/newvc/templates/include/footer.ezt
 viewvc/templates-contrib/newvc/templates/include/header.ezt
 viewvc/templates-contrib/newvc/templates/include/pathrev_form.ezt
 viewvc/templates-contrib/newvc/templates/include/props.ezt
 viewvc/templates-contrib/newvc/templates/log.ezt
 viewvc/templates-contrib/newvc/templates/markup.ezt
 viewvc/templates-contrib/newvc/templates/query.ezt
 viewvc/templates-contrib/newvc/templates/query_form.ezt
 viewvc/templates-contrib/newvc/templates/query_results.ezt
 viewvc/templates-contrib/newvc/templates/revision.ezt
 viewvc/templates-contrib/newvc/templates/roots.ezt
 viewvc/templates-contrib/newvc/templates/rss.ezt
 viewvc/templates-contrib/viewsvn/INSTALL
 viewvc/templates-contrib/viewsvn/README
 viewvc/templates-contrib/viewsvn/extras/svnindex.css
 viewvc/templates-contrib/viewsvn/extras/svnindex.xsl
 viewvc/templates-contrib/viewsvn/screenshots/diff.png
 viewvc/templates-contrib/viewsvn/screenshots/dir.png
 viewvc/templates-contrib/viewsvn/screenshots/log.png
 viewvc/templates-contrib/viewsvn/screenshots/markup.png
 viewvc/templates-contrib/viewsvn/templates/diff.ezt
 viewvc/templates-contrib/viewsvn/templates/directory.ezt
 viewvc/templates-contrib/viewsvn/templates/docroot/images/broken.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/dir.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/down.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/download.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/favicon-svn.ico
 viewvc/templates-contrib/viewsvn/templates/docroot/images/feed-icon-16x16.jpg
 viewvc/templates-contrib/viewsvn/templates/docroot/images/logo-svn.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/logo-viewvc.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/svn.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/text.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back_small.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/blame.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/checkout.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/diff.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/forward.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/license.txt
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/log.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/patch.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/repos.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/tsvn.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/up.png
 viewvc/templates-contrib/viewsvn/templates/docroot/images/viewvc.png
 viewvc/templates-contrib/viewsvn/templates/docroot/styles.css
 viewvc/templates-contrib/viewsvn/templates/error.ezt
 viewvc/templates-contrib/viewsvn/templates/file.ezt
 viewvc/templates-contrib/viewsvn/templates/include/diff_form.ezt
 viewvc/templates-contrib/viewsvn/templates/include/dir_footer.ezt
 viewvc/templates-contrib/viewsvn/templates/include/dir_header.ezt
 viewvc/templates-contrib/viewsvn/templates/include/file_header.ezt
 viewvc/templates-contrib/viewsvn/templates/include/footer.ezt
 viewvc/templates-contrib/viewsvn/templates/include/header.ezt
 viewvc/templates-contrib/viewsvn/templates/include/log_footer.ezt
 viewvc/templates-contrib/viewsvn/templates/include/log_header.ezt
 viewvc/templates-contrib/viewsvn/templates/include/paging.ezt
 viewvc/templates-contrib/viewsvn/templates/include/pathrev_form.ezt
 viewvc/templates-contrib/viewsvn/templates/include/props.ezt
 viewvc/templates-contrib/viewsvn/templates/log.ezt
 viewvc/templates-contrib/viewsvn/templates/query.ezt
 viewvc/templates-contrib/viewsvn/templates/query_form.ezt
 viewvc/templates-contrib/viewsvn/templates/query_results.ezt
 viewvc/templates-contrib/viewsvn/templates/revision.ezt
 viewvc/templates-contrib/viewsvn/templates/roots.ezt
 viewvc/templates-contrib/viewsvn/templates/rss.ezt
 viewvc/templates/diff.ezt
 viewvc/templates/dir_new.ezt
 viewvc/templates/directory.ezt
 viewvc/templates/docroot/help.css
 viewvc/templates/docroot/help_dirview.html
 viewvc/templates/docroot/help_log.html
 viewvc/templates/docroot/help_query.html
 viewvc/templates/docroot/help_rootview.html
 viewvc/templates/docroot/images/annotate.png
 viewvc/templates/docroot/images/back.png
 viewvc/templates/docroot/images/back_small.png
 viewvc/templates/docroot/images/binary.png
 viewvc/templates/docroot/images/broken.png
 viewvc/templates/docroot/images/chalk.jpg
 viewvc/templates/docroot/images/cvsgraph_16x16.png
 viewvc/templates/docroot/images/cvsgraph_32x32.png
 viewvc/templates/docroot/images/diff.png
 viewvc/templates/docroot/images/dir.png
 viewvc/templates/docroot/images/down.png
 viewvc/templates/docroot/images/download.png
 viewvc/templates/docroot/images/favicon.ico
 viewvc/templates/docroot/images/feed-icon-16x16.jpg
 viewvc/templates/docroot/images/forward.png
 viewvc/templates/docroot/images/image.png
 viewvc/templates/docroot/images/list.png
 viewvc/templates/docroot/images/lock.png
 viewvc/templates/docroot/images/log.png
 viewvc/templates/docroot/images/text.png
 viewvc/templates/docroot/images/up.png
 viewvc/templates/docroot/images/view.png
 viewvc/templates/docroot/images/viewvc-logo.png
 viewvc/templates/docroot/styles.css
 viewvc/templates/error.ezt
 viewvc/templates/file.ezt
 viewvc/templates/graph.ezt
 viewvc/templates/include/diff_form.ezt
 viewvc/templates/include/dir_footer.ezt
 viewvc/templates/include/dir_header.ezt
 viewvc/templates/include/file_header.ezt
 viewvc/templates/include/footer.ezt
 viewvc/templates/include/header.ezt
 viewvc/templates/include/log_footer.ezt
 viewvc/templates/include/log_header.ezt
 viewvc/templates/include/paging.ezt
 viewvc/templates/include/pathrev_form.ezt
 viewvc/templates/include/props.ezt
 viewvc/templates/include/sort.ezt
 viewvc/templates/log.ezt
 viewvc/templates/log_table.ezt
 viewvc/templates/query.ezt
 viewvc/templates/query_form.ezt
 viewvc/templates/query_results.ezt
 viewvc/templates/revision.ezt
 viewvc/templates/roots.ezt
 viewvc/templates/rss.ezt
 @sample viewvc/viewvc.conf.sample
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 532128)
+++ branches/2020Q2	(revision 532129)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r532127