From owner-svn-ports-all@FreeBSD.ORG Sat Mar 15 03:07:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 118EBBDC; Sat, 15 Mar 2014 03:07:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E290F1B4; Sat, 15 Mar 2014 03:07:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2F37CO4036690; Sat, 15 Mar 2014 03:07:12 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2F37BUv036684; Sat, 15 Mar 2014 03:07:11 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201403150307.s2F37BUv036684@svn.freebsd.org> From: Martin Matuska Date: Sat, 15 Mar 2014 03:07:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348285 - in head/www: c-icap 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.17 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: Sat, 15 Mar 2014 03:07:13 -0000 Author: mm Date: Sat Mar 15 03:07:11 2014 New Revision: 348285 URL: http://svnweb.freebsd.org/changeset/ports/348285 QAT: https://qat.redports.org/buildarchive/r348285/ Log: Update c-icap to 0.3.3 and c-icap-modules to 0.3.2 Add staging support Modified: head/www/c-icap-modules/Makefile head/www/c-icap-modules/distinfo head/www/c-icap-modules/pkg-plist head/www/c-icap/Makefile head/www/c-icap/distinfo head/www/c-icap/pkg-plist Modified: head/www/c-icap-modules/Makefile ============================================================================== --- head/www/c-icap-modules/Makefile Sat Mar 15 02:44:38 2014 (r348284) +++ head/www/c-icap-modules/Makefile Sat Mar 15 03:07:11 2014 (r348285) @@ -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 s 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 Modified: head/www/c-icap-modules/distinfo ============================================================================== --- head/www/c-icap-modules/distinfo Sat Mar 15 02:44:38 2014 (r348284) +++ head/www/c-icap-modules/distinfo Sat Mar 15 03:07:11 2014 (r348285) @@ -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 Modified: head/www/c-icap-modules/pkg-plist ============================================================================== --- head/www/c-icap-modules/pkg-plist Sat Mar 15 02:44:38 2014 (r348284) +++ head/www/c-icap-modules/pkg-plist Sat Mar 15 03:07:11 2014 (r348285) @@ -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 Modified: head/www/c-icap/Makefile ============================================================================== --- head/www/c-icap/Makefile Sat Mar 15 02:44:38 2014 (r348284) +++ head/www/c-icap/Makefile Sat Mar 15 03:07:11 2014 (r348285) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= c-icap -PORTVERSION= 0.2.5 +PORTVERSION= 0.3.3 PORTEPOCH= 2 CATEGORIES= www -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2.x/ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.x/ DISTNAME= c_icap-${PORTVERSION} MAINTAINER= mm@FreeBSD.org @@ -25,7 +25,9 @@ LARGE_FILES_DESC= Enable large files sup POSIXSEM_DESC= Use POSIX Semaphores instead of SYSV IPC CICAP_USER= c_icap +CICAP_UID= 959 CICAP_GROUP= c_icap +CICAP_GID= 959 USERS= ${CICAP_USER} GROUPS= ${CICAP_GROUP} @@ -38,9 +40,9 @@ MAN8= c-icap-client.8 \ c-icap.8 CONFIGURE_ARGS+= --enable-static \ - --sysconfdir="${PREFIX}/etc/c-icap" + --sysconfdir="${PREFIX}/etc/c-icap" \ + --localstatedir=/var -NO_STAGE= yes .include .if ${PORT_OPTIONS:MBDB} @@ -118,10 +120,9 @@ post-patch: .endif post-install: - @${CP} -np ${PREFIX}/etc/c-icap/c-icap.conf.default \ - ${PREFIX}/etc/c-icap/c-icap.conf || ${TRUE} - @${CP} -np ${PREFIX}/etc/c-icap/c-icap.magic.default \ - ${PREFIX}/etc/c-icap/c-icap.magic || ${TRUE} - @${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL + @${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.conf.default \ + ${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.conf || ${TRUE} + @${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.magic.default \ + ${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.magic || ${TRUE} .include Modified: head/www/c-icap/distinfo ============================================================================== --- head/www/c-icap/distinfo Sat Mar 15 02:44:38 2014 (r348284) +++ head/www/c-icap/distinfo Sat Mar 15 03:07:11 2014 (r348285) @@ -1,2 +1,2 @@ -SHA256 (c_icap-0.2.5.tar.gz) = 125f002f6e2bc70c1d07b2b44ae0d17ee83b9760f4cbe3527865deecdaf877b8 -SIZE (c_icap-0.2.5.tar.gz) = 582223 +SHA256 (c_icap-0.3.3.tar.gz) = 9fc0d7166e65b748138b750f1cba27933aab6ac201fbe2279ab9d7a9c24c7131 +SIZE (c_icap-0.3.3.tar.gz) = 600209 Modified: head/www/c-icap/pkg-plist ============================================================================== --- head/www/c-icap/pkg-plist Sat Mar 15 02:44:38 2014 (r348284) +++ head/www/c-icap/pkg-plist Sat Mar 15 03:07:11 2014 (r348285) @@ -27,11 +27,13 @@ include/c_icap/hash.h include/c_icap/header.h include/c_icap/log.h include/c_icap/lookup_table.h +include/c_icap/md5.h include/c_icap/mem.h include/c_icap/module.h include/c_icap/net_io.h include/c_icap/proc_mutex.h include/c_icap/proc_threads_queues.h +include/c_icap/registry.h include/c_icap/request.h include/c_icap/service.h include/c_icap/shared_mem.h @@ -65,6 +67,6 @@ lib/c_icap/sys_logger.la lib/c_icap/sys_logger.so @dirrm lib/c_icap lib/libicapapi.la -lib/libicapapi.so.2 +lib/libicapapi.so.3 lib/libicapapi.so @dirrmtry etc/c-icap