svn commit: r556303 - in head/devel: . viewvc viewvc-devel viewvc-devel/files

Dan Langille dvl at FreeBSD.org
Wed Nov 25 19:29:38 UTC 2020 

Author: dvl
Date: Wed Nov 25 19:29:36 2020
New Revision: 556303
URL: https://svnweb.freebsd.org/changeset/ports/556303

Log:
  Add devel/viewvc-devel which uses Python 3
  
  The original PR is from Robert William Vesterman but the bulk of this patch
  comes from Yasuhito FUTATSUKI <freebsd-bug-report-yf at yf.bsdclub.org>
  
  PR:		247161,247804
  Submitted by:	Robert William Vesterman <bob at vesterman.com>,Yasuhito FUTATSUKI <freebsd-bug-report-yf at yf.bsdclub.org>
  Approved by:	maintainer timeout (7 weeks)

Added:
  head/devel/viewvc-devel/
     - copied from r556302, head/devel/viewvc/
  head/devel/viewvc-devel/files/patch-conf_viewvc.conf.dist   (contents, props changed)
Modified:
  head/devel/Makefile
  head/devel/viewvc-devel/Makefile
  head/devel/viewvc-devel/distinfo
  head/devel/viewvc-devel/files/pkg-message.in
  head/devel/viewvc-devel/pkg-plist
  head/devel/viewvc/Makefile

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Wed Nov 25 18:28:32 2020	(r556302)
+++ head/devel/Makefile	Wed Nov 25 19:29:36 2020	(r556303)
@@ -6819,6 +6819,7 @@
     SUBDIR += vera++
     SUBDIR += vexcl
     SUBDIR += viewvc
+    SUBDIR += viewvc-devel
     SUBDIR += violet
     SUBDIR += vitables
     SUBDIR += volk

Modified: head/devel/viewvc-devel/Makefile
==============================================================================
--- head/devel/viewvc/Makefile	Wed Nov 25 18:28:32 2020	(r556302)
+++ head/devel/viewvc-devel/Makefile	Wed Nov 25 19:29:36 2020	(r556303)
@@ -2,17 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	viewvc
-DISTVERSION=	1.2.1
-PORTREVISION=	1
+DISTVERSION=	1.3.0-20201006
 CATEGORIES=	devel python
+PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=  -devel
 
-MAINTAINER=	ohauer at FreeBSD.org
+MAINTAINER=	dvl at FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cpe python:2.7
+USES=		cpe python:3.6+
+USE_PYTHON=	flavors
 USE_GITHUB=	yes
+GH_TAGNAME=	c93d9da79c31457ecb0a771ff52d28353dc6e878
 USE_RC_SUBR=	viewvc
 
 NO_BUILD=		yes
@@ -35,10 +38,12 @@ LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 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}
 
-SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
+SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
 
 RUN_DEPENDS+=		${PY_PYGMENTS}
 
+CONFLICTS_INSTALL=      viewvc-1.[12].[0-9]*
+
 .include <bsd.port.options.mk>
 
 SUB_FILES=	pkg-message
@@ -57,7 +62,8 @@ post-patch:
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
-		${WRKSRC}/viewvc-install
+		${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 '' \

Modified: head/devel/viewvc-devel/distinfo
==============================================================================
--- head/devel/viewvc/distinfo	Wed Nov 25 18:28:32 2020	(r556302)
+++ head/devel/viewvc-devel/distinfo	Wed Nov 25 19:29:36 2020	(r556303)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587311591
-SHA256 (viewvc-viewvc-1.2.1_GH0.tar.gz) = 5fe1e16f986b51a2800d908683673b880684e90ae1611d98744187f0649634f5
-SIZE (viewvc-viewvc-1.2.1_GH0.tar.gz) = 361031
+TIMESTAMP = 1602044238
+SHA256 (viewvc-viewvc-1.3.0-20201006-c93d9da79c31457ecb0a771ff52d28353dc6e878_GH0.tar.gz) = 8ed4212283a327eaff2e5badcd20106e07377a26fd959d52027179cfd1f19824
+SIZE (viewvc-viewvc-1.3.0-20201006-c93d9da79c31457ecb0a771ff52d28353dc6e878_GH0.tar.gz) = 338905

Added: head/devel/viewvc-devel/files/patch-conf_viewvc.conf.dist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/viewvc-devel/files/patch-conf_viewvc.conf.dist	Wed Nov 25 19:29:36 2020	(r556303)
@@ -0,0 +1,13 @@
+--- conf/viewvc.conf.dist.orig	2020-11-25 18:40:53 UTC
++++ conf/viewvc.conf.dist
+@@ -331,6 +331,10 @@
+ ## diff: Location of the GNU diff program, used for showing file
+ ## version differences.
+ ##
++## If you want to use side-by-side diff or full colored diff on FreeBSD 12
++## or later, it is need to install GNU diff via diffutils packge and to
++## specify it here.
++##
+ ## Example:
+ ## diff = /usr/bin/diff
+ ##

Modified: head/devel/viewvc-devel/files/pkg-message.in
==============================================================================
--- head/devel/viewvc/files/pkg-message.in	Wed Nov 25 18:28:32 2020	(r556302)
+++ head/devel/viewvc-devel/files/pkg-message.in	Wed Nov 25 19:29:36 2020	(r556303)
@@ -55,11 +55,15 @@
        ".cgi" => "%%PYTHON_CMD%%",
      )
  }
+
+ Note: Cvsdb (Bonsai-like repository query) feature is not stable and
+       have some incompatibility on DB data with any released version,
+       (and it may be also incompatible with any feature release). 
 EOM
 }
 {
   type: upgrade
-  maximum_version: "1.2.1"
+  maximum_version: "1.3.0"
   message: <<EOM
   Please review your vievc.conf, see viewvc.sample.conf
   ======================================================
@@ -67,8 +71,14 @@ EOM
    - the vhost notation has changed
 
   Additional upgrade informations:
-   https://github.com/viewvc/viewvc/blob/master/docs/upgrading-howto.html
- 
+  https://github.com/viewvc/viewvc/blob/master/docs/upgrading-howto.html
+
+  Note: Cvsdb (Bonsai-like repository query) feature is not stable and
+        have some incompatibility on DB data with any released version,
+        (and it may be also incompatible with any feature release). 
+        So if you want to use this feature, make sure to make back up
+        of existing DB and then rebuild your DB data with
+        cvsdbadmin/svndbadmin.
 EOM
 }
 ]

Modified: head/devel/viewvc-devel/pkg-plist
==============================================================================
--- head/devel/viewvc/pkg-plist	Wed Nov 25 18:28:32 2020	(r556302)
+++ head/devel/viewvc-devel/pkg-plist	Wed Nov 25 19:29:36 2020	(r556303)
@@ -2,9 +2,6 @@ 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/viewvc.py
 viewvc/bin/standalone.py
 viewvc/bin/svndbadmin
 viewvc/bin/wsgi/viewvc.fcgi
@@ -16,18 +13,12 @@ viewvc/lib/blame.py
 viewvc/lib/blame.pyc
 viewvc/lib/common.py
 viewvc/lib/common.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
@@ -70,8 +61,6 @@ 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
@@ -80,9 +69,20 @@ 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/classic/_diff_display.ezt
+viewvc/templates/classic/_diff_form.ezt
+viewvc/templates/classic/_dir_footer.ezt
+viewvc/templates/classic/_dir_header.ezt
+viewvc/templates/classic/_file_header.ezt
+viewvc/templates/classic/_footer.ezt
+viewvc/templates/classic/_header.ezt
+viewvc/templates/classic/_log_footer.ezt
+viewvc/templates/classic/_log_header.ezt
+viewvc/templates/classic/_paging.ezt
+viewvc/templates/classic/_pathrev_form.ezt
+viewvc/templates/classic/_props.ezt
+viewvc/templates/classic/_sort.ezt
 viewvc/templates/classic/diff.ezt
 viewvc/templates/classic/dir_new.ezt
 viewvc/templates/classic/directory.ezt
@@ -117,19 +117,6 @@ viewvc/templates/classic/docroot/styles.css
 viewvc/templates/classic/error.ezt
 viewvc/templates/classic/file.ezt
 viewvc/templates/classic/graph.ezt
-viewvc/templates/classic/include/diff_display.ezt
-viewvc/templates/classic/include/diff_form.ezt
-viewvc/templates/classic/include/dir_footer.ezt
-viewvc/templates/classic/include/dir_header.ezt
-viewvc/templates/classic/include/file_header.ezt
-viewvc/templates/classic/include/footer.ezt
-viewvc/templates/classic/include/header.ezt
-viewvc/templates/classic/include/log_footer.ezt
-viewvc/templates/classic/include/log_header.ezt
-viewvc/templates/classic/include/paging.ezt
-viewvc/templates/classic/include/pathrev_form.ezt
-viewvc/templates/classic/include/props.ezt
-viewvc/templates/classic/include/sort.ezt
 viewvc/templates/classic/log.ezt
 viewvc/templates/classic/log_table.ezt
 viewvc/templates/classic/query_form.ezt
@@ -137,6 +124,12 @@ viewvc/templates/classic/query_results.ezt
 viewvc/templates/classic/revision.ezt
 viewvc/templates/classic/roots.ezt
 viewvc/templates/classic/rss.ezt
+viewvc/templates/default/_diff_display.ezt
+viewvc/templates/default/_diff_form.ezt
+viewvc/templates/default/_footer.ezt
+viewvc/templates/default/_header.ezt
+viewvc/templates/default/_pathrev_form.ezt
+viewvc/templates/default/_props.ezt
 viewvc/templates/default/diff.ezt
 viewvc/templates/default/directory.ezt
 viewvc/templates/default/docroot/help.css
@@ -163,12 +156,6 @@ viewvc/templates/default/docroot/styles.css
 viewvc/templates/default/error.ezt
 viewvc/templates/default/file.ezt
 viewvc/templates/default/graph.ezt
-viewvc/templates/default/include/diff_display.ezt
-viewvc/templates/default/include/diff_form.ezt
-viewvc/templates/default/include/footer.ezt
-viewvc/templates/default/include/header.ezt
-viewvc/templates/default/include/pathrev_form.ezt
-viewvc/templates/default/include/props.ezt
 viewvc/templates/default/log.ezt
 viewvc/templates/default/query_form.ezt
 viewvc/templates/default/query_results.ezt

Modified: head/devel/viewvc/Makefile
==============================================================================
--- head/devel/viewvc/Makefile	Wed Nov 25 18:28:32 2020	(r556302)
+++ head/devel/viewvc/Makefile	Wed Nov 25 19:29:36 2020	(r556303)
@@ -9,6 +9,8 @@ CATEGORIES=	devel python
 MAINTAINER=	ohauer at FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 
+CONFLICTS_INSTALL=      py[23][6-8]-viewvc-1.3*
+
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe python:2.7

More information about the svn-ports-head mailing list