Index: head/www/squidclamav/Makefile =================================================================== --- head/www/squidclamav/Makefile (revision 399087) +++ head/www/squidclamav/Makefile (revision 399088) @@ -1,36 +1,33 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= squidclamav -PORTVERSION= 6.10 -PORTREVISION= 2 +PORTVERSION= 6.13 CATEGORIES= www security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ MAINTAINER= mm@FreeBSD.org COMMENT= Clamav c-icap service and redirector for Squid LICENSE= GPLv3 -BROKEN= Not fetchable - LIB_DEPENDS+= libicapapi.so:${PORTSDIR}/www/c-icap GNU_CONFIGURE= yes CFLAGS+= -DHAVE_STRNSTR -USES= cpe shebangfix libtool +USES= cpe libtool shebangfix SHEBANG_FILES= cgi-bin/clwarn.cgi* INSTALL_TARGET= install-strip CPE_VENDOR= darold CONFIGURE_ARGS+= --enable-shared --enable-static \ --sysconfdir="${PREFIX}/etc/c-icap" \ --with-c-icap=${LOCALBASE} post-patch: @${REINPLACE_CMD} -e 's|CFGDIR=.*|CFGDIR="${PREFIX}/etc/c-icap"|g' \ ${WRKSRC}/configure.in ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc/squidclamav.conf|${PREFIX}/etc/c\\-icap/squidclamav.conf|g' \ ${WRKSRC}/doc/squidclamav.1 ${WRKSRC}/src/squidclamav.h .include Index: head/www/squidclamav/distinfo =================================================================== --- head/www/squidclamav/distinfo (revision 399087) +++ head/www/squidclamav/distinfo (revision 399088) @@ -1,2 +1,2 @@ -SHA256 (squidclamav-6.10.tar.gz) = 4d1ed7012b5b8db4143d38196b0928bd44f2461226a3f9ae2cdc3643524a054b -SIZE (squidclamav-6.10.tar.gz) = 436639 +SHA256 (squidclamav-6.13.tar.gz) = 67932f891278d7f2e2b2c1e746101041b02755453cf656db89c3d2345bbbd053 +SIZE (squidclamav-6.13.tar.gz) = 676911 Index: head/www/squidclamav/files/patch-etc-Makefile.in =================================================================== --- head/www/squidclamav/files/patch-etc-Makefile.in (revision 399087) +++ head/www/squidclamav/files/patch-etc-Makefile.in (nonexistent) @@ -1,16 +0,0 @@ ---- etc/Makefile.in.orig 2014-05-14 16:04:39.000000000 -0300 -+++ etc/Makefile.in 2014-05-14 16:04:57.000000000 -0300 -@@ -338,12 +338,7 @@ - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(CFGINST) -- @if test -f "$(DESTDIR)$(CFGINST)/squidclamav.conf" ; then \ -- echo "$@ will not overwrite existing $(DESTDIR)$(CFGINST)/squidclamav.conf" ; \ -- else \ -- echo "$(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)"; \ -- $(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)/squidclamav.conf; \ -- fi -+ $(INSTALL_DATA) $(srcdir)/squidclamav.conf $(DESTDIR)$(CFGINST)/squidclamav.conf.default - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Property changes on: head/www/squidclamav/files/patch-etc-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/squidclamav/files/patch-etc_Makefile.in =================================================================== --- head/www/squidclamav/files/patch-etc_Makefile.in (nonexistent) +++ head/www/squidclamav/files/patch-etc_Makefile.in (revision 399088) @@ -0,0 +1,11 @@ +--- etc/Makefile.in.orig 2015-10-11 14:20:10 UTC ++++ etc/Makefile.in +@@ -371,7 +371,7 @@ uninstall-am: + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(CONFIGDIR) + for f in $(CONFS); do \ +- $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \ ++ $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.sample; \ + if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \ + done + $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/squidclamav/en/ Property changes on: head/www/squidclamav/files/patch-etc_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/squidclamav/pkg-plist =================================================================== --- head/www/squidclamav/pkg-plist (revision 399087) +++ head/www/squidclamav/pkg-plist (revision 399088) @@ -1,13 +1,12 @@ -@unexec if cmp -s %D/etc/c-icap/squidclamav.conf %D/etc/c-icap/squidclamav.conf.default; then rm -f %D/etc/c-icap/squidclamav.conf; fi -etc/c-icap/squidclamav.conf.default -@exec [ -f %B/squidclamav.conf ] || cp %B/%f %B/squidclamav.conf +@sample etc/c-icap/squidclamav.conf.sample %%DATADIR%%/README +share/c_icap/templates/squidclamav/en/MALWARE_FOUND lib/c_icap/squidclamav.a lib/c_icap/squidclamav.so libexec/squidclamav/clwarn.cgi libexec/squidclamav/clwarn.cgi.de_DE libexec/squidclamav/clwarn.cgi.en_EN libexec/squidclamav/clwarn.cgi.fr_FR libexec/squidclamav/clwarn.cgi.pt_BR libexec/squidclamav/clwarn.cgi.ru_RU man/man1/squidclamav.1.gz