From owner-svn-ports-head@freebsd.org Tue May 14 14:08:26 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19FDA158ECC7; Tue, 14 May 2019 14:08:26 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1B446EE6C; Tue, 14 May 2019 14:08:25 +0000 (UTC) (envelope-from mat@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B17722089; Tue, 14 May 2019 14:08:25 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4EE8PBj070867; Tue, 14 May 2019 14:08:25 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4EE8Ps4070866; Tue, 14 May 2019 14:08:25 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201905141408.x4EE8Ps4070866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 14 May 2019 14:08:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501662 - head/net/scapy X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/net/scapy X-SVN-Commit-Revision: 501662 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B1B446EE6C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 May 2019 14:08:26 -0000 Author: mat Date: Tue May 14 14:08:25 2019 New Revision: 501662 URL: https://svnweb.freebsd.org/changeset/ports/501662 Log: Fixup Python dependencies. Modified: head/net/scapy/Makefile (contents, props changed) Modified: head/net/scapy/Makefile ============================================================================== --- head/net/scapy/Makefile Tue May 14 13:58:09 2019 (r501661) +++ head/net/scapy/Makefile Tue May 14 14:08:25 2019 (r501662) @@ -17,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libdnet>0:net/py-libdnet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pcap>0:net/py-pcap@${PY_FLAVOR} -USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= secdev @@ -41,20 +40,35 @@ GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config: ${LOCALBASE}/bin/dot:graphics/graphviz NMAP_RUN_DEPENDS= ${LOCALBASE}/share/nmap/nmap-os-db:security/nmap MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:net/wireshark -MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} +MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f -PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}/Crypto/__init__.py:security/py-pycrypto@${PY_FLAVOR} -PYGNUPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}/Gnuplot/__init__.py:math/py-gnuplot@${PY_FLAVOR} -PYX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}/pyx/__init__.py:graphics/py-PyX12@${PY_FLAVOR} +PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} +PYGNUPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} +PYX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyX>0:graphics/py-PyX@${PY_FLAVOR} QUESO_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/queso.conf.sample:net/queso SOX_RUN_DEPENDS= ${LOCALBASE}/bin/sox:audio/sox -.if ${FLAVOR:Upy27:Mpy27} -IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython5>0:devel/ipython5 +PYX_PREVENTS= PYGNUPLOT +PYX_PREVENTS_MSG= PyX requires Python 3.4+ and py-gnuplot requires 2.7. + +.include + +.if ${PORT_OPTIONS:MPYGNUPLOT} +USES+= python:2.7 +.elif ${PORT_OPTIONS:MPYX} +USES+= python:3.4+ +.else +USES+= python .endif -.if ${FLAVOR:Upy36:Mpy3*} -IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython + +.include + +.if ${FLAVOR:Mpy27} +IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython5>0:devel/ipython5@${PY_FLAVOR} .endif +.if ${FLAVOR:Mpy3*} +IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} +.endif post-patch: @${REINPLACE_CMD} "s,share/man/man1,man/man1," ${WRKSRC}/setup.py @@ -66,4 +80,4 @@ post-patch: @${REINPLACE_CMD} "s,/etc/,${LOCALBASE}/etc/," \ ${WRKSRC}/scapy/modules/p0f.py -.include +.include