svn commit: r399088 - in head/www/squidclamav: . files

[Kurt Jaeger]

Author: pi
Date: Sun Oct 11 14:29:05 2015
New Revision: 399088
URL: https://svnweb.freebsd.org/changeset/ports/399088

Log:
  www/squidclamav: 6.10 -> 6.13
  
  - Unbreak
  - Update
  - Changes:
    http://squidclamav.darold.net/news.html
  
  PR:		198274
  Approved by:	mm (timeout)

Added:
  head/www/squidclamav/files/patch-etc_Makefile.in
     - copied, changed from r399080, head/www/squidclamav/files/patch-etc-Makefile.in
Deleted:
  head/www/squidclamav/files/patch-etc-Makefile.in
Modified:
  head/www/squidclamav/Makefile
  head/www/squidclamav/distinfo
  head/www/squidclamav/pkg-plist

Modified: head/www/squidclamav/Makefile
==============================================================================
--- head/www/squidclamav/Makefile	Sun Oct 11 13:19:10 2015	(r399087)
+++ head/www/squidclamav/Makefile	Sun Oct 11 14:29:05 2015	(r399088)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	squidclamav
-PORTVERSION=	6.10
-PORTREVISION=	2
+PORTVERSION=	6.13
 CATEGORIES=	www security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
@@ -12,13 +11,11 @@ COMMENT=	Clamav c-icap service and redir
 
 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

Modified: head/www/squidclamav/distinfo
==============================================================================
--- head/www/squidclamav/distinfo	Sun Oct 11 13:19:10 2015	(r399087)
+++ head/www/squidclamav/distinfo	Sun Oct 11 14:29:05 2015	(r399088)
@@ -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

Copied and modified: head/www/squidclamav/files/patch-etc_Makefile.in (from r399080, head/www/squidclamav/files/patch-etc-Makefile.in)
==============================================================================
--- head/www/squidclamav/files/patch-etc-Makefile.in	Sun Oct 11 05:33:23 2015	(r399080, copy source)
+++ head/www/squidclamav/files/patch-etc_Makefile.in	Sun Oct 11 14:29:05 2015	(r399088)
@@ -1,16 +1,11 @@
---- 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 @@
- 
+--- 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)$(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:
+ 	$(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/

Modified: head/www/squidclamav/pkg-plist
==============================================================================
--- head/www/squidclamav/pkg-plist	Sun Oct 11 13:19:10 2015	(r399087)
+++ head/www/squidclamav/pkg-plist	Sun Oct 11 14:29:05 2015	(r399088)
@@ -1,7 +1,6 @@
- at 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
- at exec [ -f %B/squidclamav.conf ] || cp %B/%f %B/squidclamav.conf
+ at 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