3 files changed, 15 insertions, 147 deletions

diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index e5500d2808fa..69f3714301bb 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	feedparser
-PORTVERSION=	4.1
-PORTREVISION=	2
+PORTVERSION=	5.0.1
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://dryice.name/computer/FreeBSD/distfiles/
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbrabez@gmail.com
@@ -19,25 +17,22 @@ COMMENT=	An RSS feed parser written in Python
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/chardet/__init__.py:${PORTSDIR}/textproc/py-chardet
 
-WRKSRC=		${WRKDIR}
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_PYTHON=	yes
-USE_ZIP=	yes
+USE_BZIP2=	yes
 USE_PYDISTUTILS=	yes
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	NEWS PKG-INFO README README-PYTHON3 README-TESTS
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in *.html
-	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}
-.endfor
-.for j in images css examples
-	@${MKDIR} ${DOCSDIR}/${j}
-.for i in *
-	${INSTALL_DATA} ${WRKSRC}/docs/${j}/${i} ${DOCSDIR}/${j}
-.endfor
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+regression-test:
+	@(cd ${WRKSRC}/${PORTNAME} && ${PYTHON_CMD} ${PORTNAME}test.py)
+
+.include <bsd.port.mk>
diff --git a/textproc/py-feedparser/distinfo b/textproc/py-feedparser/distinfo
index c46ea7b547b0..ac0897e8d753 100644
--- a/textproc/py-feedparser/distinfo
+++ b/textproc/py-feedparser/distinfo
@@ -1,3 +1,2 @@
-MD5 (feedparser-4.1.zip) = 7ab1140c1e29d4cd52ab20fa7b1f8640
-SHA256 (feedparser-4.1.zip) = b1d8052b130f52e67501bdac269efad1f813ee8b4ff2b5c0f5d72f1286322167
-SIZE (feedparser-4.1.zip) = 258511
+SHA256 (feedparser-5.0.1.tar.bz2) = 57fe918773969eb20fb7b94ab1ae5d3b7eb4a8ce29f49ebc3766fa7f6a4974cb
+SIZE (feedparser-5.0.1.tar.bz2) = 204146
diff --git a/textproc/py-feedparser/pkg-plist b/textproc/py-feedparser/pkg-plist
index 0ed069440b05..075fe0546c4c 100644
--- a/textproc/py-feedparser/pkg-plist
+++ b/textproc/py-feedparser/pkg-plist
@@ -1,130 +1,4 @@
+@comment $FreeBSD$
 %%PYTHON_SITELIBDIR%%/feedparser.py
 %%PYTHON_SITELIBDIR%%/feedparser.pyc
 %%PYTHON_SITELIBDIR%%/feedparser.pyo
-%%PORTDOCS%%%%DOCSDIR%%/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated-atom03.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated-atom10.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated-examples.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated-rss10.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated-rss20-dc.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated-rss20.html
-%%PORTDOCS%%%%DOCSDIR%%/atom-detail.html
-%%PORTDOCS%%%%DOCSDIR%%/basic-existence.html
-%%PORTDOCS%%%%DOCSDIR%%/basic.html
-%%PORTDOCS%%%%DOCSDIR%%/bozo.html
-%%PORTDOCS%%%%DOCSDIR%%/changes-40.html
-%%PORTDOCS%%%%DOCSDIR%%/changes-41.html
-%%PORTDOCS%%%%DOCSDIR%%/character-encoding.html
-%%PORTDOCS%%%%DOCSDIR%%/common-atom-elements.html
-%%PORTDOCS%%%%DOCSDIR%%/common-rss-elements.html
-%%PORTDOCS%%%%DOCSDIR%%/content-normalization.html
-%%PORTDOCS%%%%DOCSDIR%%/css/feedparser.css
-%%PORTDOCS%%%%DOCSDIR%%/date-parsing.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/atom03.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/atom10.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/base.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/basic_auth.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/digest_auth.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/http_base.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/no_base.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/nonstandard_prefix.rdf
-%%PORTDOCS%%%%DOCSDIR%%/examples/prism.rdf
-%%PORTDOCS%%%%DOCSDIR%%/examples/rss10.rdf
-%%PORTDOCS%%%%DOCSDIR%%/examples/rss20.xml
-%%PORTDOCS%%%%DOCSDIR%%/examples/rss20dc.xml
-%%PORTDOCS%%%%DOCSDIR%%/history.html
-%%PORTDOCS%%%%DOCSDIR%%/html-sanitization.html
-%%PORTDOCS%%%%DOCSDIR%%/http-authentication.html
-%%PORTDOCS%%%%DOCSDIR%%/http-etag.html
-%%PORTDOCS%%%%DOCSDIR%%/http-other.html
-%%PORTDOCS%%%%DOCSDIR%%/http-redirect.html
-%%PORTDOCS%%%%DOCSDIR%%/http-useragent.html
-%%PORTDOCS%%%%DOCSDIR%%/http.html
-%%PORTDOCS%%%%DOCSDIR%%/images/caution.png
-%%PORTDOCS%%%%DOCSDIR%%/images/important.png
-%%PORTDOCS%%%%DOCSDIR%%/images/note.png
-%%PORTDOCS%%%%DOCSDIR%%/images/permalink.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/tip.png
-%%PORTDOCS%%%%DOCSDIR%%/images/warning.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/namespace-handling.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-bozo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-bozo_exception.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-encoding.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-author.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-author_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-comments.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-content.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-contributors.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-created.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-created_parsed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-enclosures.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-expired.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-expired_parsed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-id.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-license.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-link.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-links.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-published.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-published_parsed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-publisher.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-publisher_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-source.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-summary_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-tags.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-title.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-title_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-updated.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry-updated_parsed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-entry.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-etag.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-author.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-author_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-cloud.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-contributors.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-docs.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-errorreportsto.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-generator.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-generator_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-icon.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-id.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-image.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-info-detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-info.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-language.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-license.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-link.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-links.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-logo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-publisher.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-publisher_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-rights.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-rights_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-subtitle.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-subtitle_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-tags.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-textinput.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-title.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-title_detail.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-ttl.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-updated.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed-updated_parsed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-feed.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-headers.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-href.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-modified.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-status.html
-%%PORTDOCS%%%%DOCSDIR%%/reference-version.html
-%%PORTDOCS%%%%DOCSDIR%%/reference.html
-%%PORTDOCS%%%%DOCSDIR%%/resolving-relative-links.html
-%%PORTDOCS%%%%DOCSDIR%%/uncommon-atom.html
-%%PORTDOCS%%%%DOCSDIR%%/uncommon-rss.html
-%%PORTDOCS%%%%DOCSDIR%%/version-detection.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%