From owner-svn-ports-all@freebsd.org Tue Feb 2 11:41:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4932EA982F4; Tue, 2 Feb 2016 11:41:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BF16E4; Tue, 2 Feb 2016 11:41:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12BfJkH086260; Tue, 2 Feb 2016 11:41:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12BfIgB086258; Tue, 2 Feb 2016 11:41:18 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602021141.u12BfIgB086258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 2 Feb 2016 11:41:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407812 - head/www/c-icap-modules X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Feb 2016 11:41:20 -0000 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