Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 16 Apr 2018 18:57:57 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467528 - head/mail/p5-Mail-ClamAV/files
Message-ID:  <201804161857.w3GIvvfa081914@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pi
Date: Mon Apr 16 18:57:56 2018
New Revision: 467528
URL: https://svnweb.freebsd.org/changeset/ports/467528

Log:
  mail/p5-Mail-ClamAV: use a more generic version check in Makefile.PL

Modified:
  head/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm
  head/mail/p5-Mail-ClamAV/files/patch-Makefile.PL

Modified: head/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm
==============================================================================
--- head/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm	Mon Apr 16 18:55:55 2018	(r467527)
+++ head/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm	Mon Apr 16 18:57:56 2018	(r467528)
@@ -1,6 +1,6 @@
---- ./ClamAV.pm.orig	2009-04-30 01:02:43.000000000 +0200
-+++ ./ClamAV.pm	2014-03-02 11:45:39.000000000 +0100
-@@ -286,7 +286,7 @@
+--- ClamAV.pm.orig	2009-04-29 23:02:43 UTC
++++ ClamAV.pm
+@@ -286,7 +286,7 @@ int clamav_perl_maxreclevel(SV *self, ...)
      reclevel = cl_engine_get_num(c->root, CL_ENGINE_MAX_RECURSION, &err);
      if (err != CL_SUCCESS) {
          error(err);
@@ -9,7 +9,7 @@
      }
      return reclevel;
  }
-@@ -313,7 +313,7 @@
+@@ -313,7 +313,7 @@ int clamav_perl_maxfiles(SV *self, ...)
      maxfiles = cl_engine_get_num(c->root, CL_ENGINE_MAX_FILES, &err);
      if (err != CL_SUCCESS) {
          error(err);
@@ -18,7 +18,7 @@
      }
      return maxfiles;
  }
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ int clamav_perl_maxfilesize(SV *self, ...)
      maxfsize = cl_engine_get_num(c->root, CL_ENGINE_MAX_FILESIZE, &err);
      if (err != CL_SUCCESS) {
          error(err);

Modified: head/mail/p5-Mail-ClamAV/files/patch-Makefile.PL
==============================================================================
--- head/mail/p5-Mail-ClamAV/files/patch-Makefile.PL	Mon Apr 16 18:55:55 2018	(r467527)
+++ head/mail/p5-Mail-ClamAV/files/patch-Makefile.PL	Mon Apr 16 18:57:56 2018	(r467528)
@@ -1,11 +1,19 @@
 --- Makefile.PL.orig	2009-04-29 19:06:39 UTC
 +++ Makefile.PL
-@@ -51,7 +51,7 @@ sub main {
+@@ -2,6 +2,7 @@ use 5.006;
+ 
+ use lib '.';
+ use Inline::MakeMaker; # bundled
++use version;
+ 
+ # see ExtUtils::MY documentation
+ sub MY::top_targets {
+@@ -51,7 +52,7 @@ sub main {
      }
  
      my $clver = get_cl_version();
 -    return warn_cl_version_bad() if $clver lt $minclversion;
-+    return warn_cl_version_bad() if (($clver =~ /^0\.9/) && ($clver lt $minclversion)) && ($clver lt '0.100.0');
++    return warn_cl_version_bad() if ( version->parse($clver) < version->parse($minclversion) );
  
      my $inc = get_cl_inc_paths();
      my $libs = get_cl_libs();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804161857.w3GIvvfa081914>