Update to version 1.3.1, closing PR pkg/21342. This version is now

licensed under the GPL, has a new home and the following changes:

Multiple-line DOCTYPE declarations are now accepted (HTMLControl.C:352).
------------------------------
Bad initialisation of "fd_" in "urlistream" fixed (urlistream.h), so that an
error message is printed if a remote document could not be retrieved.
------------------------------
A missing node now is interpreted as node '/' (urlistream.C).
------------------------------
Closing DIV, FORM and BLOCKQUOTE tags as well as the closing UL, OL and PRE
tags are now optional (HTMLParser.y), so that the program won't die any longer
if one of them is omited in the document.
------------------------------
Some dificulties with non-ASCII chars fixed (HTMLControl.C).
------------------------------
Colons in elements and attributes now are tolerated and elements are not any
longer implecitly closed at a newline (HTMLControl.C), in order to handly
MS-Word's HTML better.
------------------------------
We do not use '/dev/stdin' as file descriptor any longer (html2text.C and
urlistream.C), in order to make reading from STDIN finaly work.
------------------------------
Block elements are not enclosed in -implecit- Paragraphs any longer
(HTMLParser.y), in order to avoid superfluous newlines in the output.
------------------------------
Fixed segmentation fault on tables with "border" attribute: we now assume that
any TABLE has at least one row and one column (table.C).
------------------------------
Fixed format.C to avoid excessive runtime increment on parsing much nested
block elements.
------------------------------
Some changes in configure, Makefile.in and the documentation.
------------------------------

------------------------------
Ported to g++ version 3.0.
This uses the 'istream.h' header file from the g++3's 'backward' directory.
------------------------------
Bugfix: '-' did not work as synonym for STDIN.
------------------------------
Added support for the EURO-sign (well, almost).
------------------------------
Finaly the GNU GPL as new copyright terms for all parts of the program, after
GMRS agreed to change the program's license terms to it.
------------------------------

------------------------------
Fixed coredump when parsing empty <SCRIPT> or <STYLE> elements (HTMLControl.C).
------------------------------
New image handling: <IMG alt=""> does no longer return the value of the SRC
attribute nor "[]". Added new ~/.html2textrc options: IMG.replace.{all noalt}
and IMG.alt.{prefix suffix} with new defaults in pretty-style mode. Added
method for checking whether an attribut was set, even to a zero-value.
------------------------------
(New) Copyright terms for all changes we made since version 1.2.2.
------------------------------
Some minor changes in configure and html2text.C.
------------------------------
Updated the documentation.
------------------------------


------------------------------
Fixed segmention fault when parsing <H5> tags (typo in format.C).
------------------------------

4 files changed, 35 insertions, 24 deletions

diff --git a/textproc/html2text/DESCR b/textproc/html2text/DESCR
index 31d4b658963..ba5297aae01 100644
--- a/textproc/html2text/DESCR
+++ b/textproc/html2text/DESCR
@@ -7,6 +7,3 @@ pret it "reasonably".
   Documents that are specified by a URL that begins with "http:" are
 retrieved with the Hypertext Transfer Protocol. URLs that begin with
 "file:" and URLs that do not contain a colon specify local files.
-
-  Html2text was written by Arno Unkrig and is available under a
-BSD-style licence.
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index 729b24b253a..bf10d45115d 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -1,19 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:54:20 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/31 02:49:52 jschauma Exp $
 #
 
-DISTNAME=	html2text-1.2.2
+DISTNAME=	html2text-1.3.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.gmrs.de/
+MASTER_SITES=	http://userpage.fu-berlin.de/~mbayer/tools/
 
 MAINTAINER=	rh@NetBSD.org
-HOMEPAGE=	http://www.gmrs.de/html2text.html
+HOMEPAGE=	http://userpage.fu-berlin.de/~mbayer/tools/html2text.html
 COMMENT=	Advanced HTML-to-text converter
 
 HAS_CONFIGURE=	YES
 
+CONFIGURE_ENV+=	ECHO="${ECHO}"
+
+pre-install:
+	${GUNZIP_CMD} -d ${WRKSRC}/html2text.1.gz ${WRKSRC}/html2textrc.5.gz
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/html2textrc.4 ${PREFIX}/man/man5/html2textrc.5
+	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${PREFIX}/man/man5/html2textrc.5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/html2text/distinfo b/textproc/html2text/distinfo
index d03b1ff52fd..0ec6ac6bf0e 100644
--- a/textproc/html2text/distinfo
+++ b/textproc/html2text/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:04:57 skrll Exp $
+$NetBSD: distinfo,v 1.3 2003/07/31 02:49:52 jschauma Exp $
 
-SHA1 (html2text-1.2.2.tar.gz) = 75270f07a49b16f11df526d3b12ed297ee386c6a
-Size (html2text-1.2.2.tar.gz) = 97149 bytes
-SHA1 (patch-aa) = a39a250b955ffa2d645d0ba53300ea5d0da9690a
+SHA1 (html2text-1.3.1.tar.gz) = a2e3438e4f7af3244d65e7dd60fff9aa0e47948d
+Size (html2text-1.3.1.tar.gz) = 119859 bytes
+SHA1 (patch-aa) = 31a5f816eb48285a04bec0198018f5ab1cf89c9f
diff --git a/textproc/html2text/patches/patch-aa b/textproc/html2text/patches/patch-aa
index bb1d10776d2..41551232075 100644
--- a/textproc/html2text/patches/patch-aa
+++ b/textproc/html2text/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $
 
---- configure.orig	Fri Dec 17 15:05:01 1999
-+++ configure	Tue Dec 28 11:28:11 1999
-@@ -13,7 +13,7 @@
+--- configure.orig	2002-04-07 10:05:48.000000000 -0400
++++ configure	2003-07-30 22:29:10.000000000 -0400
+@@ -18,7 +18,7 @@
+ # Sun Apr  7 12:04:48 CEST 2002
+ 
+ 
+-echo='/bin/echo -e'
++echo="${ECHO}"
+ 
+ rm -rf configure-tmp || exit 1;
+ mkdir configure-tmp || exit 1;
+@@ -29,7 +29,7 @@
  # $CXX
  #
  
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  cat <<EOF >$tmp_file.C;
  #include <iostream.h>
  int main(int, char **) {
-@@ -38,7 +38,7 @@
+@@ -54,7 +54,7 @@
  # $SYS_POLL_MISSING
  #
  
@@ -20,7 +29,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  SYS_POLL_MISSING=unknown;
  cat <<EOF >$tmp_file.C;
  #ifdef SYS_POLL_MISSING /* { */
-@@ -78,7 +78,7 @@
+@@ -94,7 +94,7 @@
  # $SOCKET_LIBRARIES
  #
  
@@ -29,7 +38,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  SOCKET_LIBRARIES=unknown;
  cat >$tmp_file.C <<EOF;
  extern "C" int socket();
-@@ -108,7 +108,7 @@
+@@ -125,7 +125,7 @@
  # $BOOL_DEFINITION
  #
  
@@ -38,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  BOOL_DEFINITION=unknown;
  cat <<EOF >$tmp_file.C;
  #ifdef BOOL_DEFINITION
-@@ -145,7 +145,7 @@
+@@ -162,7 +162,7 @@
  # $EXPLICIT
  #
  
@@ -47,7 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  EXPLICIT=unknown;
  cat <<EOF >$tmp_file.C;
  struct C {
-@@ -176,7 +176,7 @@
+@@ -193,7 +193,7 @@
  # $LIBSTDCXX_INCLUDES, $LIBSTDCXX_LIBS
  #
  
@@ -56,7 +65,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  cat <<EOF >$tmp_file.C;
  #include <string>
  #include <list>
-@@ -203,7 +203,7 @@
+@@ -221,7 +221,7 @@
  # $AUTO_PTR_BROKEN
  #
  AUTO_PTR_BROKEN="";
@@ -65,7 +74,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  cat <<EOF >$tmp_file.C;
  #include <memory>
  #include <string>
-@@ -234,7 +234,7 @@
+@@ -253,7 +253,7 @@
  # $MAKEDEPEND_INCLUDES
  #
  MAKEDEPEND_INCLUDES="";
@@ -74,7 +83,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/28 10:42:20 rh Exp $
  echo "#include <iostream.h>" >$tmp_file.C;
  MAKEDEPEND_INCLUDES=`$CXX -E $tmp_file.C 2>/dev/null |
  sed -n \
-@@ -267,7 +267,7 @@
+@@ -286,7 +286,7 @@
    MAKEDEPEND_INCLUDES; \
  do cmd="$cmd -e \"s|@$i@|\$$i|g\""; done;
  for dir in $makedirs; do