diff options
| author | garga <garga@FreeBSD.org> | 2014-05-16 06:33:08 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2014-05-16 06:33:08 +0800 |
| commit | 5559ebf188717510b40452a149509e5c8dcb5fcc (patch) | |
| tree | 303489bcd571cdd4605927166735b69c0374eb6e /security/clamav | |
| parent | 6cbc92c65423f83a6dfec059d97c7c1b37650817 (diff) | |
| download | freebsd-ports-gnome-5559ebf188717510b40452a149509e5c8dcb5fcc.tar.gz freebsd-ports-gnome-5559ebf188717510b40452a149509e5c8dcb5fcc.tar.zst freebsd-ports-gnome-5559ebf188717510b40452a149509e5c8dcb5fcc.zip | |
Fix major version number calculation
Submitted by: Shawn Webb <lattera@gmail.com>
Obtained from: https://github.com/vrtadmin/clamav-devel/commit/d17ee49f75e23b43fadf745c27dc4dd16ee372e5
Diffstat (limited to 'security/clamav')
| -rw-r--r-- | security/clamav/Makefile | 2 | ||||
| -rw-r--r-- | security/clamav/files/patch-configure | 19 | ||||
| -rw-r--r-- | security/clamav/files/patch-m4__reorganization__version.m4 | 11 |
3 files changed, 26 insertions, 6 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index a4fac51df1a8..992163396fae 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure index fc85efdcc7b6..9f3eccdaaaf2 100644 --- a/security/clamav/files/patch-configure +++ b/security/clamav/files/patch-configure @@ -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" diff --git a/security/clamav/files/patch-m4__reorganization__version.m4 b/security/clamav/files/patch-m4__reorganization__version.m4 new file mode 100644 index 000000000000..54c28d9b4a25 --- /dev/null +++ b/security/clamav/files/patch-m4__reorganization__version.m4 @@ -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"]) + |