3 files changed, 50 insertions, 12 deletions

diff --git a/textproc/py-pyx12/Makefile b/textproc/py-pyx12/Makefile
index 9265af78e870..307044006ca0 100644
--- a/textproc/py-pyx12/Makefile
+++ b/textproc/py-pyx12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pyx12
-PORTVERSION=	1.0.1.b3
+PORTVERSION=	1.1.0
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,9 +14,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyx12-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	jholland@kazoocmh.org
-COMMENT=	Validate HIPAA X12 documents
+COMMENT=	Validate and convert HIPAA X12 documents
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/textproc/py-pyx12/distinfo b/textproc/py-pyx12/distinfo
index e8ef966b2a95..fea221670eb0 100644
--- a/textproc/py-pyx12/distinfo
+++ b/textproc/py-pyx12/distinfo
@@ -1,2 +1,2 @@
-MD5 (pyx12-1.0.1b3.tar.gz) = 89da03eb54bfab6f493defc280950ffe
-SIZE (pyx12-1.0.1b3.tar.gz) = 593109
+MD5 (pyx12-1.1.0.tar.gz) = ddac5b909b0eb6ee775aa145e9beff6a
+SIZE (pyx12-1.1.0.tar.gz) = 560390
diff --git a/textproc/py-pyx12/pkg-plist b/textproc/py-pyx12/pkg-plist
index 79e21a86a506..a49738ba59d2 100644
--- a/textproc/py-pyx12/pkg-plist
+++ b/textproc/py-pyx12/pkg-plist
@@ -1,8 +1,11 @@
-bin/x12_build_pkl.py
-bin/x12html.py
-bin/x12lint.py
-bin/x12norm.py
-bin/x12xml.py
+bin/x12_build_pkl
+bin/x12html
+bin/x12info
+bin/x12norm
+bin/x12sql
+bin/x12valid
+bin/x12xml
+bin/xmlx12
 %%PYTHON_SITELIBDIR%%/pyx12/__init__.py
 %%PYTHON_SITELIBDIR%%/pyx12/codes.py
 %%PYTHON_SITELIBDIR%%/pyx12/error_997.py
@@ -13,9 +16,10 @@ bin/x12xml.py
 %%PYTHON_SITELIBDIR%%/pyx12/errors.py
 %%PYTHON_SITELIBDIR%%/pyx12/map_if.py
 %%PYTHON_SITELIBDIR%%/pyx12/map_index.py
+%%PYTHON_SITELIBDIR%%/pyx12/map_override.py
 %%PYTHON_SITELIBDIR%%/pyx12/map_walker.py
 %%PYTHON_SITELIBDIR%%/pyx12/params.py
-%%PYTHON_SITELIBDIR%%/pyx12/utils.py
+%%PYTHON_SITELIBDIR%%/pyx12/segment.py
 %%PYTHON_SITELIBDIR%%/pyx12/x12file.py
 %%PYTHON_SITELIBDIR%%/pyx12/x12n_document.py
 %%PYTHON_SITELIBDIR%%/pyx12/x12xml.py
@@ -32,9 +36,10 @@ bin/x12xml.py
 %%PYTHON_SITELIBDIR%%/pyx12/errors.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/map_if.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/map_index.pyc
+%%PYTHON_SITELIBDIR%%/pyx12/map_override.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/map_walker.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/params.pyc
-%%PYTHON_SITELIBDIR%%/pyx12/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyx12/segment.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/x12file.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/x12n_document.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/x12xml.pyc
@@ -51,21 +56,52 @@ bin/x12xml.py
 %%PYTHON_SITELIBDIR%%/pyx12/errors.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/map_if.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/map_index.pyo
+%%PYTHON_SITELIBDIR%%/pyx12/map_override.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/map_walker.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/params.pyo
-%%PYTHON_SITELIBDIR%%/pyx12/utils.pyo
+%%PYTHON_SITELIBDIR%%/pyx12/segment.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/x12file.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/x12n_document.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/x12xml.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/x12xml_idtag.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/x12xml_simple.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/xmlwriter.pyo
+etc/pyx12.conf.xml.sample
+share/examples/pyx12/pyx12.conf.xml.sample
 share/examples/pyx12/test/test.py
 share/examples/pyx12/test/test_codes.py
+share/examples/pyx12/test/test_functional.py
 share/examples/pyx12/test/test_map_if.py
 share/examples/pyx12/test/test_map_walker.py
+share/examples/pyx12/test/test_params.py
+share/examples/pyx12/test/test_segment.py
+share/examples/pyx12/test/test_syntax.py
 share/examples/pyx12/test/test_utils.py
 share/examples/pyx12/test/test_x12file.py
+share/examples/pyx12/test/files/bad_2010AA_bug.997.base
+share/examples/pyx12/test/files/bad_2010AA_bug.txt
+share/examples/pyx12/test/files/bad_elements.997.base
+share/examples/pyx12/test/files/bad_elements.txt
+share/examples/pyx12/test/files/bad_header_looping.997.base
+share/examples/pyx12/test/files/bad_header_looping.txt
+share/examples/pyx12/test/files/ele.997.base
+share/examples/pyx12/test/files/ele.txt
+share/examples/pyx12/test/files/explicit_missing.997.base
+share/examples/pyx12/test/files/explicit_missing.txt
+share/examples/pyx12/test/files/fail_no_IEA.997.base
+share/examples/pyx12/test/files/fail_no_IEA.txt
+share/examples/pyx12/test/files/gs_id.txt
+share/examples/pyx12/test/files/loop_counting.997.base
+share/examples/pyx12/test/files/loop_counting.txt
+share/examples/pyx12/test/files/ordinal.997.base
+share/examples/pyx12/test/files/ordinal.txt
+share/examples/pyx12/test/files/per_repeat.997.base
+share/examples/pyx12/test/files/per_repeat.txt
+share/examples/pyx12/test/files/simple1.997.base
+share/examples/pyx12/test/files/simple1.txt
+share/examples/pyx12/test/files/trailer_errors.997.base
+share/examples/pyx12/test/files/trailer_errors.txt
+share/doc/pyx12/LICENSE.txt
 share/doc/pyx12/README.txt
 share/doc/pyx12/view/Makefile
 share/doc/pyx12/view/codes.xsl
@@ -138,6 +174,7 @@ share/pyx12/map/x12.control.00401.pkl
 @dirrm share/doc/pyx12
 @dirrm share/pyx12/map
 @dirrm share/pyx12
+@dirrm share/examples/pyx12/test/files
 @dirrm share/examples/pyx12/test
 @dirrm share/examples/pyx12
 @dirrm %%PYTHON_SITELIBDIR%%/pyx12