3 files changed, 22 insertions, 23 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 8ef5836ae65b..4323fd0f2dd8 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.22.2
-PORTREVISION=	1
+PORTVERSION=	2.24.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -35,7 +34,7 @@ MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
 MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1 dotty.1 gc.1 \
 		gv2gxl.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 lneato.1 \
-		nop.1 prune.1 sccmap.1 tred.1 unflatten.1
+		nop.1 osage.1 prune.1 sccmap.1 tred.1 unflatten.1
 MAN3=		cdt.3 cgraph.3 graph.3 gvc.3 pathplan.3
 MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
@@ -60,9 +59,9 @@ PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \
 			tclpkg/tclpathplan/demo/pathplan.tcl tclpkg/tkspline/demo/spline.tcl
 PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 
-PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
+PDOCS_TXT=	doc/Dot.ref doc/latex_suggestions.txt
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
-PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
+PDOCS_HTML=	doc/*.html doc/info/*.gif
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
@@ -414,10 +413,11 @@ post-install: install-ldconfig-file
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/doc
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/pdf
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/ && \
+		${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/doc/ && \
 		${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf/ && \
 		${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html/
 .	for i in neato.pdf twopi.pdf fdp.pdf circo.pdf
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 1cf929ff2f91..d9d88f7a90ca 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.22.2.tar.gz) = 34510a76ee176c6e0e64b773174e0fdc
-SHA256 (graphviz-2.22.2.tar.gz) = fb08b49592bb83d4e7659776033f4137753d908681f19e3d1f8a8a415550edfb
-SIZE (graphviz-2.22.2.tar.gz) = 16674049
+MD5 (graphviz-2.24.0.tar.gz) = 806a30dbc3f8deb219216f35be0e7a40
+SHA256 (graphviz-2.24.0.tar.gz) = 01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00
+SIZE (graphviz-2.24.0.tar.gz) = 16746568
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 311e70c5ce99..57c5b8d41fd9 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -21,6 +21,7 @@ bin/lneato
 bin/mm2gv
 bin/neato
 bin/nop
+bin/osage
 bin/prune
 bin/sccmap
 %%WITH_SMYRNA%%bin/smyrna
@@ -67,6 +68,7 @@ include/graphviz/gvplugin_device.h
 include/graphviz/pack.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
+include/graphviz/graphviz_version.h
 lib/graphviz/config6
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.4
@@ -194,19 +196,18 @@ libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
+%%PORTDOCS%%%%DATADIR%%/doc/AUTHORS
+%%PORTDOCS%%%%DATADIR%%/doc/COPYING
+%%PORTDOCS%%%%DATADIR%%/doc/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/doc/Dot.ref
+%%PORTDOCS%%%%DATADIR%%/doc/NEWS
+%%PORTDOCS%%%%DATADIR%%/doc/cpl1.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/doc/latex_suggestions.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/html/arrows.html
 %%PORTDOCS%%%%DOCSDIR%%/html/build.html
 %%PORTDOCS%%%%DOCSDIR%%/html/char.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/winbuild.html
-%%PORTDOCS%%%%DOCSDIR%%/html/attrs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/colors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/command.html
-%%PORTDOCS%%%%DOCSDIR%%/html/grammar.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lang.html
-%%PORTDOCS%%%%DOCSDIR%%/html/output.html
-%%PORTDOCS%%%%DOCSDIR%%/html/shapes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Mcircle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Mdiamond.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/Msquare.gif
@@ -359,6 +360,7 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neato.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neatoguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/nop.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/osage.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/pathplan.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/prune.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/sccmap.1.pdf
@@ -368,12 +370,6 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/cpl1.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/Dot.ref
-%%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl
@@ -530,6 +526,7 @@ libdata/pkgconfig/libgvc.pc
 @exec mkdir -p %D/lib/graphviz/ocaml
 @exec mkdir -p %D/lib/graphviz/perl
 @exec mkdir -p %D/lib/graphviz/php
+@exec mkdir -p %D/lib/graphviz/python26
 @exec mkdir -p %D/lib/graphviz/python25
 @exec mkdir -p %D/lib/graphviz/python24
 @exec mkdir -p %D/lib/graphviz/python23
@@ -548,6 +545,7 @@ libdata/pkgconfig/libgvc.pc
 @dirrm lib/graphviz/ocaml
 @dirrm lib/graphviz/perl
 @dirrm lib/graphviz/php
+@dirrm lib/graphviz/python26
 @dirrm lib/graphviz/python25
 @dirrm lib/graphviz/python24
 @dirrm lib/graphviz/python23
@@ -570,6 +568,7 @@ libdata/pkgconfig/libgvc.pc
 @dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pathplan_data
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%