Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2013 05:26:53 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335263 - head/devel/py-tox
Message-ID:  <201311300526.rAU5Qr1s088235@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Sat Nov 30 05:26:53 2013
New Revision: 335263
URL: http://svnweb.freebsd.org/changeset/ports/335263

Log:
  devel/py-tox: Only depend on py-argparse with Python 2.6, 3.0 and 3.1
  
  The argparse module is part of the standard library in 2.7 and 3.2 onward.
  Until this change, argparse has been incorrectly depended on for users
  running Python 2.7.
  
  - Update conditional expression in RUN_DEPENDS for argparse
  
  While I'm here:
  
  - Enable STAGE support
  - Enable AUTOPLIST, remove pkg-plist accordingly

Deleted:
  head/devel/py-tox/pkg-plist
Modified:
  head/devel/py-tox/Makefile

Modified: head/devel/py-tox/Makefile
==============================================================================
--- head/devel/py-tox/Makefile	Sat Nov 30 04:42:23 2013	(r335262)
+++ head/devel/py-tox/Makefile	Sat Nov 30 05:26:53 2013	(r335263)
@@ -17,12 +17,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virt
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONS_DEFINE=	PYTEST
 PYTEST_DESC=	Include the pytest test runner
 OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTEST}
@@ -31,7 +31,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyt
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_VER} <= 3.2
+.if ${PYTHON_REL} != 2.7 && ${PYTHON_REL} < 3.2
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
 .endif
 



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