- update to 2.30.0

- mark guile plugin BROKEN

4 files changed, 59 insertions, 42 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index b7b189f12b96..c2f88142e6ff 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	2.28.0
-PORTREVISION=	1
+PORTVERSION=	2.30.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -29,10 +28,10 @@ PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
 MAN1=		acyclic.1 bcomps.1 ccomps.1 cluster.1 diffimg.1 dijkstra.1 \
-		dot.1 dotty.1 gc.1 gml2gv.1 gv2gxl.1 gvedit.1 gvmap.1 \
-		gvmap.sh.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 \
-		lneato.1 nop.1 osage.1 patchwork.1 prune.1 sccmap.1 smyrna.1 \
-		tred.1 unflatten.1 vimdot.1
+		dot.1 dotty.1 gc.1 graphml2gv.1 gml2gv.1 gv2gxl.1 gvmap.1 \
+		gvmap.sh.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 lneato.1 \
+		nop.1 osage.1 patchwork.1 prune.1 sccmap.1 smyrna.1 tred.1 \
+		unflatten.1 vimdot.1
 MAN3=		cdt.3 expr.3 cgraph.3 graph.3 gvc.3 pack.3 pathplan.3 xdot.3
 MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
@@ -40,6 +39,7 @@ MLINKS=		dot.1 circo.1 \
 		dot.1 neato.1 \
 		dot.1 sfdp.1 \
 		dot.1 twopi.1 \
+		gml2gv.1 gv2gml.1 \
 		gv2gxl.1 gxl2gv.1
 
 FIX_INCLUDE=	ast_common.h \
@@ -269,6 +269,7 @@ CONFIGURE_ARGS+=	--without-smyrna
 .if ${PORT_OPTIONS:MGVEDIT}
 CONFIGURE_ARGS+=	--with-gvedit=yes
 PLIST_SUB+=		WITH_GVEDIT=""
+MAN1+=			gvedit.1
 .else
 PLIST_SUB+=		WITH_GVEDIT="@comment "
 CONFIGURE_ARGS+=	--with-qt=no
@@ -383,6 +384,7 @@ CONFIGURE_ARGS+=	--enable-guile
 PLIST_SUB+=		WITH_GUILE=""
 LIB_DEPENDS+=		guile:${PORTSDIR}/lang/guile
 MAN3+=			gv.3guile
+BROKEN=			the guile plugin needs a new version of guile
 .else
 CONFIGURE_ARGS+=	--disable-guile
 PLIST_SUB+=		WITH_GUILE="@comment "
@@ -424,6 +426,7 @@ post-patch:
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
+	${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
 		${WRKSRC}/Makefile.in
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index c661c3c2160e..6fc03389653f 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (graphviz-2.28.0.tar.gz) = d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
-SIZE (graphviz-2.28.0.tar.gz) = 19620087
+SHA256 (graphviz-2.30.0.tar.gz) = 355a747535847f31c9f68ebfd5e32274c5baca5e576dc856c5554345ed418f6b
+SIZE (graphviz-2.30.0.tar.gz) = 23644157
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
index fbe154990031..fc8f9acda524 100644
--- a/graphics/graphviz/files/patch-configure
+++ b/graphics/graphviz/files/patch-configure
@@ -1,16 +1,16 @@
---- configure.orig	2010-01-26 16:01:10.000000000 +0000
-+++ configure	2011-02-28 06:36:25.156165774 +0000
-@@ -6917,6 +6917,9 @@
- 	        *-apple-darwin* )
- 	            CFLAGS="${CFLAGS} -fno-common -Wall"
- 	            ;;
-+	        *alpha*-freebsd* )
-+	            CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
+--- configure.orig	2013-01-14 04:23:16.000000000 +0100
++++ configure	2013-01-26 20:03:12.000000000 +0100
+@@ -17696,6 +17696,9 @@
+ 	    *-apple-darwin* )
+ 	        CFLAGS="${CFLAGS} -fno-common -Wall"
+ 	        ;;
++	    *alpha*-freebsd* )
++	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
 +		    ;;
- 	        *-freebsd* )
- 	            CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
+ 	    *-freebsd* )
+ 	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
  		    ;;
-@@ -24803,7 +24806,9 @@
+@@ -21373,7 +21376,9 @@
  
          LUA_INCLUDES=""
          LUA_LIBS=""
@@ -21,19 +21,3 @@
  
          if test -n "$lua_inc"; then
             CFLAGS="$CFLAGS -I$lua_inc"
-@@ -27574,7 +27579,14 @@
-       if test "x$RUBY" = "x"; then
- 	use_ruby="No (ruby not available)"
-       else
--        RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
-+	RUBY_VER="`$RUBY -rrbconfig -e \"puts Config::CONFIG['ruby_version']\"`"
-+	if test "x$RUBY_VER" = "x1.8"; then
-+        	RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
-+	else
-+        	RUBY_INC="`$RUBY -rrbconfig -e \"puts Config::CONFIG['rubyhdrdir']\"`"
-+		RUBY_ARCH="`$RUBY -rrbconfig -e \"puts Config::CONFIG['arch']\"`"
-+		RUBY_INCLUDES="-I$RUBY_INC -I$RUBY_INC/$RUBY_ARCH"
-+	fi
- 	# hack for powerpc-darwin8 (10.4)
- 	RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
-         RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`"
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 623b5aeae180..e82a19b20c38 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -12,6 +12,8 @@ bin/dot_builtins
 bin/fdp
 bin/gc
 bin/gml2gv
+bin/graphml2gv
+bin/gv2gml
 bin/gv2gxl
 bin/gvcolor
 %%WITH_GVEDIT%%bin/gvedit
@@ -46,7 +48,6 @@ include/graphviz/color.h
 include/graphviz/dthdr.h
 include/graphviz/geom.h
 include/graphviz/globals.h
-include/graphviz/graph.h
 include/graphviz/graphviz_version.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
@@ -86,10 +87,6 @@ lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.5
 lib/graphviz/libcdt.la
 lib/graphviz/libcdt.a
-lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.5
-lib/graphviz/libgraph.la
-lib/graphviz/libgraph.a
 lib/graphviz/libcgraph.so
 lib/graphviz/libcgraph.so.6
 lib/graphviz/libcgraph.la
@@ -216,7 +213,6 @@ lib/graphviz/libxdot.la
 lib/graphviz/libxdot.so
 lib/graphviz/libxdot.so.4
 libdata/pkgconfig/libcdt.pc
-libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
@@ -323,6 +319,7 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/none.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/octagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/oval.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/plaintext.gif
@@ -359,7 +356,7 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gc.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.3tcl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gml2gv.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/graph.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/graphml2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3go.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3io.pdf
@@ -373,6 +370,7 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3ruby.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3sharp.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gml.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gxl.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.1.pdf
@@ -516,6 +514,7 @@ libdata/pkgconfig/libxdot.pc
 %%DATADIR%%/graphs/directed/alf.gv
 %%DATADIR%%/graphs/directed/arrows.gv
 %%DATADIR%%/graphs/directed/awilliams.gv
+%%DATADIR%%/graphs/directed/biological.gv
 %%DATADIR%%/graphs/directed/clust.gv
 %%DATADIR%%/graphs/directed/clust1.gv
 %%DATADIR%%/graphs/directed/clust2.gv
@@ -568,6 +567,36 @@ libdata/pkgconfig/libxdot.pc
 %%DATADIR%%/graphs/undirected/Petersen.gv
 %%DATADIR%%/graphs/undirected/ngk10_4.gv
 %%DATADIR%%/graphs/undirected/process.gv
+%%DATADIR%%/gvpr/addranks
+%%DATADIR%%/gvpr/addrings
+%%DATADIR%%/gvpr/anon
+%%DATADIR%%/gvpr/attr
+%%DATADIR%%/gvpr/bb
+%%DATADIR%%/gvpr/bbox
+%%DATADIR%%/gvpr/cliptree
+%%DATADIR%%/gvpr/col
+%%DATADIR%%/gvpr/collapse
+%%DATADIR%%/gvpr/color
+%%DATADIR%%/gvpr/dechain
+%%DATADIR%%/gvpr/deghist
+%%DATADIR%%/gvpr/deledges
+%%DATADIR%%/gvpr/delmulti
+%%DATADIR%%/gvpr/delnodes
+%%DATADIR%%/gvpr/depath
+%%DATADIR%%/gvpr/dijkstra
+%%DATADIR%%/gvpr/flatten
+%%DATADIR%%/gvpr/get-layers-list
+%%DATADIR%%/gvpr/group
+%%DATADIR%%/gvpr/indent
+%%DATADIR%%/gvpr/knbhd
+%%DATADIR%%/gvpr/maxdeg
+%%DATADIR%%/gvpr/path
+%%DATADIR%%/gvpr/rotate
+%%DATADIR%%/gvpr/scale
+%%DATADIR%%/gvpr/scalexy
+%%DATADIR%%/gvpr/span
+%%DATADIR%%/gvpr/topon
+%%DATADIR%%/gvpr/treetoclust
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/dot.PNG
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/glade-3.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/lcirco.png
@@ -624,6 +653,7 @@ libdata/pkgconfig/libxdot.pc
 @dirrm %%DATADIR%%/doc/html
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/gvpr
 @dirrm %%DATADIR%%/gvedit
 @dirrm %%DATADIR%%/graphs/directed
 @dirrm %%DATADIR%%/graphs/undirected