graphics/graphviz: update to 2.50.0

5 files changed, 26 insertions, 266 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 7713ae3701ae..0861ce716c38 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,10 +1,10 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 
 PORTNAME=	graphviz
-PORTVERSION=	2.44.1
-PORTREVISION=	18
+PORTVERSION=	2.50.0
+PORTREVISION=	0
 CATEGORIES=	graphics tk
-MASTER_SITES=	https://www2.graphviz.org/Packages/stable/portable_source/
+MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
+		libharfbuzz.so:print/harfbuzz \
 		libgd.so:${GD_PORT}
 
 USES=		compiler:c++11-lang cpe pathfix shebangfix gmake bison \
@@ -92,8 +93,8 @@ SMYRNA_USES=	gnome gl
 SMYRNA_USE=	GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl
 GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
+PHP_USES=	php:build gnome
 PHP_USE=	GNOME=libxml2
-PHP_USES=	php:build
 PYTHON_USES=	python:build
 RUBY_USE=	RUBY=yes
 LUA_USES=	lua
@@ -115,6 +116,7 @@ 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
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index fad994b05c48..33c0739e044c 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593765781
-SHA256 (graphviz-2.44.1.tar.gz) = 8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313
-SIZE (graphviz-2.44.1.tar.gz) = 34079677
+TIMESTAMP = 1644233149
+SHA256 (graphviz-2.50.0.tar.gz) = e17021a510bbd2770d4ca4b4eb841138122aaa5948f9e617e6bc12b4bac62e8d
+SIZE (graphviz-2.50.0.tar.gz) = 29761610
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
index f75fb65fe723..53127279d68a 100644
--- a/graphics/graphviz/files/patch-configure.ac
+++ b/graphics/graphviz/files/patch-configure.ac
@@ -1,15 +1,15 @@
---- configure.ac.orig	2020-06-29 08:47:18 UTC
+--- configure.ac.orig	2021-12-04 20:10:28 UTC
 +++ configure.ac
-@@ -742,7 +742,7 @@ else
-       if test "x$GUILE" = "x"; then
+@@ -679,7 +679,7 @@ else
+       if test "x$GUILE_CONFIG" = "x"; then
          use_guile="No (guile not available)"
        else
--        [GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`]
-+        [GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`]
+-        [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`]
++        [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`]
          GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
          GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
-         if test 0$GUILE_VERSION_MAJOR -lt 2; then
-@@ -972,17 +972,17 @@ else
+         AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile)
+@@ -897,17 +897,17 @@ else
              if test "x$PKG_CONFIG" != "x"; then
  	        AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
  	        echo
@@ -30,16 +30,7 @@
  		           LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
  		        fi
                          break
-@@ -1271,7 +1271,7 @@ else
- 	use_python="No (python is too old)"
-       else
-         PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
--        PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
-+        PYTHON_INCLUDES=-I$PYTHON_INCLUDEDIR
- #        PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
- 	PYTHON_LIBS="-undefined dynamic_lookup"
-         PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
-@@ -1502,6 +1502,7 @@ else
+@@ -1324,6 +1324,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-vmalloc-vmhdr.h b/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h
deleted file mode 100644
index 6ada9530cae1..000000000000
--- a/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/vmalloc/vmhdr.h.orig	2019-09-12 02:11:30 UTC
-+++ lib/vmalloc/vmhdr.h
-@@ -20,6 +20,10 @@ extern "C" {
- #ifndef _BLD_vmalloc
- #define _BLD_vmalloc	1
- #endif
-+#if defined(__FreeBSD__) && (defined(__aarch64__) || defined(__riscv))
-+/* No sbrk on FreeBSD/AArch64 or FreeBSD/RISC-V */
-+#define _BLD_INSTRUMENT	1
-+#endif
- #ifdef _WIN32
- #include <io.h>
- #endif
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 9031c9239a46..7dea44d9e971 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -307,175 +307,14 @@ man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/char.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gdtclft.entities.example.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/Mcircle.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/Mdiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/Msquare.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_box.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_crow.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_diamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_dot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_ediamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_empty.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_forward.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_halfopen.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_inv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_invdot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_invempty.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_invodot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_lteeoldiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_nohead.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_none.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_normal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_obox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_odiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_odot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_open.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/a_tee.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_box.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_crow.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_diamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_dot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_inv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_lbox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_lcrow.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_ldiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_linv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_lnormal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_ltee.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_lvee.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_none.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_normal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_obox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_odiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_odot.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_oinv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_olbox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_oldiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_olinv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_olnormal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_onormal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_orbox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_ordiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_orinv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_ornormal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rbox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rcrow.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rdiamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rinv.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rnormal.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rtee.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_rvee.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_tee.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/aa_vee.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/info/arrows.html
 %%PORTDOCS%%%%DOCSDIR%%/html/info/attrs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/back.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/both.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/box.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/box3d.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_bold.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_dashed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_dotted.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_filled.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_rounded.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_solid.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/c_striped.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/circle.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/colorlist.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/info/colors.html
 %%PORTDOCS%%%%DOCSDIR%%/html/info/command.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/component.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/constraint.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/cylinder.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/diamond.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/doublecircle.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/doubleoctagon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/e_bold.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/e_dashed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/e_dotted.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/e_solid.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/egg.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/ellipse.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/fill.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/folder.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/forward.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_lin0.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_lin180.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_lin270.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_lin360.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_lin45.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_lin90.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_rad0.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_rad180.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_rad270.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_rad360.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_rad45.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/g_rad90.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/hexagon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/house.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html1.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html2.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html2.gv
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html3.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html3.gv
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html4.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/html4.gv
 %%PORTDOCS%%%%DOCSDIR%%/html/info/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/invhouse.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/invtrapezium.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/invtriangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/info/lang.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/mrecord.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_bold.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_dashed.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_diagonals.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_dotted.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_filled.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_rounded.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_solid.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_striped.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/n_wedged.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/nohead.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/none.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/none_back.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/none_both.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/none_forward.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/none_none.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/normal_back.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/normal_both.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/normal_forward.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/normal_none.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/note.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/octagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/info/output.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/oval.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/parallelogram.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/pentagon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/plain.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/plaintext.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/plugins.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/point.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/polygon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/record.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/record2.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/rect.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/rectangle.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/round.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/sdlshapes.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/septagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/info/shapes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/info/spline_curved.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/spline_line.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/spline_none.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/spline_ortho.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/spline_polyline.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/spline_spline.png
-%%PORTDOCS%%%%DOCSDIR%%/html/info/square.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/tab.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/trapezium.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/triangle.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/tripleoctagon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/info/underline.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/internal_todo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pspdf.png
 %%PORTDOCS%%%%DOCSDIR%%/html/schema/arguments.xml
@@ -486,71 +325,12 @@ man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/winbuild.html
 %%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
-%%PORTDOCS%%%%DOCSDIR%%/pdf/cdt.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/cgraph.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/circo.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/cluster.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/diffimg.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dijkstra.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dot.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dot2gxl.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dotguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dotty.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dottyguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/edgepaint.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/expr.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gc.1.pdf
-%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.3tcl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gml2gv.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/graphml2gv.1.pdf
-%%GO%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3go.pdf
-%%GUILE%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
-%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3lua.pdf
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3perl.pdf
-%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3php.pdf
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3python.pdf
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3ruby.pdf
-%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3tcl.pdf
-@comment %%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gml.1.pdf
-@comment %%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gxl.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvgen.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvmap.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvmap.sh.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2dot.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2gv.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/lefty.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.pdf
+%%XPM%%%%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/libguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/lneato.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/mingle.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/mm2gv.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/neato.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neatoguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/nop.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/osage.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/pack.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/patchwork.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/pathplan.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/prune.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/sccmap.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/sfdp.1.pdf
-%%SMYRNA%%%%PORTDOCS%%%%DOCSDIR%%/pdf/smyrna.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/smyrna.pdf
-%%TCL%%%%PORTDOCS%%%%DOCSDIR%%/pdf/tcldot.3tcl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/tred.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/vimdot.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/xdot.3.pdf
+%%SMYRNA%%%%PORTDOCS%%%%DOCSDIR%%/pdf/smyrna.pdf
 %%TCL%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl
 %%TCL%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl.README
 %%TCL%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.html
@@ -677,18 +457,18 @@ man/man7/graphviz.7.gz
 %%DATADIR%%/gvpr/span
 %%DATADIR%%/gvpr/topon
 %%DATADIR%%/gvpr/treetoclust
-%%DATADIR%%/lefty/box.lefty
-%%DATADIR%%/lefty/def.lefty
+%%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
-%%DATADIR%%/lefty/fractal.lefty
-%%DATADIR%%/lefty/fractal2.lefty
-%%DATADIR%%/lefty/lefty.psp
-%%DATADIR%%/lefty/slides.lefty
-%%DATADIR%%/lefty/tree.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