Date: Tue, 2 Jun 2020 18:36:35 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537567 - in head: devel/cvs2svn devel/py-subversion devel/viewvc www/trac www/trac-devel Message-ID: <202006021836.052IaZPC071048@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Jun 2 18:36:35 2020 New Revision: 537567 URL: https://svnweb.freebsd.org/changeset/ports/537567 Log: Fix devel/py-subversion and ports depending on it With hat: portmgr Modified: head/devel/cvs2svn/Makefile head/devel/py-subversion/Makefile head/devel/viewvc/Makefile head/www/trac-devel/Makefile head/www/trac/Makefile Modified: head/devel/cvs2svn/Makefile ============================================================================== --- head/devel/cvs2svn/Makefile Tue Jun 2 18:13:37 2020 (r537566) +++ head/devel/cvs2svn/Makefile Tue Jun 2 18:36:35 2020 (r537567) @@ -35,14 +35,7 @@ SUBVERSION_DESC= Build with subversion support GIT_DESC= Build with git support BAZAAR_DESC= Build with Bazaar support -.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR} -.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 19 -SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion19>=0:devel/py-subversion@${PY_FLAVOR} -.else -# default version -SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} -.endif GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:devel/git BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:devel/bzr Modified: head/devel/py-subversion/Makefile ============================================================================== --- head/devel/py-subversion/Makefile Tue Jun 2 18:13:37 2020 (r537566) +++ head/devel/py-subversion/Makefile Tue Jun 2 18:36:35 2020 (r537567) @@ -9,7 +9,7 @@ COMMENT= Python bindings for version control system BUILD_DEPENDS= ${LOCALBASE}/include/py3c.h:devel/py3c -USES= python:${BINDINGS_PYTHON_VERSION} +USES= python USE_PYTHON= flavors py3kplist PORTREVISION_114= 0 @@ -17,17 +17,15 @@ PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes +.if ${FLAVOR:Upy37:Mpy3*} +WITH_SUBVERSION_VER= 114 +.else +WITH_SUBVERSION_VER= LTS +.endif + .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= python - -.if ${WITH_SUBVERSION_VER} == 114 -BINDINGS_PYTHON_VERSION= 3.5+ -.elif ${WITH_SUBVERSION_VER} == LTS -BINDINGS_PYTHON_VERSION= 2.7 -.else -BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 114 (default) and LTS are supported -.endif CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ Modified: head/devel/viewvc/Makefile ============================================================================== --- head/devel/viewvc/Makefile Tue Jun 2 18:13:37 2020 (r537566) +++ head/devel/viewvc/Makefile Tue Jun 2 18:36:35 2020 (r537567) @@ -37,14 +37,7 @@ MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_pyt 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} Modified: head/www/trac-devel/Makefile ============================================================================== --- head/www/trac-devel/Makefile Tue Jun 2 18:13:37 2020 (r537566) +++ head/www/trac-devel/Makefile Tue Jun 2 18:36:35 2020 (r537567) @@ -50,7 +50,7 @@ PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments> TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>0:devel/py-subversion@${PY_FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins Modified: head/www/trac/Makefile ============================================================================== --- head/www/trac/Makefile Tue Jun 2 18:13:37 2020 (r537566) +++ head/www/trac/Makefile Tue Jun 2 18:36:35 2020 (r537567) @@ -50,7 +50,7 @@ PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments> TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>0:devel/py-subversion@${PY_FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006021836.052IaZPC071048>