Date: Tue, 2 Feb 2016 11:41:18 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407812 - head/www/c-icap-modules Message-ID: <201602021141.u12BfIgB086258@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Feb 2 11:41:18 2016 New Revision: 407812 URL: https://svnweb.freebsd.org/changeset/ports/407812 Log: - Fix incorrect config file handling (srv_url_check.conf was copied from srv_content_filtering.conf.default, not srv_url_check.conf.default) by switching to @sample - Fix LICENSE Approved by: portmgr blanket MFH: 2016Q1 (blanket) Modified: head/www/c-icap-modules/Makefile head/www/c-icap-modules/pkg-plist Modified: head/www/c-icap-modules/Makefile ============================================================================== --- head/www/c-icap-modules/Makefile Tue Feb 2 11:18:08 2016 (r407811) +++ head/www/c-icap-modules/Makefile Tue Feb 2 11:41:18 2016 (r407812) @@ -3,6 +3,7 @@ PORTNAME= c-icap PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= www security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.4.x/ PKGNAMESUFFIX= -modules @@ -11,7 +12,8 @@ DISTNAME= c_icap_modules-${PORTVERSION} MAINTAINER= mm@FreeBSD.org COMMENT= Modules for c-icap: virus_scan and srv_url_check -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libicapapi.so:${PORTSDIR}/www/c-icap \ libclamav.so:${PORTSDIR}/security/clamav Modified: head/www/c-icap-modules/pkg-plist ============================================================================== --- head/www/c-icap-modules/pkg-plist Tue Feb 2 11:18:08 2016 (r407811) +++ head/www/c-icap-modules/pkg-plist Tue Feb 2 11:41:18 2016 (r407812) @@ -1,18 +1,8 @@ -@unexec if cmp -s %D/etc/c-icap/clamav_mod.conf %D/etc/c-icap/clamav_mod.conf.default; then rm -f %D/etc/c-icap/clamav_mod.conf; fi -etc/c-icap/clamav_mod.conf.default -@exec [ -f %B/clamav_mod.conf ] || cp %B/%f %B/clamav_mod.conf -@unexec if cmp -s %D/etc/c-icap/clamd_mod.conf %D/etc/c-icap/clamd_mod.conf.default; then rm -f %D/etc/c-icap/clamd_mod.conf; fi -etc/c-icap/clamd_mod.conf.default -@exec [ -f %B/clamd_mod.conf ] || cp %B/%f %B/clamd_mod.conf -@unexec if cmp -s %D/etc/c-icap/srv_content_filtering.conf %D/etc/c-icap/srv_content_filtering.conf.default; then rm -f %D/etc/c-icap/srv_content_filtering.conf; fi -etc/c-icap/srv_content_filtering.conf.default -@exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf -@unexec if cmp -s %D/etc/c-icap/srv_url_check.conf %D/etc/c-icap/srv_url_check.conf.default; then rm -f %D/etc/c-icap/srv_url_check.conf; fi -etc/c-icap/srv_url_check.conf.default -@exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf -@unexec if cmp -s %D/etc/c-icap/virus_scan.conf %D/etc/c-icap/virus_scan.conf.default; then rm -f %D/etc/c-icap/virus_scan.conf; fi -etc/c-icap/virus_scan.conf.default -@exec [ -f %B/virus_scan.conf ] || cp %B/%f %B/virus_scan.conf +@sample etc/c-icap/clamav_mod.conf.default etc/c-icap/clamav_mod.conf +@sample etc/c-icap/clamd_mod.conf.default etc/c-icap/clamd_mod.conf +@sample etc/c-icap/srv_content_filtering.conf.default etc/c-icap/srv_content_filtering.conf +@sample etc/c-icap/srv_url_check.conf.default etc/c-icap/srv_url_check.conf +@sample etc/c-icap/virus_scan.conf.default etc/c-icap/virus_scan.conf lib/c_icap/clamav_mod.a lib/c_icap/clamav_mod.so lib/c_icap/clamd_mod.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602021141.u12BfIgB086258>