CVS commit: pkgsrc/security/clamav

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Sep  1 23:56:00 UTC 2017

Modified Files:
        pkgsrc/security/clamav: Makefile

Log Message:
Flip to pcre2

If pcre2 is installed, configure finds pcre2-config in /usr/pkg/bin,
even though it is not include via bl3, resulting in a build failure.
There's no reason to avoid moving to pcre2, and it's easier than
making clamav not find it.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/clamav/Makefile

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

Modified files:

Index: pkgsrc/security/clamav/Makefile
diff -u pkgsrc/security/clamav/Makefile:1.38 pkgsrc/security/clamav/Makefile:1.39
--- pkgsrc/security/clamav/Makefile:1.38        Thu Aug 24 20:03:38 2017
+++ pkgsrc/security/clamav/Makefile     Fri Sep  1 23:56:00 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2017/08/24 20:03:38 adam Exp $
+# $NetBSD: Makefile,v 1.39 2017/09/01 23:56:00 gdt Exp $
 
 .include "Makefile.common"
 
 COMMENT=       Anti-virus toolkit
-PKGREVISION=           4
+PKGREVISION=           5
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=      --with-libcurl=${BUILDL
 CONFIGURE_ARGS+=       --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=       --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=       --with-pcre=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=       --with-pcre=${BUILDLINK_PREFIX.pcre2}
 CONFIGURE_ARGS+=       --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=       --enable-readdir_r
@@ -79,7 +79,7 @@ post-install:
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"