- Update to 5.2.1

- Update LICENSE
- Add LICENSE_FILE
- Fix PORTDOCS
- Use post-install-DOCS-on target
- Remove .include <bsd.port.options.mk> line
- Use do-test target instead regression-test
- Remove unneeded patches
- Update WWW in pkg-descr

Reviewed by:	amdmi3 (mentor)
Approved by:	sbz (maintainer)
Differential Revision:	D6549

5 files changed, 13 insertions, 35 deletions

diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index b958b8bc78d6..377b82b7fa96 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	feedparser
-PORTVERSION=	5.1.3
-PORTREVISION=	3
+PORTVERSION=	5.2.1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,22 +10,23 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Universal feed parser written in Python
 
-LICENSE=	MIT
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
 
-OPTIONS_DEFINE=	DOCS
+NO_ARCH=	yes
 
-PORTDOCS=	NEWS PKG-INFO README
+OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+PORTDOCS=	NEWS README.rst
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
-regression-test: extract
+do-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 ff6d2850fbe5..740e0aeea36a 100644
--- a/textproc/py-feedparser/distinfo
+++ b/textproc/py-feedparser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (feedparser-5.1.3.tar.bz2) = 7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3
-SIZE (feedparser-5.1.3.tar.bz2) = 202373
+TIMESTAMP = 1464128973
+SHA256 (feedparser-5.2.1.tar.bz2) = ce875495c90ebd74b179855449040003a1beb40cd13d5f037a0654251e260b02
+SIZE (feedparser-5.2.1.tar.bz2) = 192328
diff --git a/textproc/py-feedparser/files/patch-feedparser_feedparser.py b/textproc/py-feedparser/files/patch-feedparser_feedparser.py
deleted file mode 100644
index ce94600671a2..000000000000
--- a/textproc/py-feedparser/files/patch-feedparser_feedparser.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- feedparser/feedparser.py.orig	2014-03-10 01:45:12.000000000 +0900
-+++ feedparser/feedparser.py	2014-03-10 01:45:53.000000000 +0900
-@@ -3766,7 +3766,11 @@
-     chardet_encoding = None
-     tried_encodings = []
-     if chardet:
--        chardet_encoding = unicode(chardet.detect(data)['encoding'] or '', 'ascii', 'ignore')
-+        chardet_encoding = chardet.detect(data)['encoding']
-+        if not chardet_encoding:
-+            chardet_encoding = ''
-+        if not isinstance(chardet_encoding, str):
-+            chardet_encoding = str(chardet_encoding, 'ascii', 'ignore')
-     # try: HTTP encoding, declared XML encoding, encoding sniffed from BOM
-     for proposed_encoding in (rfc3023_encoding, xml_encoding, bom_encoding,
-                               chardet_encoding, u'utf-8', u'windows-1252', u'iso-8859-2'):
diff --git a/textproc/py-feedparser/files/patch-setup.py b/textproc/py-feedparser/files/patch-setup.py
deleted file mode 100644
index 53a4b95b3811..000000000000
--- a/textproc/py-feedparser/files/patch-setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./setup.py.orig	2012-07-03 15:02:11.000000000 +0200
-+++ ./setup.py	2012-07-03 15:03:10.000000000 +0200
-@@ -1,4 +1,4 @@
--from setuptools import setup
-+from distutils.core import setup
- import sys
- 
- extra = {}
diff --git a/textproc/py-feedparser/pkg-descr b/textproc/py-feedparser/pkg-descr
index edf6a8e8f832..9d87daeba16d 100644
--- a/textproc/py-feedparser/pkg-descr
+++ b/textproc/py-feedparser/pkg-descr
@@ -7,4 +7,4 @@ file, feedparser.py, and it has one primary public function, parse.  parse
 takes a number of arguments, but only one is required, and it can be a URL, a
 local filename, or a raw string containing feed data in any format.
 
-WWW: http://code.google.com/p/feedparser/
+WWW: http://github.com/kurtmckee/feedparser