py-dicom: Fix download-during-build issue

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: py-dicom: Fix download-during-build issue
From: Jason Bacon <bacon4000%gmail.com@localhost>
Date: Tue, 28 Mar 2017 18:55:38 +0000
Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Tue Mar 28 13:55:38 2017 -0500
Changeset:	9154917bde6c5af824615abced523236a7c0258c

Modified Files:
	py-dicom/Makefile
	py-dicom/PLIST
	py-dicom/distinfo

Log Message:
py-dicom: Fix download-during-build issue

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9154917bde6c5af824615abced523236a7c0258c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-dicom/Makefile |   7 +--
 py-dicom/PLIST    | 170 +++++++++++++++++++++++++++---------------------------
 py-dicom/distinfo |   1 +
 3 files changed, 88 insertions(+), 90 deletions(-)

diffs:
diff --git a/py-dicom/Makefile b/py-dicom/Makefile
index f976e4c5f6..348ccb6e5a 100644
--- a/py-dicom/Makefile
+++ b/py-dicom/Makefile
@@ -3,13 +3,14 @@
 DISTNAME=	pydicom-0.9.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	biology
-MASTER_SITES=	https://pydicom.googlecode.com/files/
+MASTER_SITES=	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pydicom/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://code.google.com/p/pydicom/
 COMMENT=	Read, modify and write DICOM files with python code
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.6.2:../../converters/py-simplejson
 
 USE_TOOLS+=	bash
 USE_LANGUAGES=	# none
@@ -19,13 +20,9 @@ REPLACE_PYTHON+=	dicom/contrib/dicom_dao.py
 
 PYTHON_VERSIONS_ACCEPTED= 27
 
-BROKEN=		tries to download in build phase
-
 do-test:
 	${RUN} cd ${WRKSRC}/dicom/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_test.py
 
-DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.6.2:../../converters/py-simplejson
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dicom/PLIST b/py-dicom/PLIST
index bcc919fa07..1f30f379f2 100644
--- a/py-dicom/PLIST
+++ b/py-dicom/PLIST
@@ -1,28 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/07 20:52:37 jihbed Exp $
-${PYSITELIB}/dicom/UID.py
-${PYSITELIB}/dicom/UID.pyc
-${PYSITELIB}/dicom/UID.pyo
-${PYSITELIB}/dicom/_UID_dict.py
-${PYSITELIB}/dicom/_UID_dict.pyc
-${PYSITELIB}/dicom/_UID_dict.pyo
-${PYSITELIB}/dicom/__init__.py
-${PYSITELIB}/dicom/__init__.pyc
-${PYSITELIB}/dicom/__init__.pyo
-${PYSITELIB}/dicom/_dicom_dict.py
-${PYSITELIB}/dicom/_dicom_dict.pyc
-${PYSITELIB}/dicom/_dicom_dict.pyo
-${PYSITELIB}/dicom/_private_dict.py
-${PYSITELIB}/dicom/_private_dict.pyc
-${PYSITELIB}/dicom/_private_dict.pyo
+@comment $NetBSD$
 ${PYSITELIB}/dicom/charset.py
 ${PYSITELIB}/dicom/charset.pyc
 ${PYSITELIB}/dicom/charset.pyo
 ${PYSITELIB}/dicom/config.py
 ${PYSITELIB}/dicom/config.pyc
 ${PYSITELIB}/dicom/config.pyo
-${PYSITELIB}/dicom/contrib/__init__.py
-${PYSITELIB}/dicom/contrib/__init__.pyc
-${PYSITELIB}/dicom/contrib/__init__.pyo
 ${PYSITELIB}/dicom/contrib/dcm_qt_tree.py
 ${PYSITELIB}/dicom/contrib/dcm_qt_tree.pyc
 ${PYSITELIB}/dicom/contrib/dcm_qt_tree.pyo
@@ -32,15 +14,18 @@ ${PYSITELIB}/dicom/contrib/dicom_dao.pyo
 ${PYSITELIB}/dicom/contrib/imViewer_Simple.py
 ${PYSITELIB}/dicom/contrib/imViewer_Simple.pyc
 ${PYSITELIB}/dicom/contrib/imViewer_Simple.pyo
+${PYSITELIB}/dicom/contrib/__init__.py
+${PYSITELIB}/dicom/contrib/__init__.pyc
+${PYSITELIB}/dicom/contrib/__init__.pyo
 ${PYSITELIB}/dicom/contrib/pydicom_PIL.py
 ${PYSITELIB}/dicom/contrib/pydicom_PIL.pyc
 ${PYSITELIB}/dicom/contrib/pydicom_PIL.pyo
-${PYSITELIB}/dicom/contrib/pydicom_Tkinter.py
-${PYSITELIB}/dicom/contrib/pydicom_Tkinter.pyc
-${PYSITELIB}/dicom/contrib/pydicom_Tkinter.pyo
 ${PYSITELIB}/dicom/contrib/pydicom_series.py
 ${PYSITELIB}/dicom/contrib/pydicom_series.pyc
 ${PYSITELIB}/dicom/contrib/pydicom_series.pyo
+${PYSITELIB}/dicom/contrib/pydicom_Tkinter.py
+${PYSITELIB}/dicom/contrib/pydicom_Tkinter.pyc
+${PYSITELIB}/dicom/contrib/pydicom_Tkinter.pyo
 ${PYSITELIB}/dicom/datadict.py
 ${PYSITELIB}/dicom/datadict.pyc
 ${PYSITELIB}/dicom/datadict.pyo
@@ -50,28 +35,31 @@ ${PYSITELIB}/dicom/dataelem.pyo
 ${PYSITELIB}/dicom/dataset.py
 ${PYSITELIB}/dicom/dataset.pyc
 ${PYSITELIB}/dicom/dataset.pyo
+${PYSITELIB}/dicom/_dicom_dict.py
+${PYSITELIB}/dicom/_dicom_dict.pyc
+${PYSITELIB}/dicom/_dicom_dict.pyo
 ${PYSITELIB}/dicom/doc/index.html
 ${PYSITELIB}/dicom/encaps.py
 ${PYSITELIB}/dicom/encaps.pyc
 ${PYSITELIB}/dicom/encaps.pyo
+${PYSITELIB}/dicom/examples/anonymize.py
+${PYSITELIB}/dicom/examples/anonymize.pyc
+${PYSITELIB}/dicom/examples/anonymize.pyo
 ${PYSITELIB}/dicom/examples/DicomDiff.py
 ${PYSITELIB}/dicom/examples/DicomDiff.pyc
 ${PYSITELIB}/dicom/examples/DicomDiff.pyo
 ${PYSITELIB}/dicom/examples/DicomInfo.py
 ${PYSITELIB}/dicom/examples/DicomInfo.pyc
 ${PYSITELIB}/dicom/examples/DicomInfo.pyo
-${PYSITELIB}/dicom/examples/ListBeams.py
-${PYSITELIB}/dicom/examples/ListBeams.pyc
-${PYSITELIB}/dicom/examples/ListBeams.pyo
-${PYSITELIB}/dicom/examples/__init__.py
-${PYSITELIB}/dicom/examples/__init__.pyc
-${PYSITELIB}/dicom/examples/__init__.pyo
-${PYSITELIB}/dicom/examples/anonymize.py
-${PYSITELIB}/dicom/examples/anonymize.pyc
-${PYSITELIB}/dicom/examples/anonymize.pyo
 ${PYSITELIB}/dicom/examples/dicomtree.py
 ${PYSITELIB}/dicom/examples/dicomtree.pyc
 ${PYSITELIB}/dicom/examples/dicomtree.pyo
+${PYSITELIB}/dicom/examples/__init__.py
+${PYSITELIB}/dicom/examples/__init__.pyc
+${PYSITELIB}/dicom/examples/__init__.pyo
+${PYSITELIB}/dicom/examples/ListBeams.py
+${PYSITELIB}/dicom/examples/ListBeams.pyc
+${PYSITELIB}/dicom/examples/ListBeams.pyo
 ${PYSITELIB}/dicom/examples/myprint.py
 ${PYSITELIB}/dicom/examples/myprint.pyc
 ${PYSITELIB}/dicom/examples/myprint.pyo
@@ -93,25 +81,70 @@ ${PYSITELIB}/dicom/fileutil.pyo
 ${PYSITELIB}/dicom/filewriter.py
 ${PYSITELIB}/dicom/filewriter.pyc
 ${PYSITELIB}/dicom/filewriter.pyo
+${PYSITELIB}/dicom/__init__.py
+${PYSITELIB}/dicom/__init__.pyc
+${PYSITELIB}/dicom/__init__.pyo
 ${PYSITELIB}/dicom/misc.py
 ${PYSITELIB}/dicom/misc.pyc
 ${PYSITELIB}/dicom/misc.pyo
 ${PYSITELIB}/dicom/multival.py
 ${PYSITELIB}/dicom/multival.pyc
 ${PYSITELIB}/dicom/multival.pyo
+${PYSITELIB}/dicom/_private_dict.py
+${PYSITELIB}/dicom/_private_dict.pyc
+${PYSITELIB}/dicom/_private_dict.pyo
 ${PYSITELIB}/dicom/sequence.py
 ${PYSITELIB}/dicom/sequence.pyc
 ${PYSITELIB}/dicom/sequence.pyo
 ${PYSITELIB}/dicom/tag.py
 ${PYSITELIB}/dicom/tag.pyc
 ${PYSITELIB}/dicom/tag.pyo
+${PYSITELIB}/dicom/test/all.bat
+${PYSITELIB}/dicom/testcharsetfiles/charlist.py
+${PYSITELIB}/dicom/testcharsetfiles/charlist.pyc
+${PYSITELIB}/dicom/testcharsetfiles/charlist.pyo
+${PYSITELIB}/dicom/testcharsetfiles/chrArab.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrFren.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrFrenMulti.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrGerm.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrGreek.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrH31.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrH32.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrHbrw.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrI2.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrJapMulti.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrKoreanMulti.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrRuss.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrSQEncoding.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrX1.dcm
+${PYSITELIB}/dicom/testcharsetfiles/chrX2.dcm
+${PYSITELIB}/dicom/testcharsetfiles/FileInfo.txt
+${PYSITELIB}/dicom/testfiles/CT_small.dcm
+${PYSITELIB}/dicom/testfiles/ExplVR_BigEnd.dcm
+${PYSITELIB}/dicom/testfiles/image_dfl.dcm
+${PYSITELIB}/dicom/testfiles/JPEG2000.dcm
+${PYSITELIB}/dicom/testfiles/JPEG-LL.dcm
+${PYSITELIB}/dicom/testfiles/JPEG-lossy.dcm
+${PYSITELIB}/dicom/testfiles/MR_small.dcm
+${PYSITELIB}/dicom/testfiles/nested_priv_SQ.dcm
+${PYSITELIB}/dicom/testfiles/no_meta_group_length.dcm
+${PYSITELIB}/dicom/testfiles/priv_SQ.dcm
+${PYSITELIB}/dicom/testfiles/README.txt
+${PYSITELIB}/dicom/testfiles/reportsi.dcm
+${PYSITELIB}/dicom/testfiles/rtdose.dcm
+${PYSITELIB}/dicom/testfiles/rtplan.dcm
+${PYSITELIB}/dicom/testfiles/rtplan.dump
+${PYSITELIB}/dicom/testfiles/rtplan_truncated.dcm
+${PYSITELIB}/dicom/testfiles/rtstruct.dcm
+${PYSITELIB}/dicom/testfiles/rtstruct.dump
+${PYSITELIB}/dicom/testfiles/test.py
+${PYSITELIB}/dicom/testfiles/test.pyc
+${PYSITELIB}/dicom/testfiles/test.pyo
+${PYSITELIB}/dicom/testfiles/test-SR.dcm
+${PYSITELIB}/dicom/testfiles/zipMR.gz
 ${PYSITELIB}/dicom/test/__init__.py
 ${PYSITELIB}/dicom/test/__init__.pyc
 ${PYSITELIB}/dicom/test/__init__.pyo
-${PYSITELIB}/dicom/test/_write_stds.py
-${PYSITELIB}/dicom/test/_write_stds.pyc
-${PYSITELIB}/dicom/test/_write_stds.pyo
-${PYSITELIB}/dicom/test/all.bat
 ${PYSITELIB}/dicom/test/performance/__init__.py
 ${PYSITELIB}/dicom/test/performance/__init__.pyc
 ${PYSITELIB}/dicom/test/performance/__init__.pyo
@@ -125,9 +158,6 @@ ${PYSITELIB}/dicom/test/run_tests.py
 ${PYSITELIB}/dicom/test/run_tests.pyc
 ${PYSITELIB}/dicom/test/run_tests.pyo
 ${PYSITELIB}/dicom/test/shell_all
-${PYSITELIB}/dicom/test/test_UID.py
-${PYSITELIB}/dicom/test/test_UID.pyc
-${PYSITELIB}/dicom/test/test_UID.pyo
 ${PYSITELIB}/dicom/test/test_charset.py
 ${PYSITELIB}/dicom/test/test_charset.pyc
 ${PYSITELIB}/dicom/test/test_charset.pyo
@@ -158,6 +188,9 @@ ${PYSITELIB}/dicom/test/test_sequence.pyo
 ${PYSITELIB}/dicom/test/test_tag.py
 ${PYSITELIB}/dicom/test/test_tag.pyc
 ${PYSITELIB}/dicom/test/test_tag.pyo
+${PYSITELIB}/dicom/test/test_UID.py
+${PYSITELIB}/dicom/test/test_UID.pyc
+${PYSITELIB}/dicom/test/test_UID.pyo
 ${PYSITELIB}/dicom/test/test_valuerep.py
 ${PYSITELIB}/dicom/test/test_valuerep.pyc
 ${PYSITELIB}/dicom/test/test_valuerep.pyo
@@ -167,65 +200,32 @@ ${PYSITELIB}/dicom/test/version_dep.pyo
 ${PYSITELIB}/dicom/test/warncheck.py
 ${PYSITELIB}/dicom/test/warncheck.pyc
 ${PYSITELIB}/dicom/test/warncheck.pyo
-${PYSITELIB}/dicom/testcharsetfiles/FileInfo.txt
-${PYSITELIB}/dicom/testcharsetfiles/charlist.py
-${PYSITELIB}/dicom/testcharsetfiles/charlist.pyc
-${PYSITELIB}/dicom/testcharsetfiles/charlist.pyo
-${PYSITELIB}/dicom/testcharsetfiles/chrArab.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrFren.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrFrenMulti.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrGerm.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrGreek.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrH31.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrH32.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrHbrw.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrI2.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrJapMulti.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrKoreanMulti.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrRuss.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrSQEncoding.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrX1.dcm
-${PYSITELIB}/dicom/testcharsetfiles/chrX2.dcm
-${PYSITELIB}/dicom/testfiles/CT_small.dcm
-${PYSITELIB}/dicom/testfiles/ExplVR_BigEnd.dcm
-${PYSITELIB}/dicom/testfiles/JPEG-LL.dcm
-${PYSITELIB}/dicom/testfiles/JPEG-lossy.dcm
-${PYSITELIB}/dicom/testfiles/JPEG2000.dcm
-${PYSITELIB}/dicom/testfiles/MR_small.dcm
-${PYSITELIB}/dicom/testfiles/README.txt
-${PYSITELIB}/dicom/testfiles/image_dfl.dcm
-${PYSITELIB}/dicom/testfiles/nested_priv_SQ.dcm
-${PYSITELIB}/dicom/testfiles/no_meta_group_length.dcm
-${PYSITELIB}/dicom/testfiles/priv_SQ.dcm
-${PYSITELIB}/dicom/testfiles/reportsi.dcm
-${PYSITELIB}/dicom/testfiles/rtdose.dcm
-${PYSITELIB}/dicom/testfiles/rtplan.dcm
-${PYSITELIB}/dicom/testfiles/rtplan.dump
-${PYSITELIB}/dicom/testfiles/rtplan_truncated.dcm
-${PYSITELIB}/dicom/testfiles/rtstruct.dcm
-${PYSITELIB}/dicom/testfiles/rtstruct.dump
-${PYSITELIB}/dicom/testfiles/test-SR.dcm
-${PYSITELIB}/dicom/testfiles/test.py
-${PYSITELIB}/dicom/testfiles/test.pyc
-${PYSITELIB}/dicom/testfiles/test.pyo
-${PYSITELIB}/dicom/testfiles/zipMR.gz
-${PYSITELIB}/dicom/util/__init__.py
-${PYSITELIB}/dicom/util/__init__.pyc
-${PYSITELIB}/dicom/util/__init__.pyo
+${PYSITELIB}/dicom/test/_write_stds.py
+${PYSITELIB}/dicom/test/_write_stds.pyc
+${PYSITELIB}/dicom/test/_write_stds.pyo
+${PYSITELIB}/dicom/_UID_dict.py
+${PYSITELIB}/dicom/_UID_dict.pyc
+${PYSITELIB}/dicom/_UID_dict.pyo
+${PYSITELIB}/dicom/UID.py
+${PYSITELIB}/dicom/UID.pyc
+${PYSITELIB}/dicom/UID.pyo
 ${PYSITELIB}/dicom/util/dump.py
 ${PYSITELIB}/dicom/util/dump.pyc
 ${PYSITELIB}/dicom/util/dump.pyo
 ${PYSITELIB}/dicom/util/hexutil.py
 ${PYSITELIB}/dicom/util/hexutil.pyc
 ${PYSITELIB}/dicom/util/hexutil.pyo
+${PYSITELIB}/dicom/util/__init__.py
+${PYSITELIB}/dicom/util/__init__.pyc
+${PYSITELIB}/dicom/util/__init__.pyo
 ${PYSITELIB}/dicom/valuerep.py
 ${PYSITELIB}/dicom/valuerep.pyc
 ${PYSITELIB}/dicom/valuerep.pyo
 ${PYSITELIB}/dicom/values.py
 ${PYSITELIB}/dicom/values.pyc
 ${PYSITELIB}/dicom/values.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
diff --git a/py-dicom/distinfo b/py-dicom/distinfo
index c474cbbaf3..fcf2d17cde 100644
--- a/py-dicom/distinfo
+++ b/py-dicom/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.1 2013/09/07 20:52:38 jihbed Exp $
 SHA1 (pydicom-0.9.8.tar.gz) = 66ac41891895076228e5ecda4f1afe0f6723529f
 RMD160 (pydicom-0.9.8.tar.gz) = 2252cbdf2dd52a733658b689a53ca8e82dbf7e9e
 Size (pydicom-0.9.8.tar.gz) = 418481 bytes
+SHA1 (patch-setup.py) = 6de4d9b3d6877c59ad4a2b164423d2308b77a337
Prev by Date: (pkgtools/check-update) Udated to 0.9.3. Adjust path etc
Next by Date: lldb-git: Apply patches from upstream review
Previous by Thread: (pkgtools/check-update) Udated to 0.9.3. Adjust path etc
Next by Thread: lldb-git: Apply patches from upstream review
Indexes:
Home | Main Index | Thread Index | Old Index