Index: head/www/c-icap-modules/Makefile
===================================================================
--- head/www/c-icap-modules/Makefile	(revision 407811)
+++ head/www/c-icap-modules/Makefile	(revision 407812)
@@ -1,33 +1,35 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	c-icap
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.4.x/
 PKGNAMESUFFIX=	-modules
 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
 
 USES=		libtool
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 DATADIR=	${PREFIX}/share/c_icap
 
 CFLAGS+=	-DHAVE_STRNSTR
 
 CONFIGURE_ARGS+=	--enable-static \
 			--with-c-icap=${LOCALBASE} \
 			--with-clamav=${LOCALBASE}
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/c-icap
 
 .include <bsd.port.mk>
Index: head/www/c-icap-modules/pkg-plist
===================================================================
--- head/www/c-icap-modules/pkg-plist	(revision 407811)
+++ head/www/c-icap-modules/pkg-plist	(revision 407812)
@@ -1,33 +1,23 @@
-@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
 lib/c_icap/clamd_mod.so
 lib/c_icap/srv_content_filtering.a
 lib/c_icap/srv_content_filtering.so
 lib/c_icap/srv_url_check.a
 lib/c_icap/srv_url_check.so
 lib/c_icap/virus_scan.a
 lib/c_icap/virus_scan.so
 man/man8/c-icap-mods-sguardDB.8.gz
 %%DATADIR%%/templates/srv_content_filtering/en/BLOCK
 %%DATADIR%%/templates/srv_url_check/en/DENY
 %%DATADIR%%/templates/virus_scan/en/VIR_MODE_HEAD
 %%DATADIR%%/templates/virus_scan/en/VIR_MODE_PROGRESS
 %%DATADIR%%/templates/virus_scan/en/VIR_MODE_TAIL
 %%DATADIR%%/templates/virus_scan/en/VIR_MODE_VIRUS_FOUND
 %%DATADIR%%/templates/virus_scan/en/VIRUS_FOUND