Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Mar 2017 19:23:49 +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: r436290 - in head: . Mk/Uses devel devel/py-d2to1 devel/py-mock devel/py-setuptools devel/py-setuptools27 devel/py-setuptools33 devel/py-setuptools34 devel/py-setuptools35 devel/py-setu...
Message-ID:  <201703161923.v2GJNnPq000487@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Mar 16 19:23:48 2017
New Revision: 436290
URL: https://svnweb.freebsd.org/changeset/ports/436290

Log:
  Rename python setuptools ports to better match other python ports
  
  Reviewed by:	mat, sunpoet
  With hat:	portmgr
  Differential Revision:	https://reviews.freebsd.org/D9983

Added:
  head/devel/py27-setuptools/
     - copied from r436289, head/devel/py-setuptools/
  head/devel/py33-setuptools/
     - copied from r436289, head/devel/py-setuptools33/
  head/devel/py34-setuptools/
     - copied from r436289, head/devel/py-setuptools34/
  head/devel/py35-setuptools/
     - copied from r436289, head/devel/py-setuptools35/
  head/devel/py36-setuptools/
     - copied from r436289, head/devel/py-setuptools36/
Deleted:
  head/devel/py-setuptools/
  head/devel/py-setuptools27/
  head/devel/py-setuptools33/
  head/devel/py-setuptools34/
  head/devel/py-setuptools35/
  head/devel/py-setuptools36/
Modified:
  head/MOVED
  head/Mk/Uses/python.mk
  head/UPDATING
  head/devel/Makefile
  head/devel/py-d2to1/Makefile
  head/devel/py-mock/Makefile
  head/devel/py-twine/Makefile
  head/devel/py27-setuptools/Makefile
  head/devel/py33-setuptools/Makefile
  head/devel/py34-setuptools/Makefile
  head/devel/py35-setuptools/Makefile
  head/devel/py36-setuptools/Makefile
  head/net-mgmt/net-snmp/Makefile
  head/security/gpgme/Makefile
  head/security/py-acme/Makefile
  head/security/py-certbot/Makefile
  head/security/py-crits/Makefile
  head/sysutils/bsdploy/Makefile
  head/sysutils/py-ploy/Makefile
  head/sysutils/py-ploy_ansible/Makefile
  head/sysutils/py-ploy_ec2/Makefile
  head/sysutils/py-ploy_ezjail/Makefile
  head/www/uzbl/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/MOVED	Thu Mar 16 19:23:48 2017	(r436290)
@@ -9133,3 +9133,9 @@ databases/py-sqlalchemy09|databases/py-s
 devel/avr-gcc-devel||2017-03-13|Has expired: There's no longer a point to have both, a -devel and a regular port of GCC for the AVR
 net/py-pysimplesoap|net/py-soap2py|2017-03-13|Rename to match upstream naming
 games/trigger-data|games/trigger-rally|2017-03-15|Merged into games/trigger-rally
+devel/py-setuptools|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports
+devel/py-setuptools27|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports
+devel/py-setuptools33|devel/py33-setuptools|2017-03-16|Renamed to better match other python ports
+devel/py-setuptools34|devel/py34-setuptools|2017-03-16|Renamed to better match other python ports
+devel/py-setuptools35|devel/py35-setuptools|2017-03-16|Renamed to better match other python ports
+devel/py-setuptools36|devel/py36-setuptools|2017-03-16|Renamed to better match other python ports

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/Mk/Uses/python.mk	Thu Mar 16 19:23:48 2017	(r436290)
@@ -481,9 +481,9 @@ UNIQUE_FIND_SUFFIX_FILES=	\
 
 _CURRENTPORT:=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 .if defined(_PYTHON_FEATURE_DISTUTILS) && \
-	${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+	${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 .endif
 
 # distutils support

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/UPDATING	Thu Mar 16 19:23:48 2017	(r436290)
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20170316:
+  AFFECTS: users of python setuptools
+  AUTHOR: antoine@FreeBSD.org
+
+  The python setuptools ports have been renamed to better match other python ports.
+  Ports users need to rename them so that portupgrade and portmaster do not
+  get confused.  For example:
+
+    pkg set -n py27-setuptools27:py27-setuptools
+    pkg set -o devel/py-setuptools27:devel/py27-setuptools
+  or
+    pkg set -n py35-setuptools35:py35-setuptools
+    pkg set -o devel/py-setuptools35:devel/py35-setuptools
+
 20170312:
   AFFECTS: users of textproc/ack
   AUTHOR: sunpoet@FreeBSD.org

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -4675,13 +4675,7 @@
     SUBDIR += py-semantic_version
     SUBDIR += py-serpent
     SUBDIR += py-setproctitle
-    SUBDIR += py-setuptools
     SUBDIR += py-setuptools-git
-    SUBDIR += py-setuptools27
-    SUBDIR += py-setuptools33
-    SUBDIR += py-setuptools34
-    SUBDIR += py-setuptools35
-    SUBDIR += py-setuptools36
     SUBDIR += py-setuptools_darcs
     SUBDIR += py-setuptools_hg
     SUBDIR += py-setuptools_scm
@@ -4902,6 +4896,7 @@
     SUBDIR += py-zope.testing
     SUBDIR += py-zope.traversing
     SUBDIR += py-zope.viewlet
+    SUBDIR += py27-setuptools
     SUBDIR += py3-Jinja2
     SUBDIR += py3-babel
     SUBDIR += py3-click
@@ -4941,6 +4936,10 @@
     SUBDIR += py3-wcwidth
     SUBDIR += py3-xdg
     SUBDIR += py3-yaml
+    SUBDIR += py33-setuptools
+    SUBDIR += py34-setuptools
+    SUBDIR += py35-setuptools
+    SUBDIR += py36-setuptools
     SUBDIR += py_static_check
     SUBDIR += pybugz
     SUBDIR += pychecker

Modified: head/devel/py-d2to1/Makefile
==============================================================================
--- head/devel/py-d2to1/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py-d2to1/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -11,7 +11,7 @@ COMMENT=	Distutils2-like setup.cfg files
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python

Modified: head/devel/py-mock/Makefile
==============================================================================
--- head/devel/py-mock/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py-mock/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -14,7 +14,7 @@ COMMENT=	Mock unit tests for Python
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six
 TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox

Modified: head/devel/py-twine/Makefile
==============================================================================
--- head/devel/py-twine/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py-twine/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clin
 		${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt \
-		${PYTHON_PKGNAMEPREFIX}setuptools27>=0:devel/py-setuptools27
+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 
 USES=		python
 USE_PYTHON=	distutils autoplist

Modified: head/devel/py27-setuptools/Makefile
==============================================================================
--- head/devel/py-setuptools/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py27-setuptools/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -13,7 +13,7 @@ COMMENT=	Python packages installer
 LICENSE=	PSFL
 
 NO_ARCH=	yes
-USES=		python
+USES?=		python:2.7
 USE_PYTHON=	autoplist concurrent distutils
 
 PYDISTUTILS_SETUP=	${PYSETUP}

Modified: head/devel/py33-setuptools/Makefile
==============================================================================
--- head/devel/py-setuptools33/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py33-setuptools/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -1,10 +1,8 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	${PYTHON_SUFFIX}
+MASTERDIR=	${.CURDIR}/../py27-setuptools
 
-PYTHON_VERSION=	python3.3
-
-MASTERDIR=	${.CURDIR}/../py-setuptools
+USES=		python:3.3
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/py34-setuptools/Makefile
==============================================================================
--- head/devel/py-setuptools34/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py34-setuptools/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -1,10 +1,8 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	${PYTHON_SUFFIX}
+MASTERDIR=	${.CURDIR}/../py27-setuptools
 
-PYTHON_VERSION=	python3.4
-
-MASTERDIR=	${.CURDIR}/../py-setuptools
+USES=		python:3.4
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/py35-setuptools/Makefile
==============================================================================
--- head/devel/py-setuptools35/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py35-setuptools/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -1,10 +1,8 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	${PYTHON_SUFFIX}
+MASTERDIR=	${.CURDIR}/../py27-setuptools
 
-PYTHON_VERSION=	python3.5
-
-MASTERDIR=	${.CURDIR}/../py-setuptools
+USES=		python:3.5
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/py36-setuptools/Makefile
==============================================================================
--- head/devel/py-setuptools36/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/devel/py36-setuptools/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -1,10 +1,8 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	${PYTHON_SUFFIX}
+MASTERDIR=	${.CURDIR}/../py27-setuptools
 
-PYTHON_VERSION=	python3.6
-
-MASTERDIR=	${.CURDIR}/../py-setuptools
+USES=		python:3.6
 
 .include "${MASTERDIR}/Makefile"

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================
--- head/net-mgmt/net-snmp/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/net-mgmt/net-snmp/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -73,8 +73,8 @@ TLS_CONFIGURE_ON=	--with-security-module
 PYDISTUTILS_PKGNAME?=		netsnmp-python
 PYDISTUTILS_PKGVERSION?=	1.0a1
 USES+=		python
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 CONFIGURE_ARGS+=--with-python-modules
 CONFIGURE_ENV+=	PYTHONPROG="${PYTHON_CMD}"
 MAKE_ENV+=	PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}"

Modified: head/security/gpgme/Makefile
==============================================================================
--- head/security/gpgme/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/security/gpgme/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -74,8 +74,8 @@ USE_QT5=	buildtools_build core testlib
 
 .  if ${SLAVEPORT} == "python"
 BUILD_DEPENDS+=	swig3.0:devel/swig30 \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 USES+=		python
 USE_PYTHON=	py3kplist
 CONFIGURE_ENV+=	SWIG=${LOCALBASE}/bin/swig3.0

Modified: head/security/py-acme/Makefile
==============================================================================
--- head/security/py-acme/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/security/py-acme/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryp
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>=1.0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \

Modified: head/security/py-certbot/Makefile
==============================================================================
--- head/security/py-certbot/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/security/py-certbot/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
 		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>=1.0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \

Modified: head/security/py-crits/Makefile
==============================================================================
--- head/security/py-crits/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/security/py-crits/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -33,7 +33,7 @@ RUN_DEPENDS+=	7z:archivers/p7zip     \
 		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl             \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot         \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml               \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy                   \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib         \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml                    \

Modified: head/sysutils/bsdploy/Makefile
==============================================================================
--- head/sysutils/bsdploy/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/sysutils/bsdploy/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -11,7 +11,7 @@ COMMENT=	Container Management for FreeBS
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma \
 		${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
 		${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible \

Modified: head/sysutils/py-ploy/Makefile
==============================================================================
--- head/sysutils/py-ploy/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/sysutils/py-ploy/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \
 		${PYTHON_PKGNAMEPREFIX}paramiko1>0:security/py-paramiko1 \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 
 USES=		python
 USE_PYTHON=	autoplist distutils

Modified: head/sysutils/py-ploy_ansible/Makefile
==============================================================================
--- head/sysutils/py-ploy_ansible/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/sysutils/py-ploy_ansible/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -13,7 +13,7 @@ COMMENT=	Plugin to integrate Ansible wit
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
 		${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet \
 		ansible1<2.0:sysutils/ansible1

Modified: head/sysutils/py-ploy_ec2/Makefile
==============================================================================
--- head/sysutils/py-ploy_ec2/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/sysutils/py-ploy_ec2/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -13,7 +13,7 @@ COMMENT=	Plugin for ploy to provision Am
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
 		${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto \
 		${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy

Modified: head/sysutils/py-ploy_ezjail/Makefile
==============================================================================
--- head/sysutils/py-ploy_ezjail/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/sysutils/py-ploy_ezjail/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -13,7 +13,7 @@ COMMENT=	Plugin for ploy to provision Fr
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
 		${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy
 

Modified: head/www/uzbl/Makefile
==============================================================================
--- head/www/uzbl/Makefile	Thu Mar 16 18:49:48 2017	(r436289)
+++ head/www/uzbl/Makefile	Thu Mar 16 19:23:48 2017	(r436290)
@@ -12,7 +12,7 @@ COMMENT=	Web interface tools which adher
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
 LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2  \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703161923.v2GJNnPq000487>