- Update to 1.7.0

Approved by:	lwhsu/rafan (mentors)

4 files changed, 23 insertions, 122 deletions

diff --git a/graphics/py-graph-dot/Makefile b/graphics/py-graph-dot/Makefile
index 051162d32686..7727e6171feb 100644
--- a/graphics/py-graph-dot/Makefile
+++ b/graphics/py-graph-dot/Makefile
@@ -5,60 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	graph
-PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTNAME=	graph-dot
+PORTVERSION=	1.7.0
 CATEGORIES=	graphics python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-graph-${PORTVERSION}
+DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yzlin@FreeBSD.org
-COMMENT=	A library for working with graphs in Python
+COMMENT=	A library for working with graphs in Python, dot module
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot \
+		${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:${PORTSDIR}/graphics/py-graph-core
 
 PROJECTHOST=	python-graph
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	python_graph
+PYDISTUTILS_PKGNAME=	python_graph_dot
 
-USE_BZIP2=	yes
-
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
-
-TESTFILES=	unittests-accessibility.py \
-		unittests-cycles.py \
-		unittests-digraph.py \
-		unittests-filters.py \
-		unittests-graph.py \
-		unittests-heuristics.py \
-		unittests-readwrite.py \
-		unittests-searching.py \
-		unittests-sorting.py \
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in COPYING Changelog README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
-
-#  This target is only meant to be used by the port maintainer.
-x-regression-test:	install
-.for f in ${TESTFILES}
-	@${ECHO} "" >> ${WRKSRC}/tests/${f}
-	@${ECHO} "if __name__ == '__main__':" >> ${WRKSRC}/tests/${f}
-	@${ECHO} "    unittest.main()" >> ${WRKSRC}/tests/${f}
-	@${ECHO} "Unit-testing ${f}..."
-	@(cd ${WRKSRC}/tests && ${PYTHON_CMD} ${f})
-.endfor
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 .include <bsd.port.mk>
diff --git a/graphics/py-graph-dot/distinfo b/graphics/py-graph-dot/distinfo
index 23e589b9ce49..4a94a2401064 100644
--- a/graphics/py-graph-dot/distinfo
+++ b/graphics/py-graph-dot/distinfo
@@ -1,3 +1,3 @@
-MD5 (python-graph-1.6.1.tar.bz2) = 4c52cb006e139e7578f9bdf2338d166d
-SHA256 (python-graph-1.6.1.tar.bz2) = 33279db94653f83ba58c3cc114b99c55d9fbd187caeff2c8998e95a36c02487a
-SIZE (python-graph-1.6.1.tar.bz2) = 54402
+MD5 (python-graph-dot-1.7.0.tar.gz) = aec93da828b2907037064483c5106d8f
+SHA256 (python-graph-dot-1.7.0.tar.gz) = 6a603647d81eadefbfe83012ff8cad211da94af221173e574f0761e85fb2b2ec
+SIZE (python-graph-dot-1.7.0.tar.gz) = 8037
diff --git a/graphics/py-graph-dot/files/patch-setup.py b/graphics/py-graph-dot/files/patch-setup.py
index 89d543f758fd..f3ccd4e373d6 100644
--- a/graphics/py-graph-dot/files/patch-setup.py
+++ b/graphics/py-graph-dot/files/patch-setup.py
@@ -1,26 +1,27 @@
+
+$FreeBSD$
+
 --- setup.py.orig
 +++ setup.py
 @@ -4,12 +4,7 @@
  import os
- import logging
+ 
  
 -try:
 -    from setuptools import setup, find_packages
--except ImportError, ie:
+-except ImportError as ie:
 -    import ez_setup
 -    ez_setup.use_setuptools()
 -    from setuptools import setup, find_packages
 +from setuptools import setup, find_packages
  
  # Startup
- appname = "python-graph"
-@@ -40,9 +35,6 @@
-         name = appname,
+ appname = "python-graph-dot"
+@@ -20,7 +15,6 @@
          version = appversion,
-         packages = ['pygraph', 'pygraph.algorithms', 'pygraph.algorithms.filters', 'pygraph.algorithms.heuristics', 'pygraph.classes', 'pygraph.readwrite'],
--        data_files = [(docsdir,docsfiles),
--                       (datadir,datafiles)],
--        install_requires = ['pydot'],
+         namespace_packages = ["pygraph"],
+         packages = ["pygraph"] + [ os.path.join("pygraph", a) for a in find_packages("pygraph") ],
+-        install_requires = [ 'python-graph-core==%s' % appversion, 'pydot' ],
          author = "Pedro Matiello",
          author_email = "pmatiello@gmail.com",
-         description = "A library for working with graphs in Python",
+         description = "DOT support for python-graph",
diff --git a/graphics/py-graph-dot/pkg-plist b/graphics/py-graph-dot/pkg-plist
deleted file mode 100644
index 13223b5f9c46..000000000000
--- a/graphics/py-graph-dot/pkg-plist
+++ /dev/null
@@ -1,64 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/critical.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draw.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawhyper.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex1.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.tls
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lts2graph.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/read.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/write.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/api-objects.txt
-%%PORTDOCS%%%%DOCSDIR%%/class-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/crarr.png
-%%PORTDOCS%%%%DOCSDIR%%/epydoc.css
-%%PORTDOCS%%%%DOCSDIR%%/epydoc.js
-%%PORTDOCS%%%%DOCSDIR%%/help.html
-%%PORTDOCS%%%%DOCSDIR%%/identifier-index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/module-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.accessibility-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.critical-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.cycles-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters.Find-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters.Find.find-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters.Null-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters.Null.null-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters.Radius-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.filters.Radius.radius-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.generators-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.heuristics-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.heuristics.Chow-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.heuristics.Chow.chow-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.heuristics.Euclidean-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.heuristics.Euclidean.euclidean-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.minmax-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.searching-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.sorting-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.traversal-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.utils-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.utils.HeapItem-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.algorithms.utils.priority_queue-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Digraph-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Digraph.digraph-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Exceptions-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Exceptions.GraphError-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Exceptions.InvalidGraphType-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Exceptions.NodeUnreachable-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Graph-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Graph.graph-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Hypergraph-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.classes.Hypergraph.hypergraph-class.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.readwrite-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.readwrite.dot-module.html
-%%PORTDOCS%%%%DOCSDIR%%/pygraph.readwrite.markup-module.html
-%%PORTDOCS%%%%DOCSDIR%%/redirect.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%