graphics/graphviz: update to 7.1.0

12 files changed, 134 insertions, 188 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 8482acaa59a1..ea8b414c7e36 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	graphviz
-PORTVERSION=	2.50.0
-PORTREVISION=	18
+PORTVERSION=	7.1.0
+PORTREVISION=	0
 CATEGORIES=	graphics tk
 MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/
 
@@ -44,8 +44,7 @@ PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 FIX_INCLUDE=	lib/cdt/dthdr.h lib/pathplan/tri.h \
 		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
 		lib/pathplan/vis.h lib/pathplan/vispath.h \
-		lib/common/logic.h lib/common/globals.h \
-		lib/gvc/gvcint.h
+		lib/common/globals.h lib/gvc/gvcint.h
 FIX_TCL_SCRIPT=	tclpkg/gdtclft/demo/entities.tcl \
 		tclpkg/tcldot/demo/gcat.tcl
 FIX_TK_SCRIPT=	tclpkg/tcldot/demo/doted.tcl \
@@ -95,6 +94,7 @@ GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
 PHP_USES=	php:build gnome
 PHP_USE=	GNOME=libxml2
+PHP_BROKEN=	needs swig 4.2.0
 PYTHON_USES=	python:build
 RUBY_USES=	ruby
 LUA_USES=	lua
@@ -116,7 +116,6 @@ GHOSTSCRIPT_LIB_DEPENDS=	libgs.so:print/${_GS_PORT}
 
 XPM_CONFIGURE_WITH=		x
 XPM_CONFIGURE_ENV=		ac_cv_header_sys_inotify_h=no
-XPM_CONFIGURE_ON=		--enable-lefty
 DIGCOLA_CONFIGURE_WITH=		digcola
 IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
 IPSEPCOLA_IMPLIES=		DIGCOLA
@@ -143,12 +142,15 @@ PERL_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.pl
 PHP_CONFIGURE_ENABLE=		php
 PHP_CPPFLAGS=		-I${LOCALBASE}/include/php/Zend
 PHP_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.php
-PYTHON_CONFIGURE_ENABLE=	python
+PYTHON_CONFIGURE_ENABLE=	python3
 PYTHON_LDFLAGS=		"-L${PYTHONBASE}/lib"
 PYTHON_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.py
 PYTHON_CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}"
 RUBY_CONFIGURE_ENABLE=		ruby
-RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
+RUBY_CONFIGURE_ENV=	RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
+			RUBY_CFLAGS="${RUBY_CFLAGS}" \
+			RUBY_LDFLAGS="${RUBY_LDFLAGS}" \
+			RUBY_INSTALL_DIR="${RUBY_SITEARCHLIBDIR}"
 RUBY_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.rb
 LUA_CONFIGURE_ENABLE=		lua
 LUA_CFLAGS=		-I${LUA_INCDIR}
@@ -177,6 +179,7 @@ GD_PORT?=	graphics/gd
 CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
 		--enable-r=no \
+		--with-demos="${EXAMPLESDIR}" \
 		--with-freetype2=yes \
 		--with-libgd \
 		--with-webp \
@@ -186,9 +189,23 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--without-rsvg \
 		--with-qt=no \
 		--disable-io --disable-ocaml --disable-java \
-		--disable-python2 --disable-python3 \
+		--disable-python2 \
 		--disable-sharp
 
+.if ${PORT_OPTIONS:MPYTHON}
+BINARY_ALIAS+=	python3=${PYTHON_CMD}
+.endif
+
+.if ${PORT_OPTIONS:MRUBY}
+RUBY_CFLAGS+=	-I "${LOCALBASE}/include/ruby-${RUBY_VER}/" \
+		-I "${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}"
+.if exists(${LOCALBASE}/bin/ruby${RUBY_SHLIBVER})
+RUBY_LIBS!=	${LOCALBASE}/bin/ruby${RUBY_SHLIBVER} \
+		-r rbconfig -e "print RbConfig::CONFIG[ 'LIBS' ]"
+RUBY_LDFLAGS+=	${RUBY_LIBS}
+.endif
+.endif
+
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=	--with-iconvlibdir=${ICONV_PREFIX}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${ICONV_PREFIX}/include
@@ -214,21 +231,12 @@ post-patch:
 	${REINPLACE_CMD} \
 		-e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \
 		-e 's|LUA_INSTALL_DIR=.*|LUA_INSTALL_DIR="${LUA_MODLIBDIR}"|' \
+		-e 's| vendorarchdir| sitearchdir|' \
 		${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
 	${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \
 		${WRKSRC}/lib/sfio/*.[ch]
-	${FIND} ${WRKSRC} -name Makefile.am | \
-		${XARGS} ${REINPLACE_CMD} \
-		-e 's| $$(pkgdatadir)/doc/pdf| ${DOCSDIR}/pdf|' \
-		-e 's| $$(pkgdatadir)/doc/html/schema| ${DOCSDIR}/html/schema|' \
-		-e 's| $$(pkgdatadir)/doc/html/info| ${DOCSDIR}/html/info|' \
-		-e 's| $$(pkgdatadir)/doc/html| ${DOCSDIR}/html|' \
-		-e 's| $$(pkgdatadir)/doc| ${DOCSDIR}|' \
-		-e 's| $$(pkgdatadir)/demo| ${EXAMPLESDIR}|' \
-		-e 's| $$(datadir)/@PACKAGE@/demo| ${EXAMPLESDIR}|';
-	${CP} ${FILESDIR}/version.m4 ${WRKSRC}/version.m4
 	cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|exec tclsh |exec tclsh${TCL_VER} |' ${FIX_TCL_SCRIPT}
 	cd ${WRKSRC} && ${REINPLACE_CMD} \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 33c0739e044c..c8443fd0aaf5 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644233149
-SHA256 (graphviz-2.50.0.tar.gz) = e17021a510bbd2770d4ca4b4eb841138122aaa5948f9e617e6bc12b4bac62e8d
-SIZE (graphviz-2.50.0.tar.gz) = 29761610
+TIMESTAMP = 1675260031
+SHA256 (graphviz-7.1.0.tar.gz) = 695ef30a9d3b022e40a791ca1befd917eff640171abb17a2b79367a28aa26876
+SIZE (graphviz-7.1.0.tar.gz) = 27565398
diff --git a/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1 b/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1
index 8cac53969034..9b6523c4311f 100644
--- a/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1
+++ b/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1
@@ -1,4 +1,4 @@
---- cmd/gvpr/gvpr.1.orig	2016-08-09 21:02:09 UTC
+--- cmd/gvpr/gvpr.1.orig	2023-01-21 19:59:25 UTC
 +++ cmd/gvpr/gvpr.1
 @@ -3,6 +3,15 @@
  .  ns
diff --git a/graphics/graphviz/files/patch-cmd_tools_gvpack.1 b/graphics/graphviz/files/patch-cmd_tools_gvpack.1
index 4fdc63b8cea7..f6b18a0fd2bd 100644
--- a/graphics/graphviz/files/patch-cmd_tools_gvpack.1
+++ b/graphics/graphviz/files/patch-cmd_tools_gvpack.1
@@ -1,4 +1,4 @@
---- cmd/tools/gvpack.1.orig	2016-08-09 21:02:10 UTC
+--- cmd/tools/gvpack.1.orig	2023-01-21 19:59:25 UTC
 +++ cmd/tools/gvpack.1
 @@ -1,3 +1,12 @@
 +.de EX
diff --git a/graphics/graphviz/files/patch-config_config_ruby.rb b/graphics/graphviz/files/patch-config_config_ruby.rb
deleted file mode 100644
index ed6368c99a27..000000000000
--- a/graphics/graphviz/files/patch-config_config_ruby.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- config/config_ruby.rb.orig	2019-09-12 02:11:30 UTC
-+++ config/config_ruby.rb
-@@ -5,11 +5,14 @@ CONFIG = RbConfig::MAKEFILE_CONFIG
- 
- case ARGV[0]
- when "archdir"
--    puts RbConfig::expand(CONFIG["archdir"])
-+    puts RbConfig::expand(CONFIG["rubyhdrdir"])
-+when "inc"
-+    print RbConfig::expand(CONFIG["rubyhdrdir"]) + '/'
-+    puts RbConfig::expand(CONFIG["sitearch"])
- when "lib"
-     puts RbConfig::expand(CONFIG["libdir"])
- when "vendorarchdir"
--    puts RbConfig::expand(CONFIG["vendorarchdir"])
-+    puts RbConfig::expand(CONFIG["sitearchdir"])
- when "sitearchdir"
-     puts RbConfig::expand(CONFIG["sitearchdir"])
- when "sitelib"
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
index 53127279d68a..1386b9da5200 100644
--- a/graphics/graphviz/files/patch-configure.ac
+++ b/graphics/graphviz/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2021-12-04 20:10:28 UTC
+--- configure.ac.orig	2023-01-21 19:59:25 UTC
 +++ configure.ac
-@@ -679,7 +679,7 @@ else
+@@ -642,7 +642,7 @@ else
        if test "x$GUILE_CONFIG" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -9,15 +9,14 @@
          GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
          GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
          AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile)
-@@ -897,17 +897,17 @@ else
+@@ -853,16 +853,16 @@ else
              if test "x$PKG_CONFIG" != "x"; then
  	        AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
  	        echo
 -	        for l in "$lua_suffix" "" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" ; do
-+	        for l in "$lua_suffix" "" "53" "-5.3" "52" "-5.2" "51" "-5.1" "50" "5.0" ; do
++	        for l in "$lua_suffix" "" "54" "-5.4" "53" "-5.3" "52" "-5.2" "51" "5.1" "50" "5.0" ; do
  	            pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null`
  	            if test "x$?" = "x0" ; then
- 		        LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
 -                        LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
 +                        LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
@@ -30,7 +29,7 @@
  		           LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
  		        fi
                          break
-@@ -1324,6 +1324,7 @@ else
+@@ -1226,6 +1226,7 @@ else
  	    use_ruby="No (ruby not available)"
            else
              RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
diff --git a/graphics/graphviz/files/patch-lib_expr_exgram.h b/graphics/graphviz/files/patch-lib_expr_exgram.h
index 518f196ede8d..f8ce2aa8f153 100644
--- a/graphics/graphviz/files/patch-lib_expr_exgram.h
+++ b/graphics/graphviz/files/patch-lib_expr_exgram.h
@@ -1,6 +1,6 @@
---- lib/expr/exgram.h.orig	2019-09-12 02:11:30 UTC
+--- lib/expr/exgram.h.orig	2023-01-21 19:59:25 UTC
 +++ lib/expr/exgram.h
-@@ -23,7 +23,7 @@ extern "C" {
+@@ -20,7 +20,7 @@ extern "C" {
   * sometimes free stuff can cost a lot
   */
  
diff --git a/graphics/graphviz/files/patch-lib_expr_expr.h b/graphics/graphviz/files/patch-lib_expr_expr.h
index 8c80866a3fb0..5bfad3b40d05 100644
--- a/graphics/graphviz/files/patch-lib_expr_expr.h
+++ b/graphics/graphviz/files/patch-lib_expr_expr.h
@@ -1,10 +1,10 @@
---- lib/expr/expr.h.orig	2019-09-12 02:11:30 UTC
+--- lib/expr/expr.h.orig	2023-01-21 19:59:25 UTC
 +++ lib/expr/expr.h
-@@ -27,6 +27,7 @@ extern "C" {
+@@ -24,6 +24,7 @@ extern "C" {
  
- #include <ast.h>
+ #include <ast/ast.h>
  #include <inttypes.h>
 +#include <limits.h>
  
- #undef	RS	/* hp.pa <signal.h> grabs this!! */
+ #include <expr/exparse.h>
  
diff --git a/graphics/graphviz/files/patch-lib_ortho_trapezoid.c b/graphics/graphviz/files/patch-lib_ortho_trapezoid.c
deleted file mode 100644
index 6449519e0e96..000000000000
--- a/graphics/graphviz/files/patch-lib_ortho_trapezoid.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/ortho/trapezoid.c.orig	2016-09-20 04:45:02 UTC
-+++ lib/ortho/trapezoid.c
-@@ -30,6 +30,11 @@
- #define log2(x)  (log(x)/log(2))
- #endif
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
-+#define log2(x)  (log(x)/log(2))
-+#endif
-+
- /* Node types */
- 
- #define T_X     1
diff --git a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
index b37b7a4d334d..0fe2a1c4f4f0 100644
--- a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
+++ b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
@@ -1,15 +1,15 @@
---- plugin/xlib/vimdot.sh.orig	2016-12-01 05:43:36 UTC
+--- plugin/xlib/vimdot.sh.orig	2023-01-21 19:59:25 UTC
 +++ plugin/xlib/vimdot.sh
-@@ -5,7 +5,7 @@ error() { echo "$0: $*" >&2; exit 1; }
+@@ -9,7 +9,7 @@ fi
+ error() { echo "$0: $*" >&2; exit 1; }
  
  # Try $EDITOR first, else try vim or vi
- editor="$EDITOR"
--[ -x "$editor" ] || editor="/usr/bin/vim"
-+[ -x "$editor" ] || editor="/usr/local/bin/vim"
+-editor="$(which $EDITOR)" || editor="/usr/bin/vim"
++editor="$(which $EDITOR)" || editor="/usr/local/bin/vim"
  [ -x "$editor" ] || editor="/usr/bin/vi"
  [ -x "$editor" ] || error "EDITOR not found or not executable";
  
-@@ -25,7 +25,7 @@ digraph G {
+@@ -29,7 +29,7 @@ digraph G {
  
  	vim [href="http://www.vim.org/"]
  	dot [href="http://www.graphviz.org/"]
diff --git a/graphics/graphviz/files/version.m4 b/graphics/graphviz/files/version.m4
deleted file mode 100644
index 04a4ec85170f..000000000000
--- a/graphics/graphviz/files/version.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-dnl Graphviz package version number, (as distinct from shared library version)
-dnl For the minor number: odd => unstable series
-dnl                       even => stable series
-dnl For the micro number: 0 => in-progress development
-dnl                       timestamp => tar-file snapshot or release
-m4_define(graphviz_version_major, 2)
-m4_define(graphviz_version_minor, 42)
-m4_define(graphviz_version_micro, 2)
-m4_define(graphviz_collection, development)
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 7dea44d9e971..96acd6d2def6 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -8,7 +8,6 @@ bin/dijkstra
 bin/dot
 bin/dot2gxl
 bin/dot_builtins
-%%XPM%%bin/dotty
 bin/edgepaint
 bin/fdp
 bin/gc
@@ -24,8 +23,6 @@ bin/gvpack
 bin/gvpr
 bin/gxl2dot
 bin/gxl2gv
-%%XPM%%bin/lefty
-%%XPM%%bin/lneato
 %%ANN%%bin/mingle
 bin/mm2gv
 bin/neato
@@ -63,7 +60,6 @@ include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_textlayout.h
 include/graphviz/gvpr.h
-include/graphviz/logic.h
 include/graphviz/pack.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
@@ -145,31 +141,23 @@ lib/graphviz/libgvplugin_webp.so.6.0.0
 %%PHP%%lib/graphviz/php/gv.so
 %%PHP%%lib/graphviz/php/libgv_php.la
 %%PHP%%lib/graphviz/php/libgv_php.so
-%%PYTHON%%lib/graphviz/python/_gv.so
-%%PYTHON%%lib/graphviz/python/gv.py
-%%PYTHON%%lib/graphviz/python/libgv_python.la
-%%PYTHON%%lib/graphviz/python/libgv_python.so
+%%PYTHON%%lib/graphviz/python3/_gv.so
+%%PYTHON%%lib/graphviz/python3/gv.py
+%%PYTHON%%lib/graphviz/python3/libgv_python3.la
+%%PYTHON%%lib/graphviz/python3/libgv_python3.so
 %%RUBY%%lib/graphviz/ruby/gv.so
 %%RUBY%%lib/graphviz/ruby/libgv_ruby.la
 %%RUBY%%lib/graphviz/ruby/libgv_ruby.so
 %%TCL%%lib/graphviz/tcl/libgdtclft.la
 %%TCL%%lib/graphviz/tcl/libgdtclft.so
-%%TCL%%lib/graphviz/tcl/libgdtclft.so.0
-%%TCL%%lib/graphviz/tcl/libgdtclft.so.0.0.0
 %%TCL%%lib/graphviz/tcl/libgv_tcl.la
 %%TCL%%lib/graphviz/tcl/libgv_tcl.so
 %%TCL%%lib/graphviz/tcl/libtcldot.la
 %%TCL%%lib/graphviz/tcl/libtcldot.so
-%%TCL%%lib/graphviz/tcl/libtcldot.so.0
-%%TCL%%lib/graphviz/tcl/libtcldot.so.0.0.0
 %%TCL%%lib/graphviz/tcl/libtcldot_builtin.la
 %%TCL%%lib/graphviz/tcl/libtcldot_builtin.so
-%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
-%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0.0.0
 %%TCL%%lib/graphviz/tcl/libtclplan.la
 %%TCL%%lib/graphviz/tcl/libtclplan.so
-%%TCL%%lib/graphviz/tcl/libtclplan.so.0
-%%TCL%%lib/graphviz/tcl/libtclplan.so.0.0.0
 %%TCL%%lib/graphviz/tcl/pkgIndex.tcl
 lib/libcdt.la
 lib/libcdt.so
@@ -208,22 +196,14 @@ lib/libxdot.so.4.0.0
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/pkgIndex.tcl
 @postexec %D/bin/dot -c
 @postunexec rm -f %D/lib/graphviz/config6
@@ -243,7 +223,6 @@ man/man1/diffimg.1.gz
 man/man1/dijkstra.1.gz
 man/man1/dot.1.gz
 man/man1/dot2gxl.1.gz
-%%XPM%%man/man1/dotty.1.gz
 man/man1/edgepaint.1.gz
 man/man1/fdp.1.gz
 man/man1/gc.1.gz
@@ -259,8 +238,6 @@ man/man1/gvpack.1.gz
 man/man1/gvpr.1.gz
 man/man1/gxl2dot.1.gz
 man/man1/gxl2gv.1.gz
-%%XPM%%man/man1/lefty.1.gz
-%%XPM%%man/man1/lneato.1.gz
 %%ANN%%man/man1/mingle.1.gz
 man/man1/mm2gv.1.gz
 man/man1/neato.1.gz
@@ -274,7 +251,7 @@ man/man1/sfdp.1.gz
 man/man1/tred.1.gz
 man/man1/twopi.1.gz
 man/man1/unflatten.1.gz
-man/man1/vimdot.1.gz
+%%PANGOCAIRO%%man/man1/vimdot.1.gz
 man/man3/cdt.3.gz
 man/man3/cgraph.3.gz
 man/man3/expr.3.gz
@@ -295,42 +272,93 @@ man/man3/pathplan.3.gz
 man/man3/xdot.3.gz
 man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Agraph.pdf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Dot.ref
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/addingLayout.txt
+%%PORTDOCS%%%%DOCSDIR%%/acyclic.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/bcomps.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/build.html
+%%PORTDOCS%%%%DOCSDIR%%/ccomps.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cdt.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgraph.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/char.html
+%%PORTDOCS%%%%DOCSDIR%%/circo.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cluster.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/cpl1.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/fontfaq.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/html/build.html
-%%PORTDOCS%%%%DOCSDIR%%/html/char.html
-%%PORTDOCS%%%%DOCSDIR%%/html/gdtclft.entities.example.png
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/arrows.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/attrs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/colors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/command.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/lang.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/output.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/shapes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/internal_todo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pspdf.png
-%%PORTDOCS%%%%DOCSDIR%%/html/schema/arguments.xml
-%%PORTDOCS%%%%DOCSDIR%%/html/schema/attributes.xml
-%%PORTDOCS%%%%DOCSDIR%%/html/schema/attributes.xslt
-%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/html/tcldot.html
-%%PORTDOCS%%%%DOCSDIR%%/html/todo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/winbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/diffimg.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/dijkstra.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/dot.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/dot2gxl.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/dotguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/edgepaint.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/expr.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/fdp.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gc.1.pdf
+%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/gdtclft.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gdtclft.entities.example.png
+%%PORTDOCS%%%%DOCSDIR%%/gml2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/graphml2gv.1.pdf
+%%GO%%%%PORTDOCS%%%%DOCSDIR%%/gv.3go.pdf
+%%GUILE%%%%PORTDOCS%%%%DOCSDIR%%/gv.3guile.pdf
+%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/gv.3lua.pdf
+%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/gv.3perl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gv.3python.pdf
+%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/gv.3ruby.pdf
+%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/gv.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gv2gml.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gv2gxl.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvc.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvcolor.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvgen.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvmap.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvmap.sh.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvpack.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvpr.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvpr.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gxl2dot.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gxl2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/info/arrows.html
+%%PORTDOCS%%%%DOCSDIR%%/info/attrs.html
+%%PORTDOCS%%%%DOCSDIR%%/info/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/info/command.html
+%%PORTDOCS%%%%DOCSDIR%%/info/index.html
+%%PORTDOCS%%%%DOCSDIR%%/info/lang.html
+%%PORTDOCS%%%%DOCSDIR%%/info/output.html
+%%PORTDOCS%%%%DOCSDIR%%/info/shapes.html
+%%PORTDOCS%%%%DOCSDIR%%/internal_todo.html
 %%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
-%%PORTDOCS%%%%DOCSDIR%%/pdf/Agraph.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dotguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dottyguide.pdf
-%%XPM%%%%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/libguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/neatoguide.pdf
-%%SMYRNA%%%%PORTDOCS%%%%DOCSDIR%%/pdf/smyrna.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libguide.pdf
+%%ANN%%%%PORTDOCS%%%%DOCSDIR%%/mingle.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/mm2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/neato.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/neatoguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/nop.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/osage.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pack.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/patchwork.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pathplan.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/prune.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pspdf.png
+%%PORTDOCS%%%%DOCSDIR%%/sccmap.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/schema/arguments.xml
+%%PORTDOCS%%%%DOCSDIR%%/schema/attributes.xml
+%%PORTDOCS%%%%DOCSDIR%%/schema/attributes.xslt
+%%PORTDOCS%%%%DOCSDIR%%/sfdp.1.pdf
+%%SMYRNA%%%%PORTDOCS%%%%DOCSDIR%%/smyrna.1.pdf
+%%SMYRNA%%%%PORTDOCS%%%%DOCSDIR%%/smyrna.pdf
+%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/tcldot.3tcl.pdf
+%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/tcldot.html
+%%PORTDOCS%%%%DOCSDIR%%/todo.html
+%%PORTDOCS%%%%DOCSDIR%%/tred.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/twopi.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/unflatten.1.pdf
+%%PANGOCAIRO%%%%PORTDOCS%%%%DOCSDIR%%/vimdot.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/winbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/xdot.3.pdf
 %%TCL%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl
 %%TCL%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl.README
 %%TCL%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.html
@@ -457,70 +485,25 @@ man/man7/graphviz.7.gz
 %%DATADIR%%/gvpr/span
 %%DATADIR%%/gvpr/topon
 %%DATADIR%%/gvpr/treetoclust
-%%XPM%%%%DATADIR%%/lefty/box.lefty
-%%XPM%%%%DATADIR%%/lefty/def.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_draw.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_edit.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_layout.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_ui.lefty
-%%XPM%%%%DATADIR%%/lefty/fractal.lefty
-%%XPM%%%%DATADIR%%/lefty/fractal2.lefty
-%%XPM%%%%DATADIR%%/lefty/lefty.psp
-%%XPM%%%%DATADIR%%/lefty/slides.lefty
-%%XPM%%%%DATADIR%%/lefty/tree.lefty
 %%SMYRNA%%%%DATADIR%%/smyrna/2D.png
 %%SMYRNA%%%%DATADIR%%/smyrna/3D.png
-%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
-%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
-%%SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
 %%SMYRNA%%%%DATADIR%%/smyrna/arial.tga
 %%SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
 %%SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
 %%SMYRNA%%%%DATADIR%%/smyrna/center.png
 %%SMYRNA%%%%DATADIR%%/smyrna/cursor.png
-%%SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
 %%SMYRNA%%%%DATADIR%%/smyrna/details.png
-%%SMYRNA%%%%DATADIR%%/smyrna/dot.PNG
-%%SMYRNA%%%%DATADIR%%/smyrna/edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/find_node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
 %%SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
 %%SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/fit.png
 %%SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
-%%SMYRNA%%%%DATADIR%%/smyrna/glade-3.png
-%%SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
-%%SMYRNA%%%%DATADIR%%/smyrna/lcirco.png
-%%SMYRNA%%%%DATADIR%%/smyrna/ldot.png
-%%SMYRNA%%%%DATADIR%%/smyrna/lfdp.png
-%%SMYRNA%%%%DATADIR%%/smyrna/lneato.png
-%%SMYRNA%%%%DATADIR%%/smyrna/ltwopi.png
-%%SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
-%%SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
-%%SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
 %%SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
 %%SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
 %%SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
 %%SMYRNA%%%%DATADIR%%/smyrna/move.png
 %%SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
-%%SMYRNA%%%%DATADIR%%/smyrna/new_node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
 %%SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
-%%SMYRNA%%%%DATADIR%%/smyrna/node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/ok.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
 %%SMYRNA%%%%DATADIR%%/smyrna/pan.png
 %%SMYRNA%%%%DATADIR%%/smyrna/pan.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/preview.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rotate.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/select.png
 %%SMYRNA%%%%DATADIR%%/smyrna/selectr.png
 %%SMYRNA%%%%DATADIR%%/smyrna/selectx.png
 %%SMYRNA%%%%DATADIR%%/smyrna/single_select.png
@@ -531,7 +514,5 @@ man/man7/graphviz.7.gz
 %%SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
 %%SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
 %%SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
 %%SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
 %%PHP%%share/php/gv.php