From owner-svn-ports-all@freebsd.org Sat Nov 18 12:41:20 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 326C5DBA821; Sat, 18 Nov 2017 12:41:20 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6D4E6E644; Sat, 18 Nov 2017 12:41:19 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAICfIbx014769; Sat, 18 Nov 2017 12:41:18 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAICfIds014767; Sat, 18 Nov 2017 12:41:18 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201711181241.vAICfIds014767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sat, 18 Nov 2017 12:41:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454427 - in head/security/obfsproxy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in head/security/obfsproxy: . files X-SVN-Commit-Revision: 454427 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Nov 2017 12:41:20 -0000 Author: cpm Date: Sat Nov 18 12:41:18 2017 New Revision: 454427 URL: https://svnweb.freebsd.org/changeset/ports/454427 Log: security/obfsproxy: Make argparse a conditional dependency Backport a patch to setup.py making argparse a conditional dependency to fix the following error at runtime: pkg_resources.DistributionNotFound: The 'argparse' distribution was not found and is required by obfsproxy While I'm here, pet portlint, USE_* comes before USES. Bump PORTREVISION. PR: 223320 Submitted by: cpm Reported by: Hadi Approved by: cs (maintainer timeout, 2 weeks) Modified: head/security/obfsproxy/Makefile head/security/obfsproxy/files/patch-setup.py Modified: head/security/obfsproxy/Makefile ============================================================================== --- head/security/obfsproxy/Makefile Sat Nov 18 11:38:23 2017 (r454426) +++ head/security/obfsproxy/Makefile Sat Nov 18 12:41:18 2017 (r454427) @@ -3,7 +3,7 @@ PORTNAME= obfsproxy PORTVERSION= 0.2.13 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security net python MASTER_SITES= http://www.c-s.li/ports/ @@ -18,8 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:sec ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml -USE_PYTHON= distutils USES= python +USE_PYTHON= distutils SUB_FILES= pkg-message PYDISTUTILS_PKGNAME=obfsproxy Modified: head/security/obfsproxy/files/patch-setup.py ============================================================================== --- head/security/obfsproxy/files/patch-setup.py Sat Nov 18 11:38:23 2017 (r454426) +++ head/security/obfsproxy/files/patch-setup.py Sat Nov 18 12:41:18 2017 (r454427) @@ -1,11 +1,19 @@ ---- setup.py.orig 2013-07-14 19:01:36.000000000 +0000 -+++ setup.py 2013-07-14 19:02:02.000000000 +0000 -@@ -31,7 +31,7 @@ +--- setup.py.orig 2017-11-03 11:21:18 UTC ++++ setup.py +@@ -31,12 +31,14 @@ setup( install_requires = [ 'setuptools', 'PyCrypto', - 'Twisted', +- 'argparse', + 'Twisted_Core', - 'argparse', - 'pyptlib' + 'pyptlib >= 0.0.6', + 'pyyaml' ], + ++ if sys.version_info < (2, 7): ++ install_requires.append('argparse') ++ + extras_require = { + 'SOCKS': ["txsocksx"] + }