pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-pbfalcon: Clean up dependencies and PLIST



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Mon Apr 3 10:21:09 2017 -0500
Changeset:	f44ff9e23c18b84f03efdb8d41a14269e4c844e1

Modified Files:
	py-pbfalcon/Makefile
	py-pbfalcon/PLIST
	py-pbfalcon/distinfo
	py-pbfalcon/patches/patch-src_py_run__support.py
	py-rdflib340/Makefile
Removed Files:
	py-pbfalcon/buildlink3.mk

Log Message:
py-pbfalcon: Clean up dependencies and PLIST

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

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

diffstat:
 py-pbfalcon/Makefile                             | 13 +++++-----
 py-pbfalcon/PLIST                                | 32 ++++++++++++------------
 py-pbfalcon/buildlink3.mk                        | 12 ---------
 py-pbfalcon/distinfo                             |  2 +-
 py-pbfalcon/patches/patch-src_py_run__support.py |  4 +++
 py-rdflib340/Makefile                            |  2 +-
 6 files changed, 29 insertions(+), 36 deletions(-)

diffs:
diff --git a/py-pbfalcon/Makefile b/py-pbfalcon/Makefile
index 634961d757..127100a6a7 100644
--- a/py-pbfalcon/Makefile
+++ b/py-pbfalcon/Makefile
@@ -28,15 +28,19 @@ COMMENT=	Experimental PacBio diploid assembler
 LICENSE=	modified-bsd
 
 # Pessimistic assumption.  Test and change if possible.
-MAKE_JOBS_SAFE=	no
+# MAKE_JOBS_SAFE=	no
 
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
-PYDISTUTILSPKG=	yes
+# PYDISTUTILSPKG=	yes
 
 DEPENDS+=	${PYPKGPREFIX}-networkx>=0:../../math/py-networkx
+DEPENDS+=	${PYPKGPREFIX}-pypeflow>=0:../../wip/py-pypeflow
+DEPENDS+=	${PYPKGPREFIX}-rdflib-3.4.0:../../wip/py-rdflib340
+DEPENDS+=	${PYPKGPREFIX}-rdfextras>=0:../../wip/py-rdfextras
 
 PORTVERSION=	2015.10.28
+EGG_NAME=	falcon_kit-0.4.0
 
 post-patch:
 	for f in ${WRKSRC}/src/py_scripts/*.py; do \
@@ -45,10 +49,7 @@ post-patch:
 		${MV} -f $$f.temp $$f; \
 	done
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../wip/dazz_db/buildlink3.mk"
 .include "../../wip/daligner/buildlink3.mk"
-.include "../../wip/py-pypeflow/buildlink3.mk"
-.include "../../wip/py-rdflib340/buildlink3.mk"
-.include "../../wip/py-rdfextras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pbfalcon/PLIST b/py-pbfalcon/PLIST
index 4d11c4e6c6..b4173efb8f 100644
--- a/py-pbfalcon/PLIST
+++ b/py-pbfalcon/PLIST
@@ -22,29 +22,32 @@ bin/fc_ovlp_to_graph
 bin/fc_ovlp_to_graph.py
 bin/fc_run
 bin/fc_run.py
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/entry_points.txt
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/not-zip-safe
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/requires.txt
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/falcon_kit-0.4.0-py2.7.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/falcon_kit/FastaReader.py
+${PYSITELIB}/falcon_kit/FastaReader.pyc
+${PYSITELIB}/falcon_kit/FastaReader.pyo
+${PYSITELIB}/falcon_kit/__init__.py
+${PYSITELIB}/falcon_kit/__init__.pyc
+${PYSITELIB}/falcon_kit/__init__.pyo
 ${PYSITELIB}/falcon_kit/ext_falcon.so
 ${PYSITELIB}/falcon_kit/falcon_kit.py
 ${PYSITELIB}/falcon_kit/falcon_kit.pyc
 ${PYSITELIB}/falcon_kit/falcon_kit.pyo
-${PYSITELIB}/falcon_kit/FastaReader.py
-${PYSITELIB}/falcon_kit/FastaReader.pyc
-${PYSITELIB}/falcon_kit/FastaReader.pyo
 ${PYSITELIB}/falcon_kit/fc_asm_graph.py
 ${PYSITELIB}/falcon_kit/fc_asm_graph.pyc
 ${PYSITELIB}/falcon_kit/fc_asm_graph.pyo
 ${PYSITELIB}/falcon_kit/functional.py
 ${PYSITELIB}/falcon_kit/functional.pyc
 ${PYSITELIB}/falcon_kit/functional.pyo
-${PYSITELIB}/falcon_kit/__init__.py
-${PYSITELIB}/falcon_kit/__init__.pyc
-${PYSITELIB}/falcon_kit/__init__.pyo
+${PYSITELIB}/falcon_kit/mains/__init__.py
+${PYSITELIB}/falcon_kit/mains/__init__.pyc
+${PYSITELIB}/falcon_kit/mains/__init__.pyo
 ${PYSITELIB}/falcon_kit/mains/actg_coordinate.py
 ${PYSITELIB}/falcon_kit/mains/actg_coordinate.pyc
 ${PYSITELIB}/falcon_kit/mains/actg_coordinate.pyo
@@ -66,9 +69,6 @@ ${PYSITELIB}/falcon_kit/mains/graph_to_contig.pyo
 ${PYSITELIB}/falcon_kit/mains/graph_to_utgs.py
 ${PYSITELIB}/falcon_kit/mains/graph_to_utgs.pyc
 ${PYSITELIB}/falcon_kit/mains/graph_to_utgs.pyo
-${PYSITELIB}/falcon_kit/mains/__init__.py
-${PYSITELIB}/falcon_kit/mains/__init__.pyc
-${PYSITELIB}/falcon_kit/mains/__init__.pyo
 ${PYSITELIB}/falcon_kit/mains/ovlp_filter.py
 ${PYSITELIB}/falcon_kit/mains/ovlp_filter.pyc
 ${PYSITELIB}/falcon_kit/mains/ovlp_filter.pyo
diff --git a/py-pbfalcon/buildlink3.mk b/py-pbfalcon/buildlink3.mk
deleted file mode 100644
index 30e422168d..0000000000
--- a/py-pbfalcon/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	py27-pbfalcon
-
-.if !defined(PY27_PBFALCON_BUILDLINK3_MK)
-PY27_PBFALCON_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.py27-pbfalcon+=	py27-pbfalcon>=2015.08.17
-BUILDLINK_PKGSRCDIR.py27-pbfalcon?=	../../wip/py-pbfalcon
-.endif	# PY27_PBFALCON_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-py27-pbfalcon
diff --git a/py-pbfalcon/distinfo b/py-pbfalcon/distinfo
index b8b2cfd118..dc21fb4426 100644
--- a/py-pbfalcon/distinfo
+++ b/py-pbfalcon/distinfo
@@ -4,4 +4,4 @@ SHA1 (pbfalcon-2015.10.28.tar.xz) = 972b95e543a4b32c8965cbb1b09968cde6281b81
 RMD160 (pbfalcon-2015.10.28.tar.xz) = e042a996fe813ec468974458e13631cb1c76d310
 SHA512 (pbfalcon-2015.10.28.tar.xz) = 464f1730d283be11b1aeea0ff9be98d85dbb2ec313dcdf53a9a3337790d6814a11b9d8979abf3669f1ba379c68bb1612dbe18ae9ad4a5764ef0c75aff67938dd
 Size (pbfalcon-2015.10.28.tar.xz) = 458572 bytes
-SHA1 (patch-src_py_run__support.py) = 49621ce5cdd1907c03fd91d7afdf5a978944d7db
+SHA1 (patch-src_py_run__support.py) = b629f948fce6ebce74c1dc8996d206e8dad98536
diff --git a/py-pbfalcon/patches/patch-src_py_run__support.py b/py-pbfalcon/patches/patch-src_py_run__support.py
index 711b17ccdf..207208bd68 100644
--- a/py-pbfalcon/patches/patch-src_py_run__support.py
+++ b/py-pbfalcon/patches/patch-src_py_run__support.py
@@ -1,3 +1,7 @@
+$NetBSD$
+
+# Add portable shebang
+
 --- src/py/run_support.py.orig	2015-10-28 12:31:41.000000000 -0500
 +++ src/py/run_support.py	2015-10-28 12:32:00.000000000 -0500
 @@ -33,6 +33,7 @@
diff --git a/py-rdflib340/Makefile b/py-rdflib340/Makefile
index 9d8dab3f64..46a388899a 100644
--- a/py-rdflib340/Makefile
+++ b/py-rdflib340/Makefile
@@ -18,9 +18,9 @@ LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-html5lib>=0:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-sparqlwrapper:../../wip/py-sparqlwrapper
+DEPENDS+=	${PYPKGPREFIX}-isodate:../../time/py-isodate
 
 PORTVERSION=	3.4.0
 
 .include "../../lang/python/egg.mk"
-.include "../../wip/py-isodate/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index