From owner-svn-ports-head@freebsd.org Wed Nov 25 19:29:38 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 382AA4722D8; Wed, 25 Nov 2020 19:29:38 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ch9v60sTSz3v9J; Wed, 25 Nov 2020 19:29:38 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C4AB166F2; Wed, 25 Nov 2020 19:29:38 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0APJTbI3087469; Wed, 25 Nov 2020 19:29:37 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0APJTafJ087460; Wed, 25 Nov 2020 19:29:36 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <202011251929.0APJTafJ087460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Wed, 25 Nov 2020 19:29:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556303 - in head/devel: . viewvc viewvc-devel viewvc-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/devel: . viewvc viewvc-devel viewvc-devel/files X-SVN-Commit-Revision: 556303 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2020 19:29:38 -0000 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 PR: 247161,247804 Submitted by: Robert William Vesterman ,Yasuhito FUTATSUKI 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@FreeBSD.org +MAINTAINER= dvl@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 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: <