From owner-svn-ports-head@freebsd.org Wed May 1 14:03:46 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BE161597CB9; Wed, 1 May 2019 14:03:46 +0000 (UTC) (envelope-from ohauer@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) server-signature RSA-PSS (4096 bits) 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 A1E6A7717F; Wed, 1 May 2019 14:03:45 +0000 (UTC) (envelope-from ohauer@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 5C8A7225B4; Wed, 1 May 2019 14:03:45 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x41E3jrA028553; Wed, 1 May 2019 14:03:45 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x41E3jLY028552; Wed, 1 May 2019 14:03:45 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201905011403.x41E3jLY028552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 1 May 2019 14:03:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500590 - head/devel/viewvc X-SVN-Group: ports-head X-SVN-Commit-Author: ohauer X-SVN-Commit-Paths: head/devel/viewvc X-SVN-Commit-Revision: 500590 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A1E6A7717F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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, 01 May 2019 14:03:46 -0000 Author: ohauer Date: Wed May 1 14:03:44 2019 New Revision: 500590 URL: https://svnweb.freebsd.org/changeset/ports/500590 Log: - remove OPTION for MODPYTHON33 (www/mod_python33 was removed one year ago) - adjust APACHE_RUN s/22/24/ (apache22 was removed one year ago) - add decision to include correct py-subversion depending on WITH_SUBVERSION_VER - portlint - bump PORTREVISION Modified: head/devel/viewvc/Makefile Modified: head/devel/viewvc/Makefile ============================================================================== --- head/devel/viewvc/Makefile Wed May 1 10:43:04 2019 (r500589) +++ head/devel/viewvc/Makefile Wed May 1 14:03:44 2019 (r500590) @@ -3,6 +3,7 @@ PORTNAME= viewvc DISTVERSION= 1.1.26 +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= ohauer@FreeBSD.org @@ -10,44 +11,50 @@ 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= MODPYTHON33 MODPYTHON35 MODWSGI +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 -MODPYTHON33_DESC= Add mod_python33 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=22+ +APACHE_USE= APACHE_RUN=24+ LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd -MODPYTHON33_BROKEN= The mod_python33 port has been removed with Apache 2.2 -MODPYTHON33_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python33>=3.3:www/mod_python33 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} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${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 -USES= cpe python:2.7 -NO_BUILD= yes -USE_RC_SUBR= viewvc SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \ CHOWN=${CHOWN} RM=${RM:Q} - -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} pre-everything:: .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE}