Depend on py-html2text rather than downloading our own copy. Bump

PKGREVISION.

4 files changed, 21 insertions, 12 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 0ac1226418f..4983f7122b3 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,24 +1,22 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 20:25:54 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/03 00:49:36 schmonz Exp $
 #
 
 DISTNAME=		rss2email-${RVER}
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.py
 DISTFILES=		r2e-${SVER}.sh ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		html2text-${HVER}.py
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.aaronsw.com/2002/rss2email/
 COMMENT=		Get RSS feeds emailed to you
 
 DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
+DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
 SVER=			2.0
 RVER=			2.55
-HVER=			2.23
-
-SITES_html2text-${HVER}.py=	http://www.aaronsw.com/2002/html2text/
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
@@ -27,8 +25,9 @@ PYTHON_PATCH_SCRIPTS=	*.py
 
 SUBST_CLASSES+=		bin
 SUBST_STAGE.bin=	do-configure
-SUBST_FILES.bin=	r2e
-SUBST_SED.bin=		-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_FILES.bin=	rss2email.py r2e
+SUBST_SED.bin=		-e 's|@LOCALBASE@|${LOCALBASE}|g'
+SUBST_SED.bin+=		-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.bin+=		-e 's|@PYTHONBIN@|${PYTHONBIN}|g'
 
 SHAREDIR=		${PREFIX}/share/rss2email
@@ -40,14 +39,12 @@ do-extract:
 	${CP} -R ${DISTDIR}/${DIST_SUBDIR} ${WRKSRC};			\
 	cd ${WRKSRC};							\
 	${MV} rss2email-${RVER}.py rss2email.py;			\
-	${MV} html2text-${HVER}.py html2text.py;			\
 	${MV} r2e-${SVER}.sh r2e
 
 do-install:
 	cd ${WRKSRC} &&							\
 	${INSTALL_SCRIPT_DIR} ${SHAREDIR};				\
 	${INSTALL_SCRIPT} rss2email.py ${SHAREDIR};			\
-	${INSTALL_SCRIPT} html2text.py ${SHAREDIR};			\
 	${INSTALL_DATA_DIR} ${EGDIR};					\
 	${INSTALL_DATA} config.py ${EGDIR};				\
 	${INSTALL_MAN} r2e.1 ${PREFIX}/man/man1;			\
diff --git a/mail/rss2email/PLIST b/mail/rss2email/PLIST
index db0f59138c0..2edf7f4e094 100644
--- a/mail/rss2email/PLIST
+++ b/mail/rss2email/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/27 23:00:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/03 00:49:36 schmonz Exp $
 bin/r2e
 man/man1/r2e.1
 share/examples/rss2email/config.py
-share/rss2email/html2text.py
 share/rss2email/rss2email.py
 @dirrm share/rss2email
 @dirrm share/examples/rss2email
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index de8f57c29a4..c16e3bffd93 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/08/06 20:25:54 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2005/12/03 00:49:36 schmonz Exp $
 
 SHA1 (rss2email-2.55/rss2email-2.55.py) = 4d090e6bdaa226654684773e51701d9ec942f23c
 RMD160 (rss2email-2.55/rss2email-2.55.py) = 96530f2c7ed8df9a0ce56d97d94b7b09a34a88d0
@@ -12,3 +12,4 @@ Size (rss2email-2.55/html2text-2.23.py) = 9795 bytes
 SHA1 (patch-aa) = bc095413de3a22da143535acdc501d08e08203b6
 SHA1 (patch-ab) = ffd6f8131e156abb2faf91b47c2250953fce21ff
 SHA1 (patch-ac) = c79d83efbab5359689bd9ca2ca83dfc35f0e5398
+SHA1 (patch-ad) = 4f1012158a2c1e460a2901ab2c30d18b456892f2
diff --git a/mail/rss2email/patches/patch-ad b/mail/rss2email/patches/patch-ad
new file mode 100644
index 00000000000..a6dab03bb63
--- /dev/null
+++ b/mail/rss2email/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2005/12/03 00:49:36 schmonz Exp $
+
+--- rss2email.py.orig	2005-12-01 00:46:49.000000000 -0500
++++ rss2email.py
+@@ -113,6 +113,7 @@ else: smtpserver = None
+ import feedparser
+ feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.aaronsw.com/2002/rss2email/"
+ 
++sys.path.append("@LOCALBASE@/share/html2text")
+ import html2text as h2t
+ 
+ h2t.UNICODE_SNOB = UNICODE_SNOB