Fri Sep 1 23:56:00 2017 UTC ()
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.


(gdt)
diff -r1.38 -r1.39 pkgsrc/security/clamav/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/security/clamav/Makefile (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile 2017/08/24 20:03:38 1.38
+++ pkgsrc/security/clamav/Makefile 2017/09/01 23:56:00 1.39
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.38 2017/08/24 20:03:38 adam Exp $ 1# $NetBSD: Makefile,v 1.39 2017/09/01 23:56:00 gdt Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5COMMENT= Anti-virus toolkit 5COMMENT= Anti-virus toolkit
6PKGREVISION= 4 6PKGREVISION= 5
7 7
8USE_LANGUAGES= c c++ 8USE_LANGUAGES= c c++
9USE_LIBTOOL= yes 9USE_LIBTOOL= yes
10USE_TOOLS+= gsed 10USE_TOOLS+= gsed
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12SET_LIBDIR= yes 12SET_LIBDIR= yes
13FAKE_NCURSES= yes 13FAKE_NCURSES= yes
14CONFIGURE_ARGS+= --disable-clamav 14CONFIGURE_ARGS+= --disable-clamav
15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
16CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 16CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
17CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 17CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
18CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} 18CONFIGURE_ARGS+= --with-user=${CLAMAV_USER}
19CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl} 19CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
20CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 20CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
21CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 21CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
22CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 22CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
23CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 23CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre2}
24CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} 24CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
26CONFIGURE_ARGS+= --enable-readdir_r 26CONFIGURE_ARGS+= --enable-readdir_r
27# pkgsrc enforces a "secure" version of zlib, so don't let this check 27# pkgsrc enforces a "secure" version of zlib, so don't let this check
28# bomb the build 28# bomb the build
29CONFIGURE_ARGS+= --disable-zlib-vcheck 29CONFIGURE_ARGS+= --disable-zlib-vcheck
30 30
31CHECK_PORTABILITY_SKIP= contrib/* unit_tests/* win32/* 31CHECK_PORTABILITY_SKIP= contrib/* unit_tests/* win32/*
32 32
33.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
34 34
35NOT_PAX_MPROTECT_SAFE+= sbin/clamd 35NOT_PAX_MPROTECT_SAFE+= sbin/clamd
36NOT_PAX_MPROTECT_SAFE+= bin/clamscan 36NOT_PAX_MPROTECT_SAFE+= bin/clamscan
@@ -69,22 +69,22 @@ CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCON @@ -69,22 +69,22 @@ CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCON
69.endfor 69.endfor
70 70
71INSTALLATION_DIRS+= ${EGDIR} 71INSTALLATION_DIRS+= ${EGDIR}
72 72
73.include "options.mk" 73.include "options.mk"
74 74
75post-install: 75post-install:
76.for i in clamav-milter.conf clamd.conf freshclam.conf 76.for i in clamav-milter.conf clamd.conf freshclam.conf
77 ${INSTALL_DATA} ${WRKSRC}/etc/${i}.sample ${DESTDIR}${EGDIR}/${i} 77 ${INSTALL_DATA} ${WRKSRC}/etc/${i}.sample ${DESTDIR}${EGDIR}/${i}
78.endfor 78.endfor
79 79
80.include "../../archivers/bzip2/buildlink3.mk" 80.include "../../archivers/bzip2/buildlink3.mk"
81.include "../../devel/libltdl/buildlink3.mk" 81.include "../../devel/libltdl/buildlink3.mk"
82.include "../../devel/pcre/buildlink3.mk" 82.include "../../devel/pcre2/buildlink3.mk"
83.include "../../devel/zlib/buildlink3.mk" 83.include "../../devel/zlib/buildlink3.mk"
84.include "../../devel/gmp/buildlink3.mk" 84.include "../../devel/gmp/buildlink3.mk"
85.include "../../security/openssl/buildlink3.mk" 85.include "../../security/openssl/buildlink3.mk"
86.include "../../textproc/libxml2/buildlink3.mk" 86.include "../../textproc/libxml2/buildlink3.mk"
87.include "../../www/curl/buildlink3.mk" 87.include "../../www/curl/buildlink3.mk"
88.include "../../mk/curses.buildlink3.mk" 88.include "../../mk/curses.buildlink3.mk"
89.include "../../mk/pthread.buildlink3.mk" 89.include "../../mk/pthread.buildlink3.mk"
90.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"