- Update hachoir to latest versions:

- core to 0.9.0
- parser to 0.10.0
- metadata to 0.10.0
- urwid to 0.9.0

3 files changed, 38 insertions, 15 deletions

diff --git a/devel/hachoir-parser/Makefile b/devel/hachoir-parser/Makefile
index 681bb7d9d8df..2bc28d994404 100644
--- a/devel/hachoir-parser/Makefile
+++ b/devel/hachoir-parser/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	hachoir-parser
-PORTVERSION=	0.9.0
+PORTVERSION=	0.10.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://cheeseshop.python.org/packages/source/h/${PORTNAME}/ CSME
+MASTER_SITES=	CHEESESHOP CENKES
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Parsers of most common file formats
diff --git a/devel/hachoir-parser/distinfo b/devel/hachoir-parser/distinfo
index fc32a2f64116..88f2faf322dd 100644
--- a/devel/hachoir-parser/distinfo
+++ b/devel/hachoir-parser/distinfo
@@ -1,3 +1,3 @@
-MD5 (hachoir-parser-0.9.0.tar.gz) = b758aa830c9d3c9720ef58e6756cfca3
-SHA256 (hachoir-parser-0.9.0.tar.gz) = f6d421433763c2f049c7eb79d85d882b8f04d19ad171c53fde038449860c6a95
-SIZE (hachoir-parser-0.9.0.tar.gz) = 190964
+MD5 (hachoir-parser-0.10.0.tar.gz) = ea49704e7ece1a9a2845309cd00768b1
+SHA256 (hachoir-parser-0.10.0.tar.gz) = f548ab6f5a49b31570091cd4bd94182ff4fea9c771452671f58f7ae549488d13
+SIZE (hachoir-parser-0.10.0.tar.gz) = 320668
diff --git a/devel/hachoir-parser/pkg-plist b/devel/hachoir-parser/pkg-plist
index 91f1d5c7b2db..ccfdbc02e1d6 100644
--- a/devel/hachoir-parser/pkg-plist
+++ b/devel/hachoir-parser/pkg-plist
@@ -19,6 +19,9 @@
 %%PYTHON_SITELIBDIR%%/hachoir_parser/archive/gzip_parser.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/archive/gzip_parser.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/archive/gzip_parser.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/archive/mar.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/archive/mar.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/archive/mar.pyo
 %%PYTHON_SITELIBDIR%%/hachoir_parser/archive/rar.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/archive/rar.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/archive/rar.pyo
@@ -85,6 +88,9 @@
 %%PYTHON_SITELIBDIR%%/hachoir_parser/common/win32.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/common/win32.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/common/win32.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/common/win32_lang_id.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/common/win32_lang_id.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/common/win32_lang_id.pyo
 %%PYTHON_SITELIBDIR%%/hachoir_parser/container/__init__.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/container/__init__.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/container/__init__.pyo
@@ -196,6 +202,9 @@
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/__init__.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/__init__.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/chm.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/chm.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/chm.pyo
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/common.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/common.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/common.pyo
@@ -205,6 +214,24 @@
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/file_3ds.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/file_3ds.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/file_3ds.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/lnk.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/lnk.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/lnk.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/msoffice.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/msoffice.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/msoffice.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/msoffice_summary.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/msoffice_summary.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/msoffice_summary.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/ole2.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/ole2.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/ole2.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/pcf.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/pcf.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/pcf.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/pdf.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/pdf.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/misc/pdf.pyo
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/torrent.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/torrent.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/misc/torrent.pyo
@@ -214,18 +241,15 @@
 %%PYTHON_SITELIBDIR%%/hachoir_parser/network/__init__.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/network/__init__.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/network/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/network/common.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/network/common.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/network/common.pyo
+%%PYTHON_SITELIBDIR%%/hachoir_parser/network/ouid.py
+%%PYTHON_SITELIBDIR%%/hachoir_parser/network/ouid.pyc
+%%PYTHON_SITELIBDIR%%/hachoir_parser/network/ouid.pyo
 %%PYTHON_SITELIBDIR%%/hachoir_parser/network/tcpdump.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/network/tcpdump.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/network/tcpdump.pyo
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/__init__.py
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/__init__.pyc
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/__init__.pyo
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/msoffice.py
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/msoffice.pyc
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/msoffice.pyo
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/pdf.py
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/pdf.pyc
-%%PYTHON_SITELIBDIR%%/hachoir_parser/office/pdf.pyo
 %%PYTHON_SITELIBDIR%%/hachoir_parser/parser.py
 %%PYTHON_SITELIBDIR%%/hachoir_parser/parser.pyc
 %%PYTHON_SITELIBDIR%%/hachoir_parser/parser.pyo
@@ -295,7 +319,6 @@
 @dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser/image
 @dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser/misc
 @dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser/network
-@dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser/office
 @dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser/program
 @dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser/video
 @dirrm %%PYTHON_SITELIBDIR%%/hachoir_parser