From b637188afc1a43e2d0e32f6624bde19d85bb1848 Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Mon, 5 Mar 2007 14:10:58 +0000
Subject: [PATCH] - Update to 0.33 - Take maintainership

Approved by:	xride (maintainer)
---
 graphics/py-graphviz/Makefile             | 10 +++++-----
 graphics/py-graphviz/distinfo             |  6 +++---
 graphics/py-graphviz/files/patch-setup.py | 15 ---------------
 graphics/py-graphviz/pkg-plist            | 21 ++++++++++++++++-----
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 7f7a883cd2e0..311841dd287b 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	0.22
+PORTVERSION=	0.33
 CATEGORIES=	graphics python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	networkx
+MASTER_SITES=	https://networkx.lanl.gov/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygraphviz-${PORTVERSION}
 
-MAINTAINER=	xride@FreeBSD.org
+MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Python interface to GraphViz agraph
 
 BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
@@ -23,6 +22,7 @@ USE_PYDISTUTILS=yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+; \
+		s+^docdirbase.*=.*+docdirbase = "${DOCSDIR:S/${PREFIX}\///}"+' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/graphics/py-graphviz/distinfo b/graphics/py-graphviz/distinfo
index 73f6711bf213..c6a18078180e 100644
--- a/graphics/py-graphviz/distinfo
+++ b/graphics/py-graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygraphviz-0.22.tar.gz) = dc5f148d2108efe45c30cf5facbc254a
-SHA256 (pygraphviz-0.22.tar.gz) = 6f4e38274337dc4dbc3af70f2839433aa850b08a79f6fc421c27dc8f1f07a6ed
-SIZE (pygraphviz-0.22.tar.gz) = 23372
+MD5 (pygraphviz-0.33.tar.gz) = 2e89b8ec52be5f91b47f2b904c590f7a
+SHA256 (pygraphviz-0.33.tar.gz) = bbc277fa4c2b49d4ea836163a7482a3e8fa55537c7c18e79325e5face31c64ea
+SIZE (pygraphviz-0.33.tar.gz) = 66998
diff --git a/graphics/py-graphviz/files/patch-setup.py b/graphics/py-graphviz/files/patch-setup.py
index 925341251626..2418143d6264 100644
--- a/graphics/py-graphviz/files/patch-setup.py
+++ b/graphics/py-graphviz/files/patch-setup.py
@@ -1,20 +1,5 @@
 --- setup.py.orig	Sun Mar 12 23:09:05 2006
 +++ setup.py	Sun Sep 24 15:05:50 2006
-@@ -7,13 +7,7 @@
- import os
- import sys
- 
--# use setuptools if we got it, else distutils
--try: 
--#    import ez_setup
--#    ez_setup.use_setuptools()
--    from setuptools import setup, Extension
--except:
--    from distutils.core import setup, Extension
-+from distutils.core import setup, Extension
- 
- if sys.argv[-1] == 'setup.py':
-     print "To install, run 'python setup.py install'"
 @@ -25,7 +19,7 @@
  
  # If setting the prefix failed you should attempt to set the prefix here:
diff --git a/graphics/py-graphviz/pkg-plist b/graphics/py-graphviz/pkg-plist
index 83c4425d2da0..1da35ca13f16 100644
--- a/graphics/py-graphviz/pkg-plist
+++ b/graphics/py-graphviz/pkg-plist
@@ -1,19 +1,30 @@
 %%PYTHON_SITELIBDIR%%/pygraphviz/__init__.py
 %%PYTHON_SITELIBDIR%%/pygraphviz/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygraphviz/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pygraphviz/_graphviz.so
+%%PYTHON_SITELIBDIR%%/pygraphviz/agraph.py
+%%PYTHON_SITELIBDIR%%/pygraphviz/agraph.pyc
+%%PYTHON_SITELIBDIR%%/pygraphviz/agraph.pyo
 %%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.py
 %%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.pyc
 %%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.pyo
-%%PYTHON_SITELIBDIR%%/pygraphviz/pygraphviz.py
-%%PYTHON_SITELIBDIR%%/pygraphviz/pygraphviz.pyc
-%%PYTHON_SITELIBDIR%%/pygraphviz/pygraphviz.pyo
-%%PYTHON_SITELIBDIR%%/pygraphviz/_graphviz.so
 %%PYTHON_SITELIBDIR%%/pygraphviz/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/pygraphviz/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygraphviz/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pygraphviz/tests/pygraphviz_test.txt
 %%PYTHON_SITELIBDIR%%/pygraphviz/tests/test.py
 %%PYTHON_SITELIBDIR%%/pygraphviz/tests/test.pyc
 %%PYTHON_SITELIBDIR%%/pygraphviz/tests/test.pyo
+%%DOCSDIR%%/API.txt
+%%DOCSDIR%%/Examples.txt
+%%DOCSDIR%%/FAQ.txt
+%%DOCSDIR%%/License.txt
+%%DOCSDIR%%/Readme.txt
+%%DOCSDIR%%/Tutorial.txt
+%%DOCSDIR%%/examples/miles.py
+%%DOCSDIR%%/examples/simple.py
+%%DOCSDIR%%/examples/star.py
+%%DOCSDIR%%/examples/miles.dat
 @dirrm %%PYTHON_SITELIBDIR%%/pygraphviz/tests
 @dirrm %%PYTHON_SITELIBDIR%%/pygraphviz
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%