Kludge the build in the face of systems with autoconf 2.52+.

PR:		ports/33443
Submitted by:	Alan Eldridge <ports@geeksrus.net>
		Jason Stephenson <panda@mis.net>

4 files changed, 80 insertions, 8 deletions

diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index 7f88642da915..c9c2776b1eef 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	0.10.35
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
diff --git a/devel/gettext-old/files/patch-ae b/devel/gettext-old/files/patch-ae
index bbb9fce0b072..920d368fe4ed 100644
--- a/devel/gettext-old/files/patch-ae
+++ b/devel/gettext-old/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	Fri May  1 07:48:25 1998
-+++ configure	Wed Feb 17 02:05:55 1999
-@@ -837,13 +837,13 @@
+--- configure.orig	Fri May  1 01:48:25 1998
++++ configure	Tue Jan  1 07:05:49 2002
+@@ -837,52 +837,52 @@
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -19,7 +19,24 @@
  
  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
  echo "configure:850: checking for working autoconf" >&5
-@@ -863,13 +863,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOCONF=autoconf
+-   echo "$ac_t""found" 1>&6
+-else
++#if (autoconf --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOCONF=autoconf
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOCONF="$missing_dir/missing autoconf"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working automake""... $ac_c" 1>&6
+ echo "configure:863: checking for working automake" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -38,6 +55,24 @@
  
  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
  echo "configure:876: checking for working autoheader" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOHEADER=autoheader
+-   echo "$ac_t""found" 1>&6
+-else
++#if (autoheader --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOHEADER=autoheader
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOHEADER="$missing_dir/missing autoheader"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+ echo "configure:889: checking for working makeinfo" >&5
 @@ -3958,7 +3958,7 @@
     fi
     
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 7f88642da915..c9c2776b1eef 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	0.10.35
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index bbb9fce0b072..920d368fe4ed 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	Fri May  1 07:48:25 1998
-+++ configure	Wed Feb 17 02:05:55 1999
-@@ -837,13 +837,13 @@
+--- configure.orig	Fri May  1 01:48:25 1998
++++ configure	Tue Jan  1 07:05:49 2002
+@@ -837,52 +837,52 @@
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -19,7 +19,24 @@
  
  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
  echo "configure:850: checking for working autoconf" >&5
-@@ -863,13 +863,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOCONF=autoconf
+-   echo "$ac_t""found" 1>&6
+-else
++#if (autoconf --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOCONF=autoconf
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOCONF="$missing_dir/missing autoconf"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working automake""... $ac_c" 1>&6
+ echo "configure:863: checking for working automake" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -38,6 +55,24 @@
  
  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
  echo "configure:876: checking for working autoheader" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOHEADER=autoheader
+-   echo "$ac_t""found" 1>&6
+-else
++#if (autoheader --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOHEADER=autoheader
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOHEADER="$missing_dir/missing autoheader"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+ echo "configure:889: checking for working makeinfo" >&5
 @@ -3958,7 +3958,7 @@
     fi