- update to 2.2.1

- support staging
- update WWW

PR:		164855
Submitted by:	olivierd (based on)

4 files changed, 11 insertions, 131 deletions

diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index b89e3f64ccaf..1a39682a9c23 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -2,36 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	chardet
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	textproc python
-#MASTER_SITES=	http://chardet.feedparser.org/download/
-MASTER_SITES=	http://darkstar.ist.utl.pt/slackware/addon/slacky/%SUBDIR%/ \
-		http://repository.slacky.eu/%SUBDIR%/ \
-		http://slack.isper.sk/pub/%SUBDIR%/ \
-		http://www.slackware.org.uk/slacky/%SUBDIR%/
-MASTER_SITE_SUBDIR=	slackware64-13.37/libraries/python2-${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python2-${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Character encoding auto-detection in Python
 
 LICENSE=	LGPL21
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	*
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/py-chardet/distinfo b/textproc/py-chardet/distinfo
index 10feecb67d31..64a8120257f0 100644
--- a/textproc/py-chardet/distinfo
+++ b/textproc/py-chardet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python2-chardet-2.0.1.tgz) = 56fa0c37189b0a5f082d064dec59d69a044aaa3eeb7acb9b3081e2ba306deaa4
-SIZE (python2-chardet-2.0.1.tgz) = 177793
+SHA256 (chardet-2.2.1.tar.gz) = f1964f73f5ee9b7e0309098b9512d587fbba6dd5d1f3797b1c95529e5241bf09
+SIZE (chardet-2.2.1.tar.gz) = 180319
diff --git a/textproc/py-chardet/pkg-descr b/textproc/py-chardet/pkg-descr
index 50e936617ef9..9a2771673397 100644
--- a/textproc/py-chardet/pkg-descr
+++ b/textproc/py-chardet/pkg-descr
@@ -1,3 +1,3 @@
 Character encoding auto-detection in Python.
 
-WWW: https://github.com/byroot/chardet
+WWW: https://github.com/chardet/chardet/
diff --git a/textproc/py-chardet/pkg-plist b/textproc/py-chardet/pkg-plist
deleted file mode 100644
index 00cf4292d308..000000000000
--- a/textproc/py-chardet/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-%%PYTHON_SITELIBDIR%%/chardet/__init__.py
-%%PYTHON_SITELIBDIR%%/chardet/__init__.pyc
-%%PYTHON_SITELIBDIR%%/chardet/__init__.pyo
-%%PYTHON_SITELIBDIR%%/chardet/big5freq.py
-%%PYTHON_SITELIBDIR%%/chardet/big5freq.pyc
-%%PYTHON_SITELIBDIR%%/chardet/big5freq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/big5prober.py
-%%PYTHON_SITELIBDIR%%/chardet/big5prober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/big5prober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/chardistribution.py
-%%PYTHON_SITELIBDIR%%/chardet/chardistribution.pyc
-%%PYTHON_SITELIBDIR%%/chardet/chardistribution.pyo
-%%PYTHON_SITELIBDIR%%/chardet/charsetgroupprober.py
-%%PYTHON_SITELIBDIR%%/chardet/charsetgroupprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/charsetgroupprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/charsetprober.py
-%%PYTHON_SITELIBDIR%%/chardet/charsetprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/charsetprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/codingstatemachine.py
-%%PYTHON_SITELIBDIR%%/chardet/codingstatemachine.pyc
-%%PYTHON_SITELIBDIR%%/chardet/codingstatemachine.pyo
-%%PYTHON_SITELIBDIR%%/chardet/constants.py
-%%PYTHON_SITELIBDIR%%/chardet/constants.pyc
-%%PYTHON_SITELIBDIR%%/chardet/constants.pyo
-%%PYTHON_SITELIBDIR%%/chardet/escprober.py
-%%PYTHON_SITELIBDIR%%/chardet/escprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/escprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/escsm.py
-%%PYTHON_SITELIBDIR%%/chardet/escsm.pyc
-%%PYTHON_SITELIBDIR%%/chardet/escsm.pyo
-%%PYTHON_SITELIBDIR%%/chardet/eucjpprober.py
-%%PYTHON_SITELIBDIR%%/chardet/eucjpprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/eucjpprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euckrfreq.py
-%%PYTHON_SITELIBDIR%%/chardet/euckrfreq.pyc
-%%PYTHON_SITELIBDIR%%/chardet/euckrfreq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euckrprober.py
-%%PYTHON_SITELIBDIR%%/chardet/euckrprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/euckrprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euctwfreq.py
-%%PYTHON_SITELIBDIR%%/chardet/euctwfreq.pyc
-%%PYTHON_SITELIBDIR%%/chardet/euctwfreq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euctwprober.py
-%%PYTHON_SITELIBDIR%%/chardet/euctwprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/euctwprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/gb2312freq.py
-%%PYTHON_SITELIBDIR%%/chardet/gb2312freq.pyc
-%%PYTHON_SITELIBDIR%%/chardet/gb2312freq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/gb2312prober.py
-%%PYTHON_SITELIBDIR%%/chardet/gb2312prober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/gb2312prober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/hebrewprober.py
-%%PYTHON_SITELIBDIR%%/chardet/hebrewprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/hebrewprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/jisfreq.py
-%%PYTHON_SITELIBDIR%%/chardet/jisfreq.pyc
-%%PYTHON_SITELIBDIR%%/chardet/jisfreq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/jpcntx.py
-%%PYTHON_SITELIBDIR%%/chardet/jpcntx.pyc
-%%PYTHON_SITELIBDIR%%/chardet/jpcntx.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langbulgarianmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langbulgarianmodel.pyc
-%%PYTHON_SITELIBDIR%%/chardet/langbulgarianmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langcyrillicmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langcyrillicmodel.pyc
-%%PYTHON_SITELIBDIR%%/chardet/langcyrillicmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langgreekmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langgreekmodel.pyc
-%%PYTHON_SITELIBDIR%%/chardet/langgreekmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langhebrewmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langhebrewmodel.pyc
-%%PYTHON_SITELIBDIR%%/chardet/langhebrewmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langhungarianmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langhungarianmodel.pyc
-%%PYTHON_SITELIBDIR%%/chardet/langhungarianmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langthaimodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langthaimodel.pyc
-%%PYTHON_SITELIBDIR%%/chardet/langthaimodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/latin1prober.py
-%%PYTHON_SITELIBDIR%%/chardet/latin1prober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/latin1prober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/mbcharsetprober.py
-%%PYTHON_SITELIBDIR%%/chardet/mbcharsetprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/mbcharsetprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/mbcsgroupprober.py
-%%PYTHON_SITELIBDIR%%/chardet/mbcsgroupprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/mbcsgroupprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/mbcssm.py
-%%PYTHON_SITELIBDIR%%/chardet/mbcssm.pyc
-%%PYTHON_SITELIBDIR%%/chardet/mbcssm.pyo
-%%PYTHON_SITELIBDIR%%/chardet/sbcharsetprober.py
-%%PYTHON_SITELIBDIR%%/chardet/sbcharsetprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/sbcharsetprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/sbcsgroupprober.py
-%%PYTHON_SITELIBDIR%%/chardet/sbcsgroupprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/sbcsgroupprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/sjisprober.py
-%%PYTHON_SITELIBDIR%%/chardet/sjisprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/sjisprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/test.py
-%%PYTHON_SITELIBDIR%%/chardet/test.pyc
-%%PYTHON_SITELIBDIR%%/chardet/test.pyo
-%%PYTHON_SITELIBDIR%%/chardet/universaldetector.py
-%%PYTHON_SITELIBDIR%%/chardet/universaldetector.pyc
-%%PYTHON_SITELIBDIR%%/chardet/universaldetector.pyo
-%%PYTHON_SITELIBDIR%%/chardet/utf8prober.py
-%%PYTHON_SITELIBDIR%%/chardet/utf8prober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/utf8prober.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/chardet