4 files changed, 79 insertions, 15 deletions

diff --git a/science/py-pydicom/Makefile b/science/py-pydicom/Makefile
index 5c03b55730c2..4d55f8f32aa1 100644
--- a/science/py-pydicom/Makefile
+++ b/science/py-pydicom/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	pydicom
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.4.1
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-0.9.4-1
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Read, Modify and Write DICOM Files with Python Code
 
+USE_DOS2UNIX=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGVERSION=	0.9.4_1
 
 .include <bsd.port.mk>
diff --git a/science/py-pydicom/distinfo b/science/py-pydicom/distinfo
index bf4fffb0ba2c..59d0dd0a8af5 100644
--- a/science/py-pydicom/distinfo
+++ b/science/py-pydicom/distinfo
@@ -1,3 +1,3 @@
-MD5 (pydicom-0.9.2.tar.gz) = 62c3837b36b9eb1f9fb7fad489d1d929
-SHA256 (pydicom-0.9.2.tar.gz) = 6261fa731ce9bcb156289ddb1e1fac6b822ef0d17f64d6be3cb37a79d37fa5e4
-SIZE (pydicom-0.9.2.tar.gz) = 249813
+MD5 (pydicom-0.9.4-1.tar.gz) = 10a72e7175b89dd98f158fc097b9616f
+SHA256 (pydicom-0.9.4-1.tar.gz) = 11b39835846935cf12e348f6d97c48cdbbe4935a3492fa5f54e0e295e8794f2c
+SIZE (pydicom-0.9.4-1.tar.gz) = 356626
diff --git a/science/py-pydicom/files/patch-setup.py b/science/py-pydicom/files/patch-setup.py
new file mode 100644
index 000000000000..7f833b10e499
--- /dev/null
+++ b/science/py-pydicom/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2010-06-25 10:22:29.000000000 +0800
++++ setup.py	2010-06-25 10:22:39.000000000 +0800
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+-from distribute_setup import use_setuptools
+-use_setuptools()
++#from distribute_setup import use_setuptools
++#use_setuptools()
+ 
+ from setuptools import setup, find_packages
+ import os
diff --git a/science/py-pydicom/pkg-plist b/science/py-pydicom/pkg-plist
index 0318bb015e61..9bb56157b608 100644
--- a/science/py-pydicom/pkg-plist
+++ b/science/py-pydicom/pkg-plist
@@ -3,7 +3,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/UID.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/UID.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/UID.pyo
@@ -16,12 +15,27 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/_dicom_dict.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/_dicom_dict.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/_dicom_dict.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/_private_dict.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/_private_dict.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/_private_dict.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/attribute.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/attribute.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/attribute.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/charset.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/charset.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/charset.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/imViewer_Simple.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/imViewer_Simple.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/imViewer_Simple.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/pydicom_PIL.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/pydicom_PIL.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/pydicom_PIL.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/pydicom_Tkinter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/pydicom_Tkinter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib/pydicom_Tkinter.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/datadict.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/datadict.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/datadict.pyo
@@ -35,6 +49,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/encaps.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/encaps.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/encaps.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/DicomDiff.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/DicomDiff.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/DicomDiff.pyo
@@ -50,8 +67,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/dicomtree.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/dicomtree.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/dicomtree.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/interactive_session.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/interactive_session_downsize_image.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/myprint.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/myprint.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples/myprint.pyo
@@ -61,29 +76,38 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filebase.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filebase.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filebase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/fileiter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/fileiter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/fileiter.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filereader.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filereader.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filereader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/fileutil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/fileutil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/fileutil.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filewriter.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filewriter.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/filewriter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/image.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/image.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/image.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/license.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/misc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/misc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/misc.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/sequence.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/sequence.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/sequence.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/tag.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/tag.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/tag.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/all.bat
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance/time_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance/time_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance/time_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/run_tests.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/run_tests.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/run_tests.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/shell_all
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_UID.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_UID.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_UID.pyo
@@ -105,12 +129,21 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_filewriter.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_filewriter.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_filewriter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_rawread.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_rawread.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_rawread.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_tag.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_tag.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_tag.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_valuerep.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_valuerep.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/test_valuerep.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/version_dep.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/version_dep.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/version_dep.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/warncheck.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/warncheck.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/warncheck.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testcharsetfiles/FileInfo.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testcharsetfiles/charlist.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testcharsetfiles/charlist.pyc
@@ -134,20 +167,37 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/MR_small.dcm
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/image_dfl.dcm
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/reportsi.dcm
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/rtdose.dcm
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/rtplan.dcm
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/rtplan.dump
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/rtplan_truncated.dcm
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/rtstruct.dcm
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/rtstruct.dump
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles/test-SR.dcm
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/dump.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/dump.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/dump.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/hexutil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/hexutil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/hexutil.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/namedtup.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/namedtup.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/util/namedtup.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/valuerep.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/valuerep.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/valuerep.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/values.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/values.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/values.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/contrib
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/doc
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/examples
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test/performance
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/test
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testcharsetfiles
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dicom/testfiles