From owner-svn-ports-all@FreeBSD.ORG Thu May 15 22:33:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0348BECD; Thu, 15 May 2014 22:33:10 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA88D2AEE; Thu, 15 May 2014 22:33:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FMX901045677; Thu, 15 May 2014 22:33:09 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4FMX9cR045674; Thu, 15 May 2014 22:33:09 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201405152233.s4FMX9cR045674@svn.freebsd.org> From: Renato Botelho Date: Thu, 15 May 2014 22:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354178 - in head/security/clamav: . files 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.18 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: Thu, 15 May 2014 22:33:10 -0000 Author: garga Date: Thu May 15 22:33:08 2014 New Revision: 354178 URL: http://svnweb.freebsd.org/changeset/ports/354178 QAT: https://qat.redports.org/buildarchive/r354178/ Log: Fix major version number calculation Submitted by: Shawn Webb Obtained from: https://github.com/vrtadmin/clamav-devel/commit/d17ee49f75e23b43fadf745c27dc4dd16ee372e5 Added: head/security/clamav/files/patch-m4__reorganization__version.m4 (contents, props changed) Modified: head/security/clamav/Makefile head/security/clamav/files/patch-configure Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Thu May 15 22:10:19 2014 (r354177) +++ head/security/clamav/Makefile Thu May 15 22:33:08 2014 (r354178) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF Modified: head/security/clamav/files/patch-configure ============================================================================== --- head/security/clamav/files/patch-configure Thu May 15 22:10:19 2014 (r354177) +++ head/security/clamav/files/patch-configure Thu May 15 22:33:08 2014 (r354178) @@ -1,15 +1,24 @@ ---- configure.orig 2008-10-15 07:41:31.000000000 -0300 -+++ configure 2008-10-15 08:55:58.000000000 -0300 -@@ -17909,7 +17909,7 @@ +--- configure.orig 2014-05-06 15:59:41.000000000 -0300 ++++ configure 2014-05-15 13:28:43.000000000 -0300 +@@ -3450,6 +3450,8 @@ + LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" + + ++major=`expr $LC_CURRENT - $LC_AGE` ++ + + cat >>confdefs.h <<_ACEOF + #define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION" +@@ -18564,7 +18566,7 @@ ;; freebsd*) if test "$have_pthreads" = "yes"; then - THREAD_LIBS="-lthr" + THREAD_LIBS="%%PTHREAD_LIBS%%" TH_SAFE="-thread-safe" + fi - cat >>confdefs.h <<\_ACEOF -@@ -18269,7 +18269,7 @@ +@@ -18740,7 +18742,7 @@ if test "$have_milter" = "yes"; then save_LIBS="$LIBS" Added: head/security/clamav/files/patch-m4__reorganization__version.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav/files/patch-m4__reorganization__version.m4 Thu May 15 22:33:08 2014 (r354178) @@ -0,0 +1,11 @@ +--- m4/reorganization/version.m4.orig 2014-05-15 13:29:00.000000000 -0300 ++++ m4/reorganization/version.m4 2014-05-15 13:29:27.000000000 -0300 +@@ -8,6 +8,8 @@ + LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" + AC_SUBST([LIBCLAMAV_VERSION]) + ++major=`expr $LC_CURRENT - $LC_AGE` ++ + AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION", + ["Full library version number"]) +