[pkgsrc/trunk]: pkgsrc/devel/cflow Do not stupidly insist on GNU gettext, tha...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7969fd65aa58
branches:  trunk
changeset: 566732:7969fd65aa58
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Oct 29 16:25:57 2009 +0000

description:
Do not stupidly insist on GNU gettext, thanks.

diffstat:

 devel/cflow/distinfo         |   3 +-
 devel/cflow/patches/patch-aa |  71 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletions(-)

diffs (86 lines):

diff -r 350171f6e291 -r 7969fd65aa58 devel/cflow/distinfo
--- a/devel/cflow/distinfo      Thu Oct 29 15:53:09 2009 +0000
+++ b/devel/cflow/distinfo      Thu Oct 29 16:25:57 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/08/21 23:36:55 wiz Exp $
+$NetBSD: distinfo,v 1.4 2009/10/29 16:25:57 joerg Exp $
 
 SHA1 (cflow-1.3.tar.gz) = 8cc32e7e75f6b1ecbd90d7699cdd859d9419c28c
 RMD160 (cflow-1.3.tar.gz) = 90c7652590a85b762034151b5f9ed94c6f4b4cb6
 Size (cflow-1.3.tar.gz) = 759691 bytes
+SHA1 (patch-aa) = 24df2339f6ae36a442d7dde6c263f1b566edf5ae
diff -r 350171f6e291 -r 7969fd65aa58 devel/cflow/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cflow/patches/patch-aa      Thu Oct 29 16:25:57 2009 +0000
@@ -0,0 +1,71 @@
+$NetBSD: patch-aa,v 1.1 2009/10/29 16:25:57 joerg Exp $
+
+--- configure.orig     2009-07-11 21:36:00.000000000 +0200
++++ configure
+@@ -23533,23 +23533,7 @@ _ACEOF
+ 
+     if test "$USE_NLS" = "yes"; then
+     gt_use_preinstalled_gnugettext=no
+-
+-
+-        if test $gt_api_version -ge 3; then
+-          gt_revision_test_code='
+-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+-#endif
+-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+-'
+-        else
+           gt_revision_test_code=
+-        fi
+-        if test $gt_api_version -ge 2; then
+-          gt_expression_test_code=' + * ngettext ("", "", 0)'
+-        else
+-          gt_expression_test_code=
+-        fi
+ 
+         { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+ $as_echo_n "checking for GNU gettext in libc... " >&6; }
+@@ -24366,15 +24350,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ $gt_revision_test_code
+ extern int _nl_msg_cat_cntr;
+ extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias (const char *);
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr
+   ;
+   return 0;
+ }
+@@ -24423,15 +24403,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ $gt_revision_test_code
+ extern int _nl_msg_cat_cntr;
+ extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias (const char *);
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr
+   ;
+   return 0;
+ }
+@@ -25208,6 +25184,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;