CVS commit: pkgsrc/net/scapy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 30 10:38:15 UTC 2024

Modified Files:
        pkgsrc/net/scapy: Makefile PLIST options.mk

Log Message:
scapy: convert to wheel.mk.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/scapy/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/scapy/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/scapy/Makefile
diff -u pkgsrc/net/scapy/Makefile:1.44 pkgsrc/net/scapy/Makefile:1.45
--- pkgsrc/net/scapy/Makefile:1.44      Mon Aug 14 05:25:03 2023
+++ pkgsrc/net/scapy/Makefile   Tue Apr 30 10:38:15 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2023/08/14 05:25:03 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2024/04/30 10:38:15 wiz Exp $
 
 DISTNAME=      scapy-2.5.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,9 +11,13 @@ HOMEPAGE=    https://scapy.net/
 COMMENT=       Interactive packet manipulation program
 LICENSE=       gnu-gpl-v2
 
-NO_BUILD=      yes
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=      ${PYPKGPREFIX}-ipython-[0-9]*:../../devel/py-ipython
+TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+= tcpreplay-[0-9]*:../../net/tcpreplay
 
-USE_PKG_RESOURCES=     yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "options.mk"
 
@@ -23,9 +27,6 @@ SUBST_FILES.config=   setup.py
 SUBST_SED.config+=     -e "s|share/man|${PKGMANDIR}|g"
 SUBST_MESSAGE.config=  Fixing paths.
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= tcpreplay-[0-9]*:../../net/tcpreplay
-
 DATE_VAL=      ${DATE} "+%Y%m%d-%H%M%S"
 
 # XXX this needs to be reworked to use scapy's run_tests with py-tox, which is
@@ -39,5 +40,5 @@ do-test:
                -o /tmp/scapy_regression_test_${DATE_VAL:sh}.html
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/scapy/PLIST
diff -u pkgsrc/net/scapy/PLIST:1.13 pkgsrc/net/scapy/PLIST:1.14
--- pkgsrc/net/scapy/PLIST:1.13 Thu Jan 19 00:35:26 2023
+++ pkgsrc/net/scapy/PLIST      Tue Apr 30 10:38:15 2024
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2023/01/19 00:35:26 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.14 2024/04/30 10:38:15 wiz Exp $
 bin/scapy
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/scapy/__init__.py
 ${PYSITELIB}/scapy/__init__.pyc
 ${PYSITELIB}/scapy/__init__.pyo

Index: pkgsrc/net/scapy/options.mk
diff -u pkgsrc/net/scapy/options.mk:1.15 pkgsrc/net/scapy/options.mk:1.16
--- pkgsrc/net/scapy/options.mk:1.15    Thu Jan 19 00:35:26 2023
+++ pkgsrc/net/scapy/options.mk Tue Apr 30 10:38:15 2024
@@ -1,7 +1,6 @@
-# $NetBSD: options.mk,v 1.15 2023/01/19 00:35:26 gutteridge Exp $
+# $NetBSD: options.mk,v 1.16 2024/04/30 10:38:15 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.scapy
-
 PKG_SUPPORTED_OPTIONS= libpcap scapy-crypto scapy-pyx
 PKG_SUGGESTED_OPTIONS= libpcap
 
@@ -28,6 +27,7 @@ PYTHON_VERSIONED_DEPENDENCIES+=       cryptogr
 ### Add in TeX support for psdump() and/or pdfdump()
 ###
 .if !empty(PKG_OPTIONS:Mscapy-pyx)
-PYTHON_VERSIONED_DEPENDENCIES+=        X
-.include "../../lang/python/versioned_dependencies.mk"
+DEPENDS+=      ${PYPKGPREFIX}-X-[0-9]*:../../textproc/py-X
 .endif
+
+### TODO: matplotlib is another optional dependency