From 3403084bbf35b13a3609b8c1b88ffded74940ce3 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Tue, 2 Jun 2020 18:36:35 +0000 Subject: [PATCH] Fix devel/py-subversion and ports depending on it With hat: portmgr --- devel/cvs2svn/Makefile | 7 ------- devel/py-subversion/Makefile | 16 +++++++--------- devel/viewvc/Makefile | 7 ------- www/trac-devel/Makefile | 2 +- www/trac/Makefile | 2 +- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index e6feff864d65..0ab6f6d8a680 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -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 diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 52aaa3488b1b..8f693364b480 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -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,18 +17,16 @@ 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 \ --with-apxs=no diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile index 0b739bfbe7da..fa926eff3cd8 100644 --- a/devel/viewvc/Makefile +++ b/devel/viewvc/Makefile @@ -37,14 +37,7 @@ MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python3 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} diff --git a/www/trac-devel/Makefile b/www/trac-devel/Makefile index 15899271ccfa..9ca6e6db7e64 100644 --- a/www/trac-devel/Makefile +++ b/www/trac-devel/Makefile @@ -50,7 +50,7 @@ PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygment 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 diff --git a/www/trac/Makefile b/www/trac/Makefile index 1e9b08ad8c0e..50c39cc20096 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -50,7 +50,7 @@ PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygment 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