From owner-svn-ports-head@freebsd.org Mon Apr 16 18:57:57 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9767F9CD9F; Mon, 16 Apr 2018 18:57:57 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EF766D759; Mon, 16 Apr 2018 18:57:57 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65D5A21452; Mon, 16 Apr 2018 18:57:57 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3GIvvo3081916; Mon, 16 Apr 2018 18:57:57 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3GIvvfa081914; Mon, 16 Apr 2018 18:57:57 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201804161857.w3GIvvfa081914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 16 Apr 2018 18:57:57 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: head/mail/p5-Mail-ClamAV/files X-SVN-Commit-Revision: 467528 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 18:57:58 -0000 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();