Update to recommended version 0.22 from new upstream which no longer requires SWIG.

This fixes the brokeness introduced in the previous SWIG bandaid.
A lawyer might want to check if the license is also less restrictive now ;)

Sponsored by: simon & erwin of tb3.droso.net

6 files changed, 45 insertions, 55 deletions

diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 3388fd9e520b..6942d0e0be85 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -5,47 +5,26 @@
 # $FreeBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	0.1
-PORTREVISION=	2
+PORTVERSION=	0.22
 CATEGORIES=	graphics python
-MASTER_SITES=	http://www.cs.brown.edu/~er/software/Agraph.py/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	networkx
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	gv.i __init__.py
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=
+DISTNAME=	pygraphviz-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to GraphViz agraph
 
-BUILD_DEPENDS=	${SWIG_CMD}:${PORTSDIR}/devel/swig11 \
-		dot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 
 NO_CDROM=	"Can't be included in a commercial product"
 
 USE_PYTHON=	yes
-SWIG_CMD=	${LOCALBASE}/bin/swig1.1
+USE_PYDISTUTILS=yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
-GV_PORT=	${PORTSDIR}/graphics/graphviz
-MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ENV=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
-		GRAPHVIZ_INCLUDEDIR=${LOCALBASE}/include/graphviz \
-		SWIG_CMD=${SWIG_CMD}
 
 post-patch:
-	@${MKDIR} ${WRKSRC}
-	@${CP} ${DISTDIR}/graphviz/gv.i ${WRKSRC}
-
-do-install:
-	${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/__init__.py \
-		${WRKSRC}/_graphviz.so ${WRKSRC}/graphviz.py \
-		${PYTHON_SITELIBDIR}/${PORTNAME}
-
-post-install:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py \
-		${PYTHON_SITELIBDIR}/${PORTNAME}/__init__.py
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py \
-		${PYTHON_SITELIBDIR}/${PORTNAME}/graphviz.py
+	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/graphics/py-graphviz/distinfo b/graphics/py-graphviz/distinfo
index 93f57f0e1f84..73f6711bf213 100644
--- a/graphics/py-graphviz/distinfo
+++ b/graphics/py-graphviz/distinfo
@@ -1,6 +1,3 @@
-MD5 (graphviz/gv.i) = 97e21a6cd9a797851cad815e68a6c81d
-SHA256 (graphviz/gv.i) = 82e04f4d967268f11f8dfc62a715eaa941122bff6c93abab3add3297d8e23993
-SIZE (graphviz/gv.i) = 5246
-MD5 (graphviz/__init__.py) = aaad44b12a9db8876c18bcb7edcfc28b
-SHA256 (graphviz/__init__.py) = 73b2260007bfc3a34c70f736b7e2615bc4529a84227c8294970222c4ea2770f3
-SIZE (graphviz/__init__.py) = 8880
+MD5 (pygraphviz-0.22.tar.gz) = dc5f148d2108efe45c30cf5facbc254a
+SHA256 (pygraphviz-0.22.tar.gz) = 6f4e38274337dc4dbc3af70f2839433aa850b08a79f6fc421c27dc8f1f07a6ed
+SIZE (pygraphviz-0.22.tar.gz) = 23372
diff --git a/graphics/py-graphviz/files/Makefile b/graphics/py-graphviz/files/Makefile
deleted file mode 100644
index fdcdfae52a52..000000000000
--- a/graphics/py-graphviz/files/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-all: _graphviz.so
-
-_graphviz.so: gv_wrap.o
-	${LD} -shared -L${LOCALBASE}/lib/graphviz -rpath ${LOCALBASE}/lib/graphviz -lagraph -lcdt gv_wrap.o -o _graphviz.so
-
-gv_wrap.o: gv_wrap.c
-	${CC} -fno-strict-aliasing -DNDEBUG -O -pipe -DTHREAD_STACK_SIZE=0x20000 -fPIC -Dulong=u_long -DVERSION="py-agraph 1.0" -I${GRAPHVIZ_INCLUDEDIR} -I${PYTHON_INCLUDEDIR} ${CFLAGS} -c gv_wrap.c
-
-gv_wrap.c:
-	${SWIG_CMD} -python gv.i 
diff --git a/graphics/py-graphviz/files/patch-setup.py b/graphics/py-graphviz/files/patch-setup.py
new file mode 100644
index 000000000000..890264e4dd0a
--- /dev/null
+++ b/graphics/py-graphviz/files/patch-setup.py
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- setup.py.orig
++++ setup.py
+@@ -25,7 +25,7 @@
+ 
+ # If setting the prefix failed you should attempt to set the prefix here:
+ # prefix="/usr" # unix, Linux
+-# prefix="/usr/local" # unix, alternate
++prefix="%%LOCALBASE%%" # unix, alternate
+ # prefix="/sw"  # OSX, fink
+ # prefix="/opt/local"  # OSX, darwin-ports? 
+ 
diff --git a/graphics/py-graphviz/pkg-descr b/graphics/py-graphviz/pkg-descr
index 67d7eea04334..fe05d7e32010 100644
--- a/graphics/py-graphviz/pkg-descr
+++ b/graphics/py-graphviz/pkg-descr
@@ -1,4 +1,3 @@
-A Python interface to the agraph component of graphviz.  This code is
-covered by the Brown Copyright.
+A Python interface to the agraph component of graphviz.
 
-WWW: http://www.cs.brown.edu/~er/software/
+WWW: http://networkx.lanl.gov/pygraphviz/
diff --git a/graphics/py-graphviz/pkg-plist b/graphics/py-graphviz/pkg-plist
index 4703e9104894..83c4425d2da0 100644
--- a/graphics/py-graphviz/pkg-plist
+++ b/graphics/py-graphviz/pkg-plist
@@ -1,6 +1,19 @@
-%%PYTHON_SITELIBDIR%%/graphviz/__init__.py
-%%PYTHON_SITELIBDIR%%/graphviz/__init__.pyc
-%%PYTHON_SITELIBDIR%%/graphviz/graphviz.py
-%%PYTHON_SITELIBDIR%%/graphviz/graphviz.pyc
-%%PYTHON_SITELIBDIR%%/graphviz/_graphviz.so
-@dirrm %%PYTHON_SITELIBDIR%%/graphviz
+%%PYTHON_SITELIBDIR%%/pygraphviz/__init__.py
+%%PYTHON_SITELIBDIR%%/pygraphviz/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pygraphviz/__init__.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
+@dirrm %%PYTHON_SITELIBDIR%%/pygraphviz/tests
+@dirrm %%PYTHON_SITELIBDIR%%/pygraphviz