[pkgsrc/trunk]: pkgsrc/security Simplify *yara packages.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83988be7437c
branches:  trunk
changeset: 363396:83988be7437c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 07 20:46:34 2017 +0000

description:
Simplify *yara packages.

diffstat:

 security/py-yara/Makefile     |  13 +++++--------
 security/py-yara/PLIST        |  12 ++++++------
 security/py-yara/distinfo     |  10 +++++-----
 security/yara/Makefile        |  10 +++-------
 security/yara/Makefile.common |   6 +++---
 security/yara/distinfo        |  10 +++++-----
 6 files changed, 27 insertions(+), 34 deletions(-)

diffs (113 lines):

diff -r 261fca39dbe3 -r 83988be7437c security/py-yara/Makefile
--- a/security/py-yara/Makefile Wed Jun 07 20:28:02 2017 +0000
+++ b/security/py-yara/Makefile Wed Jun 07 20:46:34 2017 +0000
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2017/05/15 15:27:31 khorben Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/07 20:46:34 wiz Exp $
 
-PKGNAME=       ${PYPKGPREFIX}-yara-${YAVER}
+DISTNAME=      yara-python-${VERSION}
+PKGNAME=       ${PYPKGPREFIX}-yara-${VERSION}
 CATEGORIES=    security python
+GITHUB_PROJECT=        yara-python
 
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=VirusTotal/yara-python/archive/}
-
-DIST_SUBDIR=   yara-python
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=VirusTotal/}
 
 COMMENT=       Yara python bindings
 
-WRKSRC=                ${WRKDIR}/yara-python-${YAVER}
-
-PYDISTUTILSPKG= yes
 PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36
 
 .include "../../security/yara/Makefile.common"
diff -r 261fca39dbe3 -r 83988be7437c security/py-yara/PLIST
--- a/security/py-yara/PLIST    Wed Jun 07 20:28:02 2017 +0000
+++ b/security/py-yara/PLIST    Wed Jun 07 20:46:34 2017 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2017/05/15 15:27:31 khorben Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/06/07 20:46:34 wiz Exp $
 ${PYSITELIB}/yara.so
-${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/yara_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
diff -r 261fca39dbe3 -r 83988be7437c security/py-yara/distinfo
--- a/security/py-yara/distinfo Wed Jun 07 20:28:02 2017 +0000
+++ b/security/py-yara/distinfo Wed Jun 07 20:46:34 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2017/06/07 20:27:37 khorben Exp $
+$NetBSD: distinfo,v 1.8 2017/06/07 20:46:34 wiz Exp $
 
-SHA1 (yara-python/v3.6.1.tar.gz) = 30d6005070099b40845e8e6417de5fc4c80c57a2
-RMD160 (yara-python/v3.6.1.tar.gz) = 04245acacd2f20b71c612cca5efefdf5b28cd2df
-SHA512 (yara-python/v3.6.1.tar.gz) = ccd0bd402ffc7d8686a9f2cef283c2c8cf58511235bff700188214f226911b5b0af6f5b1c1e8a3000531c0e35489cd8c7670b2208ce9372e4ecbab00d2479fa2
-Size (yara-python/v3.6.1.tar.gz) = 29543 bytes
+SHA1 (yara-python-3.6.1.tar.gz) = 30d6005070099b40845e8e6417de5fc4c80c57a2
+RMD160 (yara-python-3.6.1.tar.gz) = 04245acacd2f20b71c612cca5efefdf5b28cd2df
+SHA512 (yara-python-3.6.1.tar.gz) = ccd0bd402ffc7d8686a9f2cef283c2c8cf58511235bff700188214f226911b5b0af6f5b1c1e8a3000531c0e35489cd8c7670b2208ce9372e4ecbab00d2479fa2
+Size (yara-python-3.6.1.tar.gz) = 29543 bytes
diff -r 261fca39dbe3 -r 83988be7437c security/yara/Makefile
--- a/security/yara/Makefile    Wed Jun 07 20:28:02 2017 +0000
+++ b/security/yara/Makefile    Wed Jun 07 20:46:34 2017 +0000
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2017/05/15 15:27:31 khorben Exp $
+# $NetBSD: Makefile,v 1.4 2017/06/07 20:46:34 wiz Exp $
 
-PKGNAME=       yara-${YAVER}
+DISTNAME=      yara-${VERSION}
 CATEGORIES=    security
-
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=VirusTotal/yara/archive/}
-
-DIST_SUBDIR=   yara
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=VirusTotal/}
 
 COMMENT=        Pattern matching swiss knife for malware researchers
 
-WRKSRC=                ${WRKDIR}/yara-${YAVER}
 USE_TOOLS+=    pkg-config automake autoreconf
 USE_LIBTOOL=   yes
 GNU_CONFIGURE=          yes
diff -r 261fca39dbe3 -r 83988be7437c security/yara/Makefile.common
--- a/security/yara/Makefile.common     Wed Jun 07 20:28:02 2017 +0000
+++ b/security/yara/Makefile.common     Wed Jun 07 20:46:34 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.8 2017/06/07 20:27:37 khorben Exp $
+# $NetBSD: Makefile.common,v 1.9 2017/06/07 20:46:34 wiz Exp $
 #
 # used by security/yara/Makefile
 # used by security/py-yara/Makefile
 
-DISTNAME=      v3.6.1
-YAVER=         ${DISTNAME:S/v//}
+VERSION=       3.6.1
+GITHUB_TAG=    v${VERSION}
 
 MAINTAINER=    khorben%defora.org@localhost
 HOMEPAGE=      https://virustotal.github.io/yara/
diff -r 261fca39dbe3 -r 83988be7437c security/yara/distinfo
--- a/security/yara/distinfo    Wed Jun 07 20:28:02 2017 +0000
+++ b/security/yara/distinfo    Wed Jun 07 20:46:34 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2017/06/07 20:27:37 khorben Exp $
+$NetBSD: distinfo,v 1.9 2017/06/07 20:46:34 wiz Exp $
 
-SHA1 (yara/v3.6.1.tar.gz) = 67705f7516e70b9b2a627618af7c842711472359
-RMD160 (yara/v3.6.1.tar.gz) = 9e36654aa360277c7b45946c46a2f159400fd40a
-SHA512 (yara/v3.6.1.tar.gz) = 0b3b6deeb83f979898ef2711233b9e856b39a43098549173f81e627b0c35454c68cb3e8f64115b265cf483bfc3ce2d14e916fbcdeba95648fb1795ff77bf0bbf
-Size (yara/v3.6.1.tar.gz) = 505302 bytes
+SHA1 (yara-3.6.1.tar.gz) = 67705f7516e70b9b2a627618af7c842711472359
+RMD160 (yara-3.6.1.tar.gz) = 9e36654aa360277c7b45946c46a2f159400fd40a
+SHA512 (yara-3.6.1.tar.gz) = 0b3b6deeb83f979898ef2711233b9e856b39a43098549173f81e627b0c35454c68cb3e8f64115b265cf483bfc3ce2d14e916fbcdeba95648fb1795ff77bf0bbf
+Size (yara-3.6.1.tar.gz) = 505302 bytes
 SHA1 (patch-libyara_proc.c) = cbe52e79c63eb6389a5f7d1107d15a57ca4890f9