Sun Oct 19 18:39:56 2008 UTC ()
Update to 2.34. From the changelog:

2008-10-09: 2.34. elim extra \ns (tx Keith Bussell)
2008-09-19: 2.33. add support for abbr (tx Nathan Youngman)
2008-07-31: 2.32. fix parsing bug with fastcompany (tx Elias Soong)


(schmonz)
diff -r1.12 -r1.13 pkgsrc/textproc/py-html2text/Makefile
diff -r1.9 -r1.10 pkgsrc/textproc/py-html2text/distinfo
diff -r1.5 -r1.6 pkgsrc/textproc/py-html2text/patches/patch-aa
cvs diff -r1.12 -r1.13 pkgsrc/textproc/py-html2text/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-html2text/Makefile 2008/07/31 02:47:45 1.12
+++ pkgsrc/textproc/py-html2text/Makefile 2008/10/19 18:39:56 1.13
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.12 2008/07/31 02:47:45 schmonz Exp $ 1# $NetBSD: Makefile,v 1.13 2008/10/19 18:39:56 schmonz Exp $
2# 2#
3 3
4DISTNAME= html2text-2.31 4DISTNAME= html2text-2.34
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= textproc python 6CATEGORIES= textproc python
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= ${HOMEPAGE}
8EXTRACT_SUFX= .py 8EXTRACT_SUFX= .py
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://www.aaronsw.com/2002/html2text/ 11HOMEPAGE= http://www.aaronsw.com/2002/html2text/
12COMMENT= Convert HTML into easy-to-read plain ASCII text 12COMMENT= Convert HTML into easy-to-read plain ASCII text
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
17 17
cvs diff -r1.9 -r1.10 pkgsrc/textproc/py-html2text/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/py-html2text/distinfo 2008/07/31 02:47:45 1.9
+++ pkgsrc/textproc/py-html2text/distinfo 2008/10/19 18:39:56 1.10
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.9 2008/07/31 02:47:45 schmonz Exp $ 1$NetBSD: distinfo,v 1.10 2008/10/19 18:39:56 schmonz Exp $
2 2
3SHA1 (html2text-2.31.py) = 391c6b5ee832336d110b12a1e212371d07812c64 3SHA1 (html2text-2.34.py) = f749a35b0c7cece033aed64630710cef890d9c54
4RMD160 (html2text-2.31.py) = 535069bd9529b18fda8b6eeca3883a29ab51ca2f 4RMD160 (html2text-2.34.py) = ba3a9de973f64d161fc8873975a2894f42f856cd
5Size (html2text-2.31.py) = 13061 bytes 5Size (html2text-2.34.py) = 14085 bytes
6SHA1 (patch-aa) = b703efa18231222444a1730cb39f72e78c6836eb 6SHA1 (patch-aa) = 2395e54a2c2f72231f6766375b8406928dfa7f3b
cvs diff -r1.5 -r1.6 pkgsrc/textproc/py-html2text/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/py-html2text/patches/Attic/patch-aa 2008/07/31 02:47:45 1.5
+++ pkgsrc/textproc/py-html2text/patches/Attic/patch-aa 2008/10/19 18:39:56 1.6
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-aa,v 1.5 2008/07/31 02:47:45 schmonz Exp $ 1$NetBSD: patch-aa,v 1.6 2008/10/19 18:39:56 schmonz Exp $
2 2
3--- html2text.py.orig 2008-07-30 22:37:59.000000000 -0400 3--- html2text.py.orig 2008-10-19 14:36:07.000000000 -0400
4+++ html2text.py 4+++ html2text.py
5@@ -266,6 +266,7 @@ class _html2text(sgmllib.SGMLParser): 5@@ -282,6 +282,7 @@ class _html2text(sgmllib.SGMLParser):
6 if attrs.has_key('src'): 6 if attrs.has_key('src'):
7 attrs['href'] = attrs['src'] 7 attrs['href'] = attrs['src']
8 alt = attrs.get('alt', '') 8 alt = attrs.get('alt', '')
9+ alt = re.sub('\n', ' ', alt) 9+ alt = re.sub('\n', ' ', alt)
10 i = self.previousIndex(attrs) 10 i = self.previousIndex(attrs)
11 if i is not None: 11 if i is not None:
12 attrs = self.a[i] 12 attrs = self.a[i]
13@@ -286,7 +287,7 @@ class _html2text(sgmllib.SGMLParser): 13@@ -302,7 +303,7 @@ class _html2text(sgmllib.SGMLParser):
14 if tag in ["ol", "ul"]: 14 if tag in ["ol", "ul"]:
15 if start: 15 if start:
16 self.list.append({'name':tag, 'num':0}) 16 self.list.append({'name':tag, 'num':0})
17- else: 17- else:
18+ elif self.list: 18+ elif self.list:
19 if self.list: self.list.pop() 19 if self.list: self.list.pop()
20  20
21 self.p() 21 self.p()