svn commit: r486246 - head/security/clamav
Larry Rosenman
ler at FreeBSD.org
Fri Nov 30 10:53:41 UTC 2018
Author: ler
Date: Fri Nov 30 10:53:39 2018
New Revision: 486246
URL: https://svnweb.freebsd.org/changeset/ports/486246
Log:
security/clamav: really do the right thing with the MSPACK option.
previous patch added the configure argument to find archivers/libmspack
installed, but neglected to set USES+= pkgconfig to actually have the binary
use that version. With it now properly finding libmspack.so, revert to
not trying to install libclammspack* if the MSPACK option is set.
PR: 233658
Modified:
head/security/clamav/Makefile
head/security/clamav/pkg-plist
Modified: head/security/clamav/Makefile
==============================================================================
--- head/security/clamav/Makefile Fri Nov 30 10:39:42 2018 (r486245)
+++ head/security/clamav/Makefile Fri Nov 30 10:53:39 2018 (r486246)
@@ -2,7 +2,7 @@
PORTNAME= clamav
PORTVERSION= 0.100.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://www.clamav.net/downloads/production/
@@ -16,7 +16,7 @@ BUILD_DEPENDS= pkg-config:devel/pkgconf
LIB_DEPENDS= libltdl.so:devel/libltdl \
libcurl.so:ftp/curl
-USES= cpe gmake gnome libtool ncurses pathfix ssl
+USES= cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
USE_RC_SUBR= clamav-clamd clamav-freshclam
USE_LDCONFIG= yes
@@ -97,7 +97,7 @@ LHA_RUN_DEPENDS= lha:archivers/lha
MILTER_CONFIGURE_WITH= sendmail=/usr/sbin/sendmail
MILTER_CONFIGURE_ENABLE=milter
MILTER_USE= RC_SUBR=clamav-milter
-MSPACK_CONFIGURE_WITH= system-libmspack=${LOCALBASE}/lib/libmspack.so
+MSPACK_CONFIGURE_WITH= system-libmspack=${LOCALBASE}/lib/libmspack.so
MSPACK_LIB_DEPENDS= libmspack.so:archivers/libmspack
PCRE_CONFIGURE_WITH= pcre
PCRE_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
Modified: head/security/clamav/pkg-plist
==============================================================================
--- head/security/clamav/pkg-plist Fri Nov 30 10:39:42 2018 (r486245)
+++ head/security/clamav/pkg-plist Fri Nov 30 10:53:39 2018 (r486246)
@@ -2,6 +2,11 @@
%%JSON%%man/man1/clamsubmit.1.gz
%%MILTER%%@sample etc/clamav-milter.conf.sample
%%MILTER%%sbin/clamav-milter
+%%NO_MSPACK%%lib/libclammspack.a
+%%NO_MSPACK%%lib/libclammspack.so
+%%NO_MSPACK%%lib/libclammspack.so.0
+%%NO_MSPACK%%lib/libclammspack.so.0.1.0
+%%NO_MSPACK%%libdata/pkgconfig/libclammspack.pc
%%PORTDOCS%%%%DOCSDIR%%/html/clam.png
%%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.css
%%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.html
@@ -107,12 +112,7 @@ include/clamav.h
lib/libclamav.so
lib/libclamav.so.7
lib/libclamav.so.7.1.1
-lib/libclammspack.a
-lib/libclammspack.so
-lib/libclammspack.so.0
-lib/libclammspack.so.0.1.0
libdata/pkgconfig/libclamav.pc
-libdata/pkgconfig/libclammspack.pc
man/man1/clambc.1.gz
man/man1/clamconf.1.gz
man/man1/clamdscan.1.gz
More information about the svn-ports-all
mailing list