svn commit: r313439 - in head: . Mk devel/trac-bitten net-mgmt/net-snmp

[Ruslan Mahmatkhanov]

Author: rm
Date: Tue Mar  5 07:12:24 2013
New Revision: 313439
URL: http://svnweb.freebsd.org/changeset/ports/313439

Log:
  - replace deprecated devel/py-setuptools with devel/py-distribute
  - change explicit dependency for the ports, that don't utilize USE_DISTUTILS feature
  - add UPDATING entry
  
  PR:		176142
  Submitted by:	rm (myself)
  Approved by:	portmgr (miwi)
  Tested by:  	exp-run by miwi

Modified:
  head/Mk/bsd.python.mk
  head/UPDATING
  head/devel/trac-bitten/Makefile
  head/net-mgmt/net-snmp/Makefile

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Tue Mar  5 07:04:40 2013	(r313438)
+++ head/Mk/bsd.python.mk	Tue Mar  5 07:12:24 2013	(r313439)
@@ -460,13 +460,8 @@ PYTHONPREFIX_SITELIBDIR=	${PYTHON_SITELI
 
 # setuptools support
 .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
-.if ${PYTHON_SUFFIX} < 30
-BUILD_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-.else
 BUILD_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-distribute
 RUN_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-distribute
-.endif
 
 PYDISTUTILS_BUILD_TARGET?=		bdist_egg
 PYDISTUTILS_INSTALL_TARGET?=	easy_install

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Mar  5 07:04:40 2013	(r313438)
+++ head/UPDATING	Tue Mar  5 07:12:24 2013	(r313439)
@@ -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.
 
+20130305:
+  AFFECTS: users of devel/py-setuptools (i.e you)
+  AUTHOR: rm at FreeBSD.org
+
+  devel/py-setuptools was replaced with devel/py-distribute. Please do
+  the following according to package manager used. py-setuptools port
+  will be removed shortly.
+
+  # portmaster -o devel/py-distribute devel/py-setuptools
+    or
+  # portupgrade -fo devel/py-distribute devel/py-setuptools
+    or
+  # pkg set -o devel/py-setuptools:devel/py-distribute
+
 20130226:
   AFFECTS: users of textproc/apache-solr
   AUTHOR: vanilla at FreeBSD.org

Modified: head/devel/trac-bitten/Makefile
==============================================================================
--- head/devel/trac-bitten/Makefile	Tue Mar  5 07:04:40 2013	(r313438)
+++ head/devel/trac-bitten/Makefile	Tue Mar  5 07:12:24 2013	(r313439)
@@ -7,7 +7,7 @@
 
 PORTNAME=	bitten
 PORTVERSION=	0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www python
 MASTER_SITES=	http://ftp.edgewall.com/pub/bitten/ \
 		LOCAL/glarkin
@@ -29,7 +29,7 @@ BITTEN_GID=	952
 OPTIONS=	BITTEN_MASTER "Build bitten master" ON
 .include <bsd.port.options.mk>
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
+BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-distribute
 .if defined(WITH_BITTEN_MASTER)
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 .endif

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================
--- head/net-mgmt/net-snmp/Makefile	Tue Mar  5 07:04:40 2013	(r313438)
+++ head/net-mgmt/net-snmp/Makefile	Tue Mar  5 07:12:24 2013	(r313439)
@@ -67,8 +67,8 @@ PYEASYUNINSTALL_UNINSTALLARGS?=	-q -N -m
 				-s ${PYEASYINSTALL_BINDIR} \
 				${PYDISTUTILS_PKGNAME}
 USE_PYTHON=	yes
-RUN_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-distribute
+BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-distribute
 CONFIGURE_ARGS+=--with-python-modules
 PLIST_SUB+=	WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
 PLIST_SUB+=	PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION}