diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-04-21 12:08:29 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-04-21 12:08:29 +0000 |
| commit | 24b94a7e6db91b898fbb3dc076b94384c2c2a910 (patch) | |
| tree | d1bd620a02554489fe6623aab20469df0a65a227 /net/scapy | |
| parent | e8113b421c70802123e3e65dbdde6fc588b960f7 (diff) | |
| download | pkgsrc-24b94a7e6db91b898fbb3dc076b94384c2c2a910.tar.gz | |
Use PKGMANDIR. Use subst.mk rather than patching.
Diffstat (limited to 'net/scapy')
| -rw-r--r-- | net/scapy/Makefile | 5 | ||||
| -rw-r--r-- | net/scapy/distinfo | 3 | ||||
| -rw-r--r-- | net/scapy/patches/patch-ae | 13 |
3 files changed, 4 insertions, 17 deletions
diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 6d1b7e1d62f..aa37a2e893d 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/12/05 21:25:55 adam Exp $ +# $NetBSD: Makefile,v 1.19 2016/04/21 12:08:29 jperkin Exp $ DISTNAME= scapy-2.2.0 CATEGORIES= net @@ -26,8 +26,9 @@ CONF_FILES= ${PREFIX}/share/examples/scapy/ethertypes \ SUBST_CLASSES+= config SUBST_STAGE.config= post-patch -SUBST_FILES.config= scapy/data.py +SUBST_FILES.config= scapy/data.py setup.py SUBST_SED.config= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_SED.config+= -e "s|share/man|${PKGMANDIR}|g" SUBST_MESSAGE.config= Fixing paths. post-extract: diff --git a/net/scapy/distinfo b/net/scapy/distinfo index 95792aaded2..c5159370ac3 100644 --- a/net/scapy/distinfo +++ b/net/scapy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 00:35:36 agc Exp $ +$NetBSD: distinfo,v 1.7 2016/04/21 12:08:29 jperkin Exp $ SHA1 (scapy-2.2.0.tar.gz) = ae0a9947a08a01a84abde9db12fed074ac888e47 RMD160 (scapy-2.2.0.tar.gz) = 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e @@ -8,5 +8,4 @@ SHA1 (patch-aa) = 37bb1d60a04604c26a518dc0d13d5df601fd295c SHA1 (patch-ab) = 12f7c4d0ae505d357692c05de658e393a0526ba1 SHA1 (patch-ac) = d8ad1882d9b31e65dc3f7636e4caac9377805daf SHA1 (patch-ad) = f3647e471ba1168e054a5160d47fb0870243fb4b -SHA1 (patch-ae) = bedc1c849c53648f394ebf843435c675729e69e7 SHA1 (patch-af) = 7dbdecbdfbc5348d0e0f2276113cac88ff766580 diff --git a/net/scapy/patches/patch-ae b/net/scapy/patches/patch-ae deleted file mode 100644 index ae0c2380146..00000000000 --- a/net/scapy/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2013/06/15 20:24:19 adam Exp $ - ---- setup.py.orig 2011-02-28 02:11:55.000000000 +0000 -+++ setup.py -@@ -49,7 +49,7 @@ setup( - version = '2.2.0', - packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'], - scripts = SCRIPTS, -- data_files = [('share/man/man1', ["doc/scapy.1.gz"])], -+ data_files = [('man/man1', ["doc/scapy.1.gz"])], - - # Metadata - author = 'Philippe BIONDI', |