Date: Tue, 14 May 2019 14:08:25 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501662 - head/net/scapy Message-ID: <201905141408.x4EE8Ps4070866@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> + +.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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905141408.x4EE8Ps4070866>