pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/clamav * Add unit-test PKG_OPTIONS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7628f73ab9e0
branches:  trunk
changeset: 648469:7628f73ab9e0
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Mar 15 00:52:53 2015 +0000

description:
* Add unit-test PKG_OPTIONS.
* Allow version information to be shared with an another package
  (documentation).

Bump PKGREVISION.

diffstat:

 security/clamav/Makefile        |   8 ++++----
 security/clamav/Makefile.common |   7 +++++++
 security/clamav/distinfo        |   9 +--------
 security/clamav/options.mk      |  14 ++++++++++++--
 4 files changed, 24 insertions(+), 14 deletions(-)

diffs (85 lines):

diff -r e6842519c67d -r 7628f73ab9e0 security/clamav/Makefile
--- a/security/clamav/Makefile  Sun Mar 15 00:49:17 2015 +0000
+++ b/security/clamav/Makefile  Sun Mar 15 00:52:53 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2015/02/24 07:28:59 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.22 2015/03/15 00:52:53 taca Exp $
 
-DISTNAME=      clamav-0.98.6
+DISTNAME=      clamav-${CLAMAV_VERSION}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -32,8 +33,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_SRC+=            ${PKGDIR}/PLIST
-
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*)
 CONFIGURE_ARGS+=       --disable-readdir-r
 .else
@@ -81,6 +80,7 @@
        ${INSTALL_DATA} ${WRKSRC}/etc/${i}.sample ${DESTDIR}${EGDIR}/${i}
 .endfor
 
+.include "Makefile.common"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff -r e6842519c67d -r 7628f73ab9e0 security/clamav/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/clamav/Makefile.common   Sun Mar 15 00:52:53 2015 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.common,v 1.1 2015/03/15 00:52:53 taca Exp $
+#
+# used by clamav/Makefile
+# used by clamav-doc/Makefile
+
+CLAMAV_VERSION=        0.98.6
+DISTINFO_FILE= ${.CURDIR}/../../security/clamav/distinfo
diff -r e6842519c67d -r 7628f73ab9e0 security/clamav/distinfo
--- a/security/clamav/distinfo  Sun Mar 15 00:49:17 2015 +0000
+++ b/security/clamav/distinfo  Sun Mar 15 00:52:53 2015 +0000
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.16 2015/02/24 07:28:59 hiramatsu Exp $
+$NetBSD: distinfo,v 1.17 2015/03/15 00:52:53 taca Exp $
 
 SHA1 (clamav-0.98.6.tar.gz) = 03cb9a20a08aba9176b1f58d5527d06ec8261f9c
 RMD160 (clamav-0.98.6.tar.gz) = 48d5fbbdb183e61309212c6bc69f777f99346bd5
 Size (clamav-0.98.6.tar.gz) = 15148292 bytes
-SHA1 (patch-Makefile.in) = 070fe734113de9fc6ce5f02de088b10281913b00
-SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
-SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
-SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
-SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
-SHA1 (patch-etc_clamd.conf.sample) = 69bed1c88cf60f699e64fd361091621728b9f9d1
-SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676
diff -r e6842519c67d -r 7628f73ab9e0 security/clamav/options.mk
--- a/security/clamav/options.mk        Sun Mar 15 00:49:17 2015 +0000
+++ b/security/clamav/options.mk        Sun Mar 15 00:52:53 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2013/10/02 18:30:13 adam Exp $
+# $NetBSD: options.mk,v 1.3 2015/03/15 00:52:53 taca Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS= milter clamav-experimental
+PKG_SUPPORTED_OPTIONS= milter clamav-experimental unit-test
 
 .include "../../mk/bsd.options.mk"
 
@@ -24,3 +24,13 @@
 .if !empty(PKG_OPTIONS:Mclamav-experimental)
 CONFIGURE_ARGS+=       --enable-experimental
 .endif
+
+# Enable unit test. 
+.if !empty(PKG_OPTIONS:Munit-test)
+CONFIGURE_ARGS+=               --enable-check
+TEST_TARGET=                   check
+# unit test's Makefile depends on gmake.
+USE_TOOLS=                     gmake
+BUILDLINK_DEPMETHOD.check=     build
+.  include "../../devel/check/buildlink3.mk"
+.endif



Home | Main Index | Thread Index | Old Index