[pkgsrc/trunk]: pkgsrc/devel/frama-c Fix GNU make version comparison logic.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f003383902a
branches:  trunk
changeset: 626564:4f003383902a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Nov 15 14:10:29 2013 +0000

description:
Fix GNU make version comparison logic.

diffstat:

 devel/frama-c/distinfo                |   5 ++---
 devel/frama-c/patches/patch-configure |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r abb1947d5e2e -r 4f003383902a devel/frama-c/distinfo
--- a/devel/frama-c/distinfo    Fri Nov 15 14:03:11 2013 +0000
+++ b/devel/frama-c/distinfo    Fri Nov 15 14:10:29 2013 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2012/10/08 15:28:04 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2013/11/15 14:10:29 wiz Exp $
 
 SHA1 (frama-c-Oxygen-20120901.tar.gz) = 65aef0a88b788d11a6b5061dc08741492859de40
 RMD160 (frama-c-Oxygen-20120901.tar.gz) = 76daf11770a52b1b1bc59ca9c576208ac08755a8
 Size (frama-c-Oxygen-20120901.tar.gz) = 10815011 bytes
-SHA1 (patch-Makefile) = f851797e599f682c4067fb02543b66c38cbd3446
-SHA1 (patch-src_wp_Makefile) = bce0f55bae0718df462b2e1b6da689a4a00113d1
+SHA1 (patch-configure) = c7e895c967199433c9d55d99347ec14cad9b41ab
diff -r abb1947d5e2e -r 4f003383902a devel/frama-c/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/frama-c/patches/patch-configure     Fri Nov 15 14:10:29 2013 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2013/11/15 14:10:29 wiz Exp $
+
+Fix GNU make version comparison logic.
+
+--- configure.orig     2013-11-15 14:08:17.000000000 +0000
++++ configure
+@@ -2617,7 +2617,7 @@ MAKE_DISTRIB=`$MAKE -v | sed -n -e 's/\(
+ MAKE_MAJOR=`$MAKE -v | sed -n  -f bin/sed_get_make_major `
+ MAKE_MINOR=`$MAKE -v | sed -n -f bin/sed_get_make_minor `
+ echo $ECHO_N "make version is $MAKE_DISTRIB Make $MAKE_MAJOR.$MAKE_MINOR: $ECHO_C"
+-if test "$MAKE_DISTRIB" != GNU -o "$MAKE_MAJOR" -lt 3 -o "$MAKE_MINOR" -lt 81;
++if test "$MAKE_DISTRIB" != GNU -o "$MAKE_MAJOR" -lt 3 -o "$MAKE_MAJOR" -eq 3 -a "$MAKE_MINOR" -lt 81;
+ then
+    echo "${ECHO_T}"
+    as_fn_error $? "unsupported version; GNU Make version 3.81