summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2014-04-20 01:45:18 +0000
committerschmonz <schmonz@pkgsrc.org>2014-04-20 01:45:18 +0000
commitdf93aca620011451d0da68557f77807ac099027a (patch)
tree7512bc71e24ffb806c3bb698f0cdc5c053e28b40 /mail
parentca0dfcd780f4e9de6fc7278360569e91603668ef (diff)
downloadpkgsrc-df93aca620011451d0da68557f77807ac099027a.tar.gz
Depend on latest py-html2text to make patching unnecessary. Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r--mail/rss2email/Makefile10
-rw-r--r--mail/rss2email/distinfo3
-rw-r--r--mail/rss2email/patches/patch-rss2email_main.py15
3 files changed, 4 insertions, 24 deletions
diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 1cdc1063308..b75884c2301 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2014/04/20 01:45:18 schmonz Exp $
DISTNAME= v3.8
PKGNAME= rss2email-3.8
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}archive/
DIST_SUBDIR= rss2email
@@ -13,7 +14,7 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.0.1:../../textproc/py-feedparser
-DEPENDS+= ${PYPKGPREFIX}-html2text>=3.0.1:../../textproc/py-html2text
+DEPENDS+= ${PYPKGPREFIX}-html2text>=2014.4.5:../../textproc/py-html2text
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -23,11 +24,6 @@ PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
REPLACE_PYTHON= test/test.py
-SUBST_CLASSES+= bin
-SUBST_STAGE.bin= do-configure
-SUBST_FILES.bin= rss2email/main.py
-SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g'
-
INSTALLATION_DIRS= ${PKGMANDIR}/man1
do-test:
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index 1dd0ea55cae..296670097ef 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.24 2014/01/19 19:54:47 schmonz Exp $
+$NetBSD: distinfo,v 1.25 2014/04/20 01:45:18 schmonz Exp $
SHA1 (rss2email/v3.8.tar.gz) = d06a7736f9e612663921222c892a2dbc89416bf5
RMD160 (rss2email/v3.8.tar.gz) = 7efc4e420ef38df02e71111ef3a80ce7e501eb8f
Size (rss2email/v3.8.tar.gz) = 159606 bytes
-SHA1 (patch-rss2email_main.py) = 3d30cec4068f11031624356dd36cf9b739d0755f
diff --git a/mail/rss2email/patches/patch-rss2email_main.py b/mail/rss2email/patches/patch-rss2email_main.py
deleted file mode 100644
index c7362151460..00000000000
--- a/mail/rss2email/patches/patch-rss2email_main.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-rss2email_main.py,v 1.1 2013/07/02 01:13:30 schmonz Exp $
-
-Find the pkgsrc-provided py-html2text.
-
---- rss2email/main.py.orig 2013-06-05 22:13:14.000000000 +0000
-+++ rss2email/main.py
-@@ -21,6 +21,8 @@ import argparse as _argparse
- import logging as _logging
- import sys as _sys
-
-+_sys.path.append("@LOCALBASE@/share/html2text")
-+
- from . import __doc__ as _PACKAGE_DOCSTRING
- from . import __version__
- from . import LOG as _LOG