3 files changed, 28 insertions, 10 deletions

diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile
index e1d7e1338973..47b6b3cdedee 100644
--- a/www/c-icap-modules/Makefile
+++ b/www/c-icap-modules/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	c-icap
-PORTVERSION=	0.2.4
+PORTVERSION=	0.3.2
 CATEGORIES=	www security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.2.x/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.3.x/
 PKGNAMESUFFIX=	-modules
 DISTNAME=	c_icap_modules-${PORTVERSION}
 
@@ -13,7 +13,7 @@ COMMENT=	c-icap modules virus_scan and srv_url_check
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	icapapi:${PORTSDIR}/www/c-icap \
+LIB_DEPENDS+=	icapapi.3:${PORTSDIR}/www/c-icap \
 		clamav:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
@@ -27,11 +27,17 @@ CONFIGURE_ARGS+=	--enable-static \
 			--with-c-icap=${LOCALBASE} \
 			--with-clamav=${LOCALBASE}
 
-NO_STAGE=	yes
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/c-icap
+
 post-install:
-	@${CP} -np ${PREFIX}/etc/c-icap/srv_url_check.conf.default \
-		${PREFIX}/etc/c-icap/srv_url_check.conf || ${TRUE}
-	@${CP} -np ${PREFIX}/etc/c-icap/virus_scan.conf.default \
-		${PREFIX}/etc/c-icap/virus_scan.conf || ${TRUE}
+	@${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/clamav_mod.conf.default \
+		${STAGEDIR}${PREFIX}/etc/c-icap/clamav_mod.conf || ${TRUE}
+	@${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/clamd_mod.conf.default \
+		${STAGEDIR}${PREFIX}/etc/c-icap/clamd_mod.conf || ${TRUE}
+	@${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/srv_url_check.conf.default \
+		${STAGEDIR}${PREFIX}/etc/c-icap/srv_url_check.conf || ${TRUE}
+	@${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/virus_scan.conf.default \
+		${STAGEDIR}${PREFIX}/etc/c-icap/virus_scan.conf || ${TRUE}
 
 .include <bsd.port.mk>
diff --git a/www/c-icap-modules/distinfo b/www/c-icap-modules/distinfo
index a116f30062ae..1703ce8ec926 100644
--- a/www/c-icap-modules/distinfo
+++ b/www/c-icap-modules/distinfo
@@ -1,2 +1,2 @@
-SHA256 (c_icap_modules-0.2.4.tar.gz) = 63108dfbc36af9f44cfbe073b4248d368eb64c9d3612aeab0d46171be5c15713
-SIZE (c_icap_modules-0.2.4.tar.gz) = 373120
+SHA256 (c_icap_modules-0.3.2.tar.gz) = e3472662687cf9fa37a496df31436924326e315920056a404f023ec5e852e239
+SIZE (c_icap_modules-0.3.2.tar.gz) = 384788
diff --git a/www/c-icap-modules/pkg-plist b/www/c-icap-modules/pkg-plist
index 561bf7323941..cb12074e357e 100644
--- a/www/c-icap-modules/pkg-plist
+++ b/www/c-icap-modules/pkg-plist
@@ -1,9 +1,21 @@
+@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_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
+lib/c_icap/clamav_mod.a
+lib/c_icap/clamav_mod.la
+lib/c_icap/clamav_mod.so
+lib/c_icap/clamd_mod.a
+lib/c_icap/clamd_mod.la
+lib/c_icap/clamd_mod.so
 lib/c_icap/srv_url_check.a
 lib/c_icap/srv_url_check.la
 lib/c_icap/srv_url_check.so