1 files changed, 18 insertions, 75 deletions
diff --git a/textproc/html2text/patches/patch-aa b/textproc/html2text/patches/patch-aa
index 620011c2c51..e75d1c0bc0d 100644
--- a/textproc/html2text/patches/patch-aa
+++ b/textproc/html2text/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/03/24 08:53:29 adam Exp $
+$NetBSD: patch-aa,v 1.4 2011/01/31 10:36:21 adam Exp $
 
 --- configure.orig	2004-01-12 15:47:18.000000000 +0000
 +++ configure
@@ -11,84 +11,27 @@ $NetBSD: patch-aa,v 1.3 2005/03/24 08:53:29 adam Exp $
  
  rm -rf configure-tmp || exit 1;
  mkdir configure-tmp || exit 1;
-@@ -30,7 +30,7 @@ makedirs=".";
- # $CXX
- #
- 
--$echo 'Checking C++ compiler... \c';
-+$echo -n 'Checking C++ compiler... ';
- cat <<EOF >$tmp_file.C;
- #include <iostream>
- int main(int, char **) {
-@@ -55,7 +55,7 @@ $echo "use \"$CXX\"";
- # $SYS_POLL_MISSING
- #
- 
--$echo 'Checking <sys/poll.h>... \c';
-+$echo -n 'Checking <sys/poll.h>... ';
- SYS_POLL_MISSING=unknown;
- cat <<EOF >$tmp_file.C;
- #ifdef SYS_POLL_MISSING /* { */
-@@ -95,7 +95,7 @@ esac;
- # $SOCKET_LIBRARIES
- #
- 
--$echo 'Checking for socket libraries... \c';
-+$echo -n 'Checking for socket libraries... ';
- SOCKET_LIBRARIES=unknown;
- cat >$tmp_file.C <<EOF;
- extern "C" int socket();
-@@ -126,7 +126,7 @@ fi;
- # $BOOL_DEFINITION
- #
- 
--$echo 'Checking "bool"... \c';
-+$echo -n 'Checking "bool"... ';
- BOOL_DEFINITION=unknown;
- cat <<EOF >$tmp_file.C;
- #ifdef BOOL_DEFINITION
-@@ -163,7 +163,7 @@ esac;
- # $EXPLICIT
- #
- 
--$echo 'Checking "explicit"... \c';
-+$echo -n 'Checking "explicit"... ';
- EXPLICIT=unknown;
- cat <<EOF >$tmp_file.C;
- struct C {
-@@ -194,7 +194,7 @@ esac;
- # $LIBSTDCXX_INCLUDES, $LIBSTDCXX_LIBS
- #
- 
--$echo 'Checking Standard C++ library... \c';
-+$echo -n 'Checking Standard C++ library... ';
- cat <<EOF >$tmp_file.C;
- #include <string>
- #include <list>
-@@ -222,7 +222,7 @@ fi;
- # $AUTO_PTR_BROKEN
- #
- AUTO_PTR_BROKEN="";
--$echo 'Checking "auto_ptr"... \c';
-+$echo -n 'Checking "auto_ptr"... ';
- cat <<EOF >$tmp_file.C;
- #include <memory>
- #include <string>
-@@ -254,7 +254,7 @@ fi;
- # $MAKEDEPEND_INCLUDES
- #
- MAKEDEPEND_INCLUDES="";
--$echo 'Checking "makedepend" includes... \c';
-+$echo -n 'Checking "makedepend" includes... \c';
- echo "#include <iostream>" >$tmp_file.C;
- MAKEDEPEND_INCLUDES=`$CXX -E $tmp_file.C 2>/dev/null |
- sed -n \
-@@ -287,7 +287,7 @@ for i in \
+@@ -38,13 +38,7 @@ int main(int, char **) {
+   return 0;
+ }
+ EOF
+-CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
+-  if $i -c $tmp_file.C 2>/dev/null; then
+-    CXX="$i";
+-    break;
+-  fi;
+-done;
++CXX="${CXX}";
+ if test "$CXX" = unknown; then
+   $echo "Error: Could not find a working C++ compiler.";
+   exit 1;
+@@ -287,7 +281,7 @@ for i in \
    MAKEDEPEND_INCLUDES; \
  do cmd="$cmd -e \"s|@$i@|\$$i|g\""; done;
  for dir in $makedirs; do
 -  $echo "Creating \"$dir/Makefile\" from \"$dir/Makefile.in\"... \\c";
-+  $echo -n "Creating \"$dir/Makefile\" from \"$dir/Makefile.in\"... ";
++  $echo "Creating \"$dir/Makefile\" from \"$dir/Makefile.in\"... ";
    cat <<EOF >$dir/Makefile;
  
  #