3 files changed, 20 insertions, 29 deletions

diff --git a/textproc/py-pyx12/Makefile b/textproc/py-pyx12/Makefile
index c48e96701e39..af1203b2fc2f 100644
--- a/textproc/py-pyx12/Makefile
+++ b/textproc/py-pyx12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pyx12
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.0
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,15 +16,17 @@ DISTNAME=	pyx12-${PORTVERSION:S/.b/b/}
 MAINTAINER=	jholland@kazoocmh.org
 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
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
 
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 
-MAN1=	x12valid.1 x12norm.1 x12xml.1
+MAN1=	x12valid.1 x12norm.1 x12xml.1 x12html.1 xmlx12.1
 MAN5=	pyx12.conf.xml.5
 SUB_FILES=	pkg-deinstall
 
diff --git a/textproc/py-pyx12/distinfo b/textproc/py-pyx12/distinfo
index ecc090b9aaf0..0887007c3921 100644
--- a/textproc/py-pyx12/distinfo
+++ b/textproc/py-pyx12/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyx12-1.3.0.tar.bz2) = 12e3910d5a3af8df4a661b57c2dcfedf
-SHA256 (pyx12-1.3.0.tar.bz2) = a306d521e8ad83e3ec111ecc171375f5d315ebe203c9e35214bc0dfe41c42915
-SIZE (pyx12-1.3.0.tar.bz2) = 247223
+MD5 (pyx12-1.4.0.tar.bz2) = adca4d8eeac1cd0c73cf7dd66e7c2f22
+SHA256 (pyx12-1.4.0.tar.bz2) = 5e956c10586aa451a575f119fdbc8afbc8976cdc31d5e9a73c77c7ef8df321da
+SIZE (pyx12-1.4.0.tar.bz2) = 186297
diff --git a/textproc/py-pyx12/pkg-plist b/textproc/py-pyx12/pkg-plist
index 22249d6caeeb..2ff9302233ad 100644
--- a/textproc/py-pyx12/pkg-plist
+++ b/textproc/py-pyx12/pkg-plist
@@ -42,6 +42,7 @@ bin/xmlx12
 %%PYTHON_SITELIBDIR%%/pyx12/tests/params.py
 %%PYTHON_SITELIBDIR%%/pyx12/tests/path.py
 %%PYTHON_SITELIBDIR%%/pyx12/tests/segment.py
+%%PYTHON_SITELIBDIR%%/pyx12/tests/support.py
 %%PYTHON_SITELIBDIR%%/pyx12/tests/syntax.py
 %%PYTHON_SITELIBDIR%%/pyx12/tests/utils.py
 %%PYTHON_SITELIBDIR%%/pyx12/tests/x12file.py
@@ -83,6 +84,7 @@ bin/xmlx12
 %%PYTHON_SITELIBDIR%%/pyx12/tests/params.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/tests/path.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/tests/segment.pyc
+%%PYTHON_SITELIBDIR%%/pyx12/tests/support.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/tests/syntax.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/tests/utils.pyc
 %%PYTHON_SITELIBDIR%%/pyx12/tests/x12file.pyc
@@ -124,6 +126,7 @@ bin/xmlx12
 %%PYTHON_SITELIBDIR%%/pyx12/tests/params.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/tests/path.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/tests/segment.pyo
+%%PYTHON_SITELIBDIR%%/pyx12/tests/support.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/tests/syntax.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/tests/utils.pyo
 %%PYTHON_SITELIBDIR%%/pyx12/tests/x12file.pyo
@@ -131,6 +134,8 @@ bin/xmlx12
 %%PYTHON_SITELIBDIR%%/pyx12/tests/xmlwriter.pyo
 etc/pyx12.conf.xml.sample
 %%DATADIR%%/pyx12.conf.xml.sample
+%%DATADIR%%/test/pyx12.conf.xml
+%%DATADIR%%/test/pyx12test.conf.xml
 %%DATADIR%%/test/test.py
 %%DATADIR%%/test/test_codes.py
 %%DATADIR%%/test/test_dataele.py
@@ -148,6 +153,8 @@ etc/pyx12.conf.xml.sample
 %%DATADIR%%/test/test_xmlwriter.py
 %%DATADIR%%/test/files/834_lui_id.997.base
 %%DATADIR%%/test/files/834_lui_id.txt
+%%DATADIR%%/test/files/835_test.xsl
+%%DATADIR%%/test/files/837_2000C_N.xsl
 %%DATADIR%%/test/files/bad_2010AA_bug.997.base
 %%DATADIR%%/test/files/bad_2010AA_bug.txt
 %%DATADIR%%/test/files/bad_elements.997.base
@@ -165,6 +172,9 @@ etc/pyx12.conf.xml.sample
 %%DATADIR%%/test/files/gs_id.txt
 %%DATADIR%%/test/files/loop_counting.997.base
 %%DATADIR%%/test/files/loop_counting.txt
+%%DATADIR%%/test/files/loop_counting2.997.base
+%%DATADIR%%/test/files/loop_counting2.txt
+%%DATADIR%%/test/files/loop_counting2.xsl
 %%DATADIR%%/test/files/mult_isa.997.base
 %%DATADIR%%/test/files/mult_isa.txt
 %%DATADIR%%/test/files/mult_trn.997.base
@@ -187,30 +197,19 @@ etc/pyx12.conf.xml.sample
 %%DOCSDIR%%/LICENSE.txt
 %%DOCSDIR%%/README.txt
 %%DATADIR%%/map/270.4010.X092.A1.xml
-%%DATADIR%%/map/270.4010.X092.xml
 %%DATADIR%%/map/271.4010.X092.A1.xml
-%%DATADIR%%/map/271.4010.X092.xml
 %%DATADIR%%/map/276.4010.X093.A1.xml
-%%DATADIR%%/map/276.4010.X093.xml
 %%DATADIR%%/map/277.4010.X093.A1.xml
-%%DATADIR%%/map/277.4010.X093.xml
 %%DATADIR%%/map/277.4020.X104.xml
 %%DATADIR%%/map/277U.4010.X070.xml
 %%DATADIR%%/map/278.4010.X094.27.A1.xml
-%%DATADIR%%/map/278.4010.X094.27.xml
 %%DATADIR%%/map/278.4010.X094.A1.xml
-%%DATADIR%%/map/278.4010.X094.xml
 %%DATADIR%%/map/820.4010.X061.A1.xml
-%%DATADIR%%/map/820.4010.X061.xml
 %%DATADIR%%/map/834.4010.X095.A1.xml
 %%DATADIR%%/map/835.4010.X091.A1.xml
-%%DATADIR%%/map/835.4010.X091.xml
 %%DATADIR%%/map/837.4010.X096.A1.xml
-%%DATADIR%%/map/837.4010.X096.xml
 %%DATADIR%%/map/837.4010.X097.A1.xml
-%%DATADIR%%/map/837.4010.X097.xml
 %%DATADIR%%/map/837.4010.X098.A1.xml
-%%DATADIR%%/map/837.4010.X098.xml
 %%DATADIR%%/map/841.4010.XXXC.xml
 %%DATADIR%%/map/997.4010.xml
 %%DATADIR%%/map/codes.xml
@@ -219,30 +218,19 @@ etc/pyx12.conf.xml.sample
 %%DATADIR%%/map/maps.xml
 %%DATADIR%%/map/x12.control.00401.xml
 %%DATADIR%%/map/270.4010.X092.A1.pkl
-%%DATADIR%%/map/270.4010.X092.pkl
 %%DATADIR%%/map/271.4010.X092.A1.pkl
-%%DATADIR%%/map/271.4010.X092.pkl
 %%DATADIR%%/map/276.4010.X093.A1.pkl
-%%DATADIR%%/map/276.4010.X093.pkl
 %%DATADIR%%/map/277.4010.X093.A1.pkl
-%%DATADIR%%/map/277.4010.X093.pkl
 %%DATADIR%%/map/277.4020.X104.pkl
 %%DATADIR%%/map/277U.4010.X070.pkl
 %%DATADIR%%/map/278.4010.X094.27.A1.pkl
-%%DATADIR%%/map/278.4010.X094.27.pkl
 %%DATADIR%%/map/278.4010.X094.A1.pkl
-%%DATADIR%%/map/278.4010.X094.pkl
 %%DATADIR%%/map/820.4010.X061.A1.pkl
-%%DATADIR%%/map/820.4010.X061.pkl
 %%DATADIR%%/map/834.4010.X095.A1.pkl
 %%DATADIR%%/map/835.4010.X091.A1.pkl
-%%DATADIR%%/map/835.4010.X091.pkl
 %%DATADIR%%/map/837.4010.X096.A1.pkl
-%%DATADIR%%/map/837.4010.X096.pkl
 %%DATADIR%%/map/837.4010.X097.A1.pkl
-%%DATADIR%%/map/837.4010.X097.pkl
 %%DATADIR%%/map/837.4010.X098.A1.pkl
-%%DATADIR%%/map/837.4010.X098.pkl
 %%DATADIR%%/map/841.4010.XXXC.pkl
 %%DATADIR%%/map/997.4010.pkl
 %%DATADIR%%/map/codes.pkl
@@ -250,6 +238,7 @@ etc/pyx12.conf.xml.sample
 %%DATADIR%%/map/README
 %%DATADIR%%/map/codes.xsd
 %%DATADIR%%/map/map.xsd
+%%DATADIR%%/map/dataele.xsd
 %%DATADIR%%/map/x12simple.dtd
 @dirrm %%DATADIR%%/map
 @dirrm %%DATADIR%%/test/files