[pkgsrc/trunk]: pkgsrc/security/yara Cleanup the Makefile and move some commo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2636d2672d52
branches:  trunk
changeset: 652655:2636d2672d52
user:      pettai <pettai%pkgsrc.org@localhost>
date:      Sat Jun 06 08:57:18 2015 +0000

description:
Cleanup the Makefile and move some common stuff to Makefile.common,
in preparation of additional yara-dependent stuff...

diffstat:

 security/yara/Makefile        |  18 +++++++-----------
 security/yara/Makefile.common |  12 ++++++++++++
 security/yara/buildlink3.mk   |   4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diffs (66 lines):

diff -r 6b6bcdb70494 -r 2636d2672d52 security/yara/Makefile
--- a/security/yara/Makefile    Sat Jun 06 08:20:27 2015 +0000
+++ b/security/yara/Makefile    Sat Jun 06 08:57:18 2015 +0000
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/06/06 08:18:17 pettai Exp $
-
-DISTNAME=      v3.3.0
-PKGNAME=       yara-3.3.0
-CATEGORIES=    security
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=plusvic/yara/archive/}
+# $NetBSD: Makefile,v 1.2 2015/06/06 08:57:18 pettai Exp $
 
-MAINTAINER=    pettai%NetBSD.org@localhost
-HOMEPAGE=      https://plusvic.github.io/yara/
-COMMENT=       Pattern matching swiss knife for malware researchers
-LICENSE=       apache-2.0
+PKGNAME=       yara-${YAVER}
+CATEGORIES=    security
 
-WRKSRC=                ${WRKDIR}/yara-3.3.0
+COMMENT=        Pattern matching swiss knife for malware researchers
+
+WRKSRC=                ${WRKDIR}/yara-${YAVER}
 USE_TOOLS+=    pkg-config automake autoreconf
 USE_LIBTOOL=   yes
 GNU_CONFIGURE=          yes
@@ -20,4 +15,5 @@
 pre-configure:
        cd ${WRKSRC} && autoreconf -fiv
 
+.include "../../security/yara/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 6b6bcdb70494 -r 2636d2672d52 security/yara/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/yara/Makefile.common     Sat Jun 06 08:57:18 2015 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile.common,v 1.1 2015/06/06 08:57:18 pettai Exp $
+#
+# used by security/yara/Makefile
+
+DISTNAME=      v3.3.0
+YAVER=         ${DISTNAME:S/v//}
+
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=plusvic/yara/archive/}
+
+MAINTAINER=    pettai%NetBSD.org@localhost
+HOMEPAGE=      https://plusvic.github.io/yara/
+LICENSE=       apache-2.0
diff -r 6b6bcdb70494 -r 2636d2672d52 security/yara/buildlink3.mk
--- a/security/yara/buildlink3.mk       Sat Jun 06 08:20:27 2015 +0000
+++ b/security/yara/buildlink3.mk       Sat Jun 06 08:57:18 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/06/06 08:18:17 pettai Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/06/06 08:57:18 pettai Exp $
 
 BUILDLINK_TREE+=       yara
 
@@ -6,7 +6,7 @@
 YARA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.yara+=   yara>=3.3.0
-BUILDLINK_PKGSRCDIR.yara?=     ../../devel/yara
+BUILDLINK_PKGSRCDIR.yara?=     ../../security/yara
 .endif # YARA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -yara