- update to 2.32.0

- new option POPPLER

4 files changed, 14 insertions, 34 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 1e50bf124335..b070c1ac995b 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	2.30.1
-PORTREVISION=	1
+PORTVERSION=	2.32.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -31,8 +30,7 @@ MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 MAN1=		acyclic.1 bcomps.1 ccomps.1 cluster.1 diffimg.1 dijkstra.1 \
 		dot.1 gc.1 graphml2gv.1 gml2gv.1 gv2gxl.1 gvmap.1 gvmap.sh.1 \
 		gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 nop.1 osage.1 \
-		patchwork.1 prune.1 sccmap.1 smyrna.1 tred.1 unflatten.1 \
-		vimdot.1
+		patchwork.1 prune.1 sccmap.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 \
@@ -64,7 +62,7 @@ PDOCS_HTML=	doc/*.html doc/info/*.gif
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
-OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK NVTHREADS
+OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK NVTHREADS
 OPTIONS_DEFAULT?=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO
 NO_OPTIONS_SORT=yes
 DIGCOLA_DESC=	neato layout engine wiwth DIGCOLA features
@@ -178,6 +176,13 @@ CONFIGURE_ARGS+=	--without-rsvg
 PLIST_SUB+=		WITH_RSVG="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPOPPLER}
+LIB_DEPENDS+?		poppler:${PORTSDIR}/graphics/poppler
+CONFIGURE_ARGS+=        --with-poppler=yes
+.else
+CONFIGURE_ARGS+=        --without-poppler
+.endif
+
 .if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SUB+=		WITH_GTK=""
@@ -267,6 +272,7 @@ CONFIGURE_ARGS+=	--without-ipsepcola
 
 .if ${PORT_OPTIONS:MSMYRNA}
 CONFIGURE_ARGS+=	--with-smyrna=yes
+MAN1+=			smyrna.1
 PLIST_SUB+=		WITH_SMYRNA=""
 .else
 PLIST_SUB+=		WITH_SMYRNA="@comment "
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 4e9fe68da185..48265ce4a043 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (graphviz-2.30.1.tar.gz) = 775fb996987032d2eca2f1502c6f913e0b02fe640c124723e45db11daf46aec8
-SIZE (graphviz-2.30.1.tar.gz) = 23678313
+SHA256 (graphviz-2.32.0.tar.gz) = d853b2313e08a1dd0cce20d9ff8051acfa9ec418b5ba2dc65c8f4ddb07a7a77a
+SIZE (graphviz-2.32.0.tar.gz) = 23756717
diff --git a/graphics/graphviz/files/patch-config_ruby.rb b/graphics/graphviz/files/patch-config_ruby.rb
deleted file mode 100644
index 0a6a42bd21f0..000000000000
--- a/graphics/graphviz/files/patch-config_ruby.rb
+++ /dev/null
@@ -1,27 +0,0 @@
---- config/config_ruby.rb.orig	2013-02-14 14:27:39.000000000 +0100
-+++ config/config_ruby.rb	2013-06-24 18:34:23.000000000 +0200
-@@ -1,18 +1,18 @@
- require 'rbconfig'
- 
--CONFIG = Config::MAKEFILE_CONFIG
-+CONFIG = RbConfig::MAKEFILE_CONFIG
- 
- 
- case ARGV[0]
- when "archdir"
--    puts Config::expand(CONFIG["archdir"])
-+    puts RbConfig::expand(CONFIG["archdir"])
- when "lib"
--    puts Config::expand(CONFIG["libdir"])
-+    puts RbConfig::expand(CONFIG["libdir"])
- when "vendorarchdir"
--    puts Config::expand(CONFIG["vendorarchdir"])
-+    puts RbConfig::expand(CONFIG["vendorarchdir"])
- when "sitearchdir"
--    puts Config::expand(CONFIG["sitearchdir"])
-+    puts RbConfig::expand(CONFIG["sitearchdir"])
- when "sitelib"
--    puts Config::expand(CONFIG["sitedir"])
-+    puts RbConfig::expand(CONFIG["sitedir"])
- end
- 
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 199cf5c1dc81..6b758f222d47 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -336,6 +336,7 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
+%%PORTDOCS%%%%DOCSDIR%%/pdf/Agraph.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/acyclic.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/bcomps.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.1.pdf