diff options
| author | joerg <joerg@pkgsrc.org> | 2007-06-12 22:20:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-06-12 22:20:09 +0000 |
| commit | 882d11e722c966f11b43446cb7cf74b0e3823999 (patch) | |
| tree | 569f10bb4c325a573339788e75ef5826c3af51d0 /net | |
| parent | 2e380506915d24d111f7a6d1220146ab784b0997 (diff) | |
| download | pkgsrc-882d11e722c966f11b43446cb7cf74b0e3823999.tar.gz | |
Make the GNU M4 check actually work with GNU m4...
Diffstat (limited to 'net')
| -rw-r--r-- | net/docsis/distinfo | 4 | ||||
| -rw-r--r-- | net/docsis/patches/patch-ab | 23 | ||||
| -rw-r--r-- | net/docsis/patches/patch-ac | 27 |
3 files changed, 53 insertions, 1 deletions
diff --git a/net/docsis/distinfo b/net/docsis/distinfo index 704c639fce4..fb0bc1cbd50 100644 --- a/net/docsis/distinfo +++ b/net/docsis/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.8 2006/03/22 16:33:08 joerg Exp $ +$NetBSD: distinfo,v 1.9 2007/06/12 22:20:09 joerg Exp $ SHA1 (docsis-0.9.4.tar.gz) = 226ee5989475fdb93f8879bebddb07a20738553c RMD160 (docsis-0.9.4.tar.gz) = 7e318cfce452e76fb4eb30bd5e43558837fb707f Size (docsis-0.9.4.tar.gz) = 506944 bytes SHA1 (patch-aa) = 946c40cc7a6545cc67eb666130156193aa17d0bd +SHA1 (patch-ab) = 4643af1e64d19567ac251a130df00ba5be27583d +SHA1 (patch-ac) = c536cac40a73786538f60f5f6cb04c5bd1625e79 diff --git a/net/docsis/patches/patch-ab b/net/docsis/patches/patch-ab new file mode 100644 index 00000000000..ef4e3c04ddb --- /dev/null +++ b/net/docsis/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.3 2007/06/12 22:20:09 joerg Exp $ + +--- configure.in.orig 2005-04-26 13:17:09.000000000 +0000 ++++ configure.in +@@ -16,12 +16,14 @@ if test "x$M4" = "xnotfound"; then + AC_MSG_ERROR([M4 is required]) + else + ac_m4_vers=`$M4 --version 2>/dev/null | head -1` ; +- ac_is_gnu_m4=`echo $ac_m4_vers | cut -d' ' -f1`; +- if test "x$ac_is_gnu_m4" = "xGNU"; then ++ case ${ac_m4_vers} in ++ *GNU*) + AC_MSG_RESULT([ found $ac_m4_vers at $M4 ]) +- else ++ ;; ++ *) + AC_MSG_ERROR([ GNU M4 is needed ]) +- fi ++ ;; ++ esac + fi + + dnl check for bison, yacc won't help; diff --git a/net/docsis/patches/patch-ac b/net/docsis/patches/patch-ac new file mode 100644 index 00000000000..0a785d3c627 --- /dev/null +++ b/net/docsis/patches/patch-ac @@ -0,0 +1,27 @@ +$NetBSD: patch-ac,v 1.1 2007/06/12 22:20:09 joerg Exp $ + +--- configure.orig 2007-06-12 22:06:24.000000000 +0000 ++++ configure +@@ -19510,15 +19510,17 @@ echo "$as_me: error: M4 is required" >&2 + { (exit 1); exit 1; }; } + else + ac_m4_vers=`$M4 --version 2>/dev/null | head -1` ; +- ac_is_gnu_m4=`echo $ac_m4_vers | cut -d' ' -f1`; +- if test "x$ac_is_gnu_m4" = "xGNU"; then ++ case ${ac_m4_vers} in ++ *GNU*) + echo "$as_me:$LINENO: result: found $ac_m4_vers at $M4 " >&5 +-echo "${ECHO_T} found $ac_m4_vers at $M4 " >&6 +- else ++ echo "${ECHO_T} found $ac_m4_vers at $M4 " >&6 ++ ;; ++ *) + { { echo "$as_me:$LINENO: error: GNU M4 is needed " >&5 + echo "$as_me: error: GNU M4 is needed " >&2;} + { (exit 1); exit 1; }; } +- fi ++ ;; ++ esac + fi + + |