Skip to content
GitLab
Commit c224eda3 authored by antoine's avatar antoine
Browse files

Rename python setuptools ports to better match other python ports 

Reviewed by:	mat, sunpoet
With hat:	portmgr
Differential Revision:	https://reviews.freebsd.org/D9983
parent d6523c17
Hide whitespace changes
Inline Side-by-side
MOVED
View file @ c224eda3
......@@ -9133,3 +9133,9 @@ databases/py-sqlalchemy09|databases/py-sqlalchemy10|2017-03-12|Has expired: Upst
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
Mk/Uses/python.mk
View file @ c224eda3
......@@ -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
......
UPDATING
View file @ c224eda3
......@@ -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
......
devel/Makefile
View file @ c224eda3
......@@ -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
......
devel/py-d2to1/Makefile
View file @ c224eda3
......@@ -11,7 +11,7 @@ COMMENT= Distutils2-like setup.cfg files with setuptools setup.py
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
......
devel/py-mock/Makefile
View file @ c224eda3
......@@ -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
......
devel/py-setuptools36/Makefile deleted 100644 → 0
View file @ d6523c17
# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
# $FreeBSD$
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
PYTHON_VERSION= python3.6
MASTERDIR= ${.CURDIR}/../py-setuptools
.include "${MASTERDIR}/Makefile"
devel/py-twine/Makefile
View file @ c224eda3
......@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint \
${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
......
devel/py-setuptools/Makefile → devel/py27-setuptools/Makefile
View file @ c224eda3
......@@ -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}
......
devel/py-setuptools35/Makefile → devel/py33-setuptools/Makefile
View file @ c224eda3
# 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.3
.include "${MASTERDIR}/Makefile"
devel/py-setuptools27/Makefile → devel/py34-setuptools/Makefile
View file @ c224eda3
# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
# $FreeBSD$
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
MASTERDIR= ${.CURDIR}/../py27-setuptools
PYTHON_VERSION= python2.7
MASTERDIR= ${.CURDIR}/../py-setuptools
USES= python:3.4
.include "${MASTERDIR}/Makefile"
devel/py-setuptools33/Makefile → devel/py35-setuptools/Makefile
View file @ c224eda3
# 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.5
.include "${MASTERDIR}/Makefile"
devel/py-setuptools34/Makefile → devel/py36-setuptools/Makefile
View file @ c224eda3
# 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.6
.include "${MASTERDIR}/Makefile"
net-mgmt/net-snmp/Makefile
View file @ c224eda3
......@@ -73,8 +73,8 @@ TLS_CONFIGURE_ON= --with-security-modules=tsm --with-transports=TLSTCP,DTLSUDP
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}"
......
security/gpgme/Makefile
View file @ c224eda3
......@@ -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
......
security/py-acme/Makefile
View file @ c224eda3
......@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography \
${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 \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment