[128386] trunk/dports/sysutils/clamav

[dluke at macports.org]

Revision: 128386
          https://trac.macports.org/changeset/128386
Author:   dluke at macports.org
Date:     2014-11-20 07:34:27 -0800 (Thu, 20 Nov 2014)
Log Message:
-----------
clamav: fix build for 0.98.5 when 0.98.4 is installed

Modified Paths:
--------------
    trunk/dports/sysutils/clamav/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/clamav/files/clamav_build_patch.diff

Modified: trunk/dports/sysutils/clamav/Portfile
===================================================================
--- trunk/dports/sysutils/clamav/Portfile	2014-11-20 15:33:57 UTC (rev 128385)
+++ trunk/dports/sysutils/clamav/Portfile	2014-11-20 15:34:27 UTC (rev 128386)
@@ -1,7 +1,6 @@
 # $Id$
 
 PortSystem 1.0
-PortGroup conflicts_build 1.0
 PortGroup muniversal 1.0
 
 name			clamav
@@ -23,17 +22,19 @@
 
 platforms	   	darwin
 
-#0.98.5 can't build with 0.98.4 installed see #45935
-#wishing for trace mode...
-conflicts_build		${name}
-
 configure.args  	--mandir=${prefix}/share/man \
 			--with-zlib=${prefix} \
 			--with-openssl=${prefix} \
 			--disable-silent-rules
 
-patchfiles		yosemite-patch-configure.diff
+#- yosemite-patch is the yosemite libtool bug
+#- https://bugzilla.clamav.net/show_bug.cgi?id=11188
 
+#- clamav_build_patch lets 0.98.5 build when 0.98.4 is installed
+#- https://bugzilla.clamav.net/show_bug.cgi?id=11194 
+
+patchfiles		yosemite-patch-configure.diff clamav_build_patch.diff
+
 use_parallel_build	yes
 
 depends_lib		port:libiconv port:zlib port:bzip2 port:ncurses port:openssl

Added: trunk/dports/sysutils/clamav/files/clamav_build_patch.diff
===================================================================
--- trunk/dports/sysutils/clamav/files/clamav_build_patch.diff	                        (rev 0)
+++ trunk/dports/sysutils/clamav/files/clamav_build_patch.diff	2014-11-20 15:34:27 UTC (rev 128386)
@@ -0,0 +1,43 @@
+--- freshclam/Makefile.am.orig	2014-11-20 10:11:52.000000000 -0500
++++ freshclam/Makefile.am	2014-11-20 10:12:21.000000000 -0500
+@@ -51,7 +51,7 @@
+ 
+ AM_CFLAGS=@WERR_CFLAGS@
+ DEFS = @DEFS@ -DCL_NOTHREADS
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@
+ LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
+ 
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)
+--- freshclam/Makefile.in.orig	2014-11-20 10:11:56.000000000 -0500
++++ freshclam/Makefile.in	2014-11-20 10:12:38.000000000 -0500
+@@ -472,7 +472,7 @@
+     mirman.h
+ 
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+--- sigtool/Makefile.am.orig	2014-11-20 10:26:02.000000000 -0500
++++ sigtool/Makefile.am	2014-11-20 10:26:32.000000000 -0500
+@@ -37,6 +37,6 @@
+ 
+ AM_CFLAGS=@WERR_CFLAGS@
+ DEFS = @DEFS@ -DCL_NOTHREADS
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
+ LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
+ CLEANFILES=*.gcda *.gcno
+--- sigtool/Makefile.in.orig	2014-11-20 10:25:56.000000000 -0500
++++ sigtool/Makefile.in	2014-11-20 10:26:42.000000000 -0500
+@@ -456,7 +456,7 @@
+     sigtool.c
+ 
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
+ CLEANFILES = *.gcda *.gcno
+ all: all-am
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141120/7c770298/attachment.html>