From owner-svn-ports-all@FreeBSD.ORG Fri Jun 21 18:41:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EA15C500; Fri, 21 Jun 2013 18:41:09 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CE03D1F51; Fri, 21 Jun 2013 18:41:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LIf9iD091979; Fri, 21 Jun 2013 18:41:09 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LIf9CR091976; Fri, 21 Jun 2013 18:41:09 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201306211841.r5LIf9CR091976@svn.freebsd.org> From: Renato Botelho Date: Fri, 21 Jun 2013 18:41:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321496 - head/security/clamav-devel 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.14 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: Fri, 21 Jun 2013 18:41:10 -0000 Author: garga Date: Fri Jun 21 18:41:08 2013 New Revision: 321496 URL: http://svnweb.freebsd.org/changeset/ports/321496 Log: . Update to 20130621 . Use new macros where it's possible Modified: head/security/clamav-devel/Makefile head/security/clamav-devel/distinfo head/security/clamav-devel/pkg-plist Modified: head/security/clamav-devel/Makefile ============================================================================== --- head/security/clamav-devel/Makefile Fri Jun 21 18:35:45 2013 (r321495) +++ head/security/clamav-devel/Makefile Fri Jun 21 18:41:08 2013 (r321496) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= clamav -PORTVERSION= 20130531 +PORTVERSION= 20130621 CATEGORIES= security MASTER_SITES= http://www.clamav.net/snapshot/ \ LOCAL/garga/clamav-devel @@ -28,6 +28,18 @@ STDERR_DESC= Print logs to stderr instea OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM DOCS +ARC_RUN_DEPENDS= arc:${PORTSDIR}/archivers/arc +ARJ_RUN_DEPENDS= arj:${PORTSDIR}/archivers/arj +LHA_RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha +UNZOO_RUN_DEPENDS= unzoo:${PORTSDIR}/archivers/unzoo +UNRAR_CONFIGURE_ENABLE= unrar +MILTER_CONFIGURE_ENABLE=milter +TESTS_CONFIGURE_ENABLE= check +TESTS_BUILD_DEPENDS= ${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck +ICONV_CONFIGURE_ON= --with-iconv +ICONV_CONFIGURE_OFF= --without-iconv +ICONV_USES= iconv + GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes @@ -44,6 +56,7 @@ RUNDIR= /var/run/clamav PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads USE_AUTOTOOLS= libltdl +OPTIONS_SUB= yes CONFIGURE_ARGS= --libdir=${PREFIX}/lib \ --with-dbdir=${DBDIR} \ @@ -118,31 +131,6 @@ PORTSCOUT= ignore:1 .include -.if ${PORT_OPTIONS:MARC} -RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc -.endif -.if ${PORT_OPTIONS:MARJ} -RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj -.endif -.if ${PORT_OPTIONS:MLHA} -RUN_DEPENDS+= lha:${PORTSDIR}/archivers/lha -.endif -.if ${PORT_OPTIONS:MUNZOO} -RUN_DEPENDS+= unzoo:${PORTSDIR}/archivers/unzoo -.endif -.if ${PORT_OPTIONS:MUNRAR} -PLIST_SUB+= UNRAR="" -.else -PLIST_SUB+= UNRAR="@comment " -CONFIGURE_ARGS+=--disable-unrar -.endif -.if ${PORT_OPTIONS:MICONV} -CONFIGURE_ARGS+=--with-iconv -USES+= iconv -.else -CONFIGURE_ARGS+=--without-iconv -.endif - .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) CONFIGURE_ARGS+=--enable-llvm . if defined(WITH_TESTS) @@ -166,11 +154,6 @@ CONFIGURE_ARGS+=--with-sendmail=${LOCALB . else CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail . endif - -CONFIGURE_ARGS+=--enable-milter -PLIST_SUB+= CLAMAV-MILTER="" -.else -PLIST_SUB+= CLAMAV-MILTER="@comment " .endif .if ${PORT_OPTIONS:MSTDERR} @@ -183,13 +166,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch CFLAGS+= -march=i486 .endif -.if ${PORT_OPTIONS:MTESTS} && ${OSVERSION} >= 700000 -BUILD_DEPENDS+= ${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck -CONFIGURE_ARGS+=--enable-check -.else -CONFIGURE_ARGS+=--disable-check -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} Modified: head/security/clamav-devel/distinfo ============================================================================== --- head/security/clamav-devel/distinfo Fri Jun 21 18:35:45 2013 (r321495) +++ head/security/clamav-devel/distinfo Fri Jun 21 18:41:08 2013 (r321496) @@ -1,2 +1,2 @@ -SHA256 (clamav-devel-20130531.tar.gz) = b50038e9acfaf4dca0ac27a15cd25bffa4912cd8799193a16f7a02b7aa5c2376 -SIZE (clamav-devel-20130531.tar.gz) = 37001728 +SHA256 (clamav-devel-20130621.tar.gz) = 25c9652b6261c7bb6d15b453be39d3dfec21771209fc49035ca4ceffd360b505 +SIZE (clamav-devel-20130621.tar.gz) = 37001626 Modified: head/security/clamav-devel/pkg-plist ============================================================================== --- head/security/clamav-devel/pkg-plist Fri Jun 21 18:35:45 2013 (r321495) +++ head/security/clamav-devel/pkg-plist Fri Jun 21 18:41:08 2013 (r321496) @@ -7,7 +7,7 @@ bin/clamscan bin/clamdscan bin/freshclam bin/sigtool -%%CLAMAV-MILTER%%sbin/clamav-milter +%%MILTER%%sbin/clamav-milter sbin/clamd include/clamav.h include/clamav-config.h @@ -26,8 +26,8 @@ etc/clamd.conf.default @exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf @unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi etc/freshclam.conf.default -%%CLAMAV-MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.default; then rm -f %D/etc/clamav-milter.conf; fi -%%CLAMAV-MILTER%%etc/clamav-milter.conf.default +%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.default; then rm -f %D/etc/clamav-milter.conf; fi +%%MILTER%%etc/clamav-milter.conf.default @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf @unexec [ -s %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true @unexec [ -s %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true