svn commit: r354178 - in head/security/clamav: . files

[Renato Botelho]

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 <lattera at gmail.com>
  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"])
+