2 files changed, 83 insertions, 71 deletions

diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 91e63551f838..1f6b660b65fa 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	chardet
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	http://chardet.feedparser.org/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,4 +18,16 @@ COMMENT=	Character encoding auto-detection in Python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	docs COPYING
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${CP} -R ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/py-chardet/pkg-plist b/textproc/py-chardet/pkg-plist
index 12934c6f7118..c952f6a01ce5 100644
--- a/textproc/py-chardet/pkg-plist
+++ b/textproc/py-chardet/pkg-plist
@@ -1,106 +1,106 @@
+%%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/eucjpprober.py
-%%PYTHON_SITELIBDIR%%/chardet/euckrfreq.py
-%%PYTHON_SITELIBDIR%%/chardet/euckrprober.py
-%%PYTHON_SITELIBDIR%%/chardet/euctwfreq.py
-%%PYTHON_SITELIBDIR%%/chardet/euctwprober.py
-%%PYTHON_SITELIBDIR%%/chardet/gb2312freq.py
-%%PYTHON_SITELIBDIR%%/chardet/gb2312prober.py
-%%PYTHON_SITELIBDIR%%/chardet/hebrewprober.py
-%%PYTHON_SITELIBDIR%%/chardet/jisfreq.py
-%%PYTHON_SITELIBDIR%%/chardet/jpcntx.py
-%%PYTHON_SITELIBDIR%%/chardet/latin1prober.py
-%%PYTHON_SITELIBDIR%%/chardet/langbulgarianmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langcyrillicmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langgreekmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langhebrewmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langhungarianmodel.py
-%%PYTHON_SITELIBDIR%%/chardet/langthaimodel.py
-%%PYTHON_SITELIBDIR%%/chardet/mbcharsetprober.py
-%%PYTHON_SITELIBDIR%%/chardet/mbcsgroupprober.py
-%%PYTHON_SITELIBDIR%%/chardet/mbcssm.py
-%%PYTHON_SITELIBDIR%%/chardet/sbcharsetprober.py
-%%PYTHON_SITELIBDIR%%/chardet/sbcsgroupprober.py
-%%PYTHON_SITELIBDIR%%/chardet/sjisprober.py
-%%PYTHON_SITELIBDIR%%/chardet/universaldetector.py
-%%PYTHON_SITELIBDIR%%/chardet/utf8prober.py
-%%PYTHON_SITELIBDIR%%/chardet/__init__.py
-%%PYTHON_SITELIBDIR%%/chardet/big5freq.pyc
-%%PYTHON_SITELIBDIR%%/chardet/big5prober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/chardistribution.pyc
 %%PYTHON_SITELIBDIR%%/chardet/escsm.pyc
-%%PYTHON_SITELIBDIR%%/chardet/charsetgroupprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/charsetprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/codingstatemachine.pyc
-%%PYTHON_SITELIBDIR%%/chardet/constants.pyc
-%%PYTHON_SITELIBDIR%%/chardet/escprober.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/latin1prober.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/sbcharsetprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/sbcsgroupprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/sjisprober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/universaldetector.pyc
-%%PYTHON_SITELIBDIR%%/chardet/utf8prober.pyc
-%%PYTHON_SITELIBDIR%%/chardet/__init__.pyc
-%%PYTHON_SITELIBDIR%%/chardet/big5freq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/big5prober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/chardistribution.pyo
-%%PYTHON_SITELIBDIR%%/chardet/charsetgroupprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/charsetprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/codingstatemachine.pyo
-%%PYTHON_SITELIBDIR%%/chardet/constants.pyo
-%%PYTHON_SITELIBDIR%%/chardet/escprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/escsm.pyo
-%%PYTHON_SITELIBDIR%%/chardet/eucjpprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euckrfreq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euckrprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euctwfreq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/euctwprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/gb2312freq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/gb2312prober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/hebrewprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/jisfreq.pyo
-%%PYTHON_SITELIBDIR%%/chardet/jpcntx.pyo
-%%PYTHON_SITELIBDIR%%/chardet/latin1prober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langbulgarianmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langcyrillicmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langgreekmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langhebrewmodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langhungarianmodel.pyo
 %%PYTHON_SITELIBDIR%%/chardet/mbcssm.pyo
-%%PYTHON_SITELIBDIR%%/chardet/langthaimodel.pyo
-%%PYTHON_SITELIBDIR%%/chardet/mbcharsetprober.pyo
-%%PYTHON_SITELIBDIR%%/chardet/mbcsgroupprober.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/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
-%%PYTHON_SITELIBDIR%%/chardet/__init__.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/chardet