Re: UPDATE: math/graphviz

On Sat Jul 28, 2018 at 01:15:11PM -0400, Stuart Cassoff wrote:
> > ---------- Original Message ----------
> > From: Rafael Sadowski <rafael@sizeofvoid.org>
> > Date: July 28, 2018 at 12:59 PM
> >
> >
> > Hi All!
> >
> > First try to update graphviz. The tests look ok and runtime test with
> > x11/kde-applications/umbrello too.
> >
> > My main concern DISTNAME. That's not nice, any ideas?
> > TK is gone.
>
> Forever? Is it a separate thing now that can maybe be another port?
>
> More importantly, could you please try this with
> MODTCL_VERSION=8.6
>
>
> Thanks,
>
> Stu
>

No visual issues with 8.6.

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/graphviz/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile 14 Nov 2017 20:10:11 -0000 1.72
+++ Makefile 30 Jul 2018 04:35:16 -0000
@@ -2,9 +2,9 @@

COMMENT-main= graph drawing software

-DISTNAME= graphviz-2.36.0
-REVISION= 11
-PKGNAME-main= ${DISTNAME}
+VERSION = 2.40.1
+DISTNAME= graphviz
+PKGNAME-main= ${DISTNAME}-${VERSION}
CATEGORIES= math devel graphics

# there is only one multi-package due to legacy, but maybe more
@@ -16,17 +16,18 @@ PATCHORIG= .orig2

MASTER_SITES= ${HOMEPAGE}pub/graphviz/ARCHIVE/

-SHARED_LIBS += gvplugin_core 1.0 # 6.0
-SHARED_LIBS += gvplugin_gd 1.0 # 6.0
-SHARED_LIBS += gvplugin_pango 1.0 # 6.0
-SHARED_LIBS += gvplugin_dot_layout 1.0 # 6.0
-SHARED_LIBS += gvplugin_neato_layout 1.0 # 6.0
-SHARED_LIBS += gvplugin_xlib 1.0 # 6.0
-SHARED_LIBS += gvplugin_gtk 1.0 # 6.0
-SHARED_LIBS += gvplugin_rsvg 0.0 # 6.0
-SHARED_LIBS += gvplugin_gdk 0.0 # 6.0
-SHARED_LIBS += gvplugin_poppler 0.0 # 6.0
+SHARED_LIBS += gvplugin_core 2.0 # 6.0
+SHARED_LIBS += gvplugin_gd 2.0 # 6.0
+SHARED_LIBS += gvplugin_pango 2.0 # 6.0
+SHARED_LIBS += gvplugin_dot_layout 2.0 # 6.0
+SHARED_LIBS += gvplugin_neato_layout 2.0 # 6.0
+SHARED_LIBS += gvplugin_xlib 2.0 # 6.0
+SHARED_LIBS += gvplugin_gtk 2.0 # 6.0
+SHARED_LIBS += gvplugin_rsvg 1.0 # 6.0
+SHARED_LIBS += gvplugin_gdk 1.0 # 6.0
+SHARED_LIBS += gvplugin_poppler 1.0 # 6.0

+SHARED_LIBS += lab_gamut 0.0 # 1.0
SHARED_LIBS += cdt 1.0 # 5.0
SHARED_LIBS += pathplan 2.0 # 4.0
SHARED_LIBS += gvc 1.0 # 6.0
@@ -37,27 +38,29 @@ SHARED_LIBS += gdtclft 3.0 # unknown
SHARED_LIBS += tcldot 3.0 # unknown
SHARED_LIBS += tcldot_builtin 3.0 # unknown
SHARED_LIBS += tclplan 3.0 # unknown
-SHARED_LIBS += tkspline 3.0 # unknown

-HOMEPAGE= http://www.graphviz.org/
+HOMEPAGE= https://www.graphviz.org/

MAINTAINER = Edd Barrett <edd@openbsd.org>

# Eclipse Public License v1.0
PERMIT_PACKAGE_CDROM= Yes

-WANTLIB += ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp
-WANTLIB += Xext Xfixes Xft Xi Xinerama Xmu Xpm Xrandr Xrender
-WANTLIB += Xss Xt atk-1.0 c cairo croco-0.6 expat ffi fontconfig
-WANTLIB += freetype gd gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gmp gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
-WANTLIB += guile harfbuzz iconv intl jpeg lcms2 ltdl lzma m openjp2 pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1 png
-WANTLIB += poppler poppler-glib pthread rsvg-2 ${COMPILER_LIBCXX}
-WANTLIB += tiff tk85 webp xcb xcb-render xcb-shm xml2 z
+WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xaw Xcomposite Xcursor
+WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xmu Xpm Xrandr
+WANTLIB += Xrender Xt atk-1.0 c cairo croco-0.6 expat ffi fontconfig
+WANTLIB += freetype fribidi gd gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gmp gobject-2.0 graphite2 gthread-2.0
+WANTLIB += gtk-x11-2.0 guile harfbuzz iconv intl jpeg lcms2 ltdl
+WANTLIB += lzma m openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre perl pixman-1 png poppler poppler-glib rsvg-2
+WANTLIB += tiff webp xcb xcb-render xcb-shm xml2 z

MODULES= x11/tk \
perl
+
+MODTCL_VERSION= 8.6
+
LIB_DEPENDS = graphics/jpeg \
graphics/png \
devel/libtool,-ltdl \
@@ -68,20 +71,22 @@ LIB_DEPENDS = graphics/jpeg \
graphics/graphite2 \
devel/harfbuzz \
print/poppler \
- lang/guile \
- ${MODTK_LIB_DEPENDS}
-BUILD_DEPENDS= devel/swig
-TEST_DEPENDS = ${FULLPKGNAME}:math/graphviz
+ lang/guile
+
+BUILD_DEPENDS= devel/swig \
+ ${MODTCL_BUILD_DEPENDS}
+
+RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}

USE_GMAKE = Yes
-USE_GROFF = Yes
+
CONFIGURE_STYLE=gnu
+
# Note: --with-tclsh is misspelled "--with-tcl" in configure's help output
CONFIGURE_ARGS= --enable-tcl=yes \
--enable-perl \
--enable-guile \
--with-tclsh=${MODTCL_BIN} \
- --with-wish=${MODTK_BIN} \
--disable-lua \
--disable-io \
--disable-java \
@@ -102,14 +107,12 @@ CONFIGURE_ARGS= --enable-tcl=yes \

CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
- TCLCONFIG=${MODTCL_CONFIG} \
- TKCONFIG=${MODTK_CONFIG}
+ TCLCONFIG=${MODTCL_CONFIG}

DOCBASE= ${PREFIX}/share/doc/graphviz
EXBASE= ${PREFIX}/share/examples/graphviz

-MAKE_FLAGS= TCL_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltclstub85_pic' \
- TK_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltkstub85_pic'
+MAKE_FLAGS= TCL_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltclstub86_pic'

CFLAGS += -DLT_DEBUG_LOADERS

@@ -123,13 +126,11 @@ FAKE_FLAGS= htmldir="${DOCBASE}/html" \
undirecteddir="${EXBASE}/graphs/undirected" \
pkgtcldir="${MODTCL_TCLDIR}/graphviz"

-post-build:
-.for CMD in dotty lneato
- echo "#! /bin/ksh" >${WRKBUILD}/cmd/${CMD}/${CMD}
- echo ': $${LEFTYPATH:=$(LOCALBASE)/share/examples/graphviz/lefty}' >>${WRKBUILD}/cmd/${CMD}/${CMD}
- echo 'export LEFTYPATH' >>${WRKBUILD}/cmd/${CMD}/${CMD}
- cat ${WRKBUILD}/cmd/${CMD}/${CMD}.ksh >>${WRKBUILD}/cmd/${CMD}/${CMD}
-.endfor
+TEST_TARGET = check
+TEST_DEPENDS = shells/ksh93 \
+ ${FULLPKGNAME}:math/graphviz
+
+WRKDIST= ${WRKDIR}/${PKGNAME-main}

post-install:
# install pre-generated config6 to avoid @exec/@unexec-delete
@@ -143,16 +144,8 @@ post-install:
ln -s ${TRUEPREFIX}/lib/tcl/graphviz \
${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz

-# Local tests for OpenBSD
-# Can't run built in tests, as requires ksh93 (some specific arguments
-# to the typeset builtin). Currently, there is no port.
-TEST_TMP=${WRKDIR}/test_tmp
-do-test:
- mkdir -p ${TEST_TMP}
- cd ${FILESDIR}/tests && for i in *-test.* run_tests.sh; do \
- ${SUBST_CMD} -m 0644 -c $${i} ${TEST_TMP}/$${i}; \
- done
- cd ${TEST_TMP} && /bin/sh ./run_tests.sh
+pre-test:
+ sed -i s,#!/bin/ksh,#!/${LOCALBASE}/bin/ksh93, ${WRKSRC}/rtest/rtest.sh

# NOTE: When updating this port:
# * Check we have commented .la and .a corresponding to unversioned .so files
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/graphviz/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 6 Feb 2014 17:32:27 -0000 1.7
+++ distinfo 30 Jul 2018 04:35:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (graphviz-2.36.0.tar.gz) = N/1m2N7xWFdcdcT22/U2g55O5GiqWTFOtHLRrssHY2E=
-SIZE (graphviz-2.36.0.tar.gz) = 23846318
+SHA256 (graphviz.tar.gz) = ylIY+t4CBNWZRxJsOEOfQyhTVDsIGNnXKMWJ3+fzpCE=
+SIZE (graphviz.tar.gz) = 25633455
Index: files/config6
===================================================================
RCS file: /cvs/ports/math/graphviz/files/config6,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 config6
--- files/config6 6 Feb 2014 17:32:27 -0000 1.2
+++ files/config6 30 Jul 2018 04:35:16 -0000
@@ -6,125 +6,6 @@

# Manual edits to this file **will be lost** on upgrade.

-libgvplugin_gd.so.${LIBgvplugin_gd_VERSION} gd {
- render {
- gd 1
- }
- render {
- vrml 1
- }
- textlayout {
- textlayout 2
- }
- loadimage {
- gd:gd 1
- gd2:gd 1
- gif:gd 1
- jpeg:gd 1
- jpe:gd 1
- jpg:gd 1
- png:gd 1
- gd:ps 1
-#FAILS gd:lasi 1
- gd2:ps 1
-#FAILS gd2:lasi 1
- gif:ps 1
-#FAILS gif:lasi 1
- jpeg:ps 1
- jpg:ps 1
- jpe:ps 1
-#FAILS jpeg:lasi 1
-#FAILS jpg:lasi 1
-#FAILS jpe:lasi 1
- png:ps 1
-#FAILS png:lasi 1
- gd:cairo 1
- gd2:cairo 1
- gif:cairo 1
- jpeg:cairo 1
- jpg:cairo 1
- jpe:cairo 1
- png:cairo -1
- }
- device {
- gif:cairo 10
- wbmp:cairo 5
- jpe:cairo 5
- jpeg:cairo 5
- jpg:cairo 5
- png:cairo 5
- gd:cairo 5
- gd2:cairo 5
- }
- device {
- gif:gd 1
- wbmp:gd 1
- jpe:gd 1
- jpeg:gd 1
- jpg:gd 1
- png:gd 1
- gd:gd 1
- gd2:gd 1
- }
- device {
- vrml:vrml 1
- }
-}
-libgvplugin_gdk.so.${LIBgvplugin_gdk_VERSION} gdk {
- device {
- bmp:cairo 6
- ico:cairo 6
- jpe:cairo 6
- jpeg:cairo 6
- jpg:cairo 6
- png:cairo 6
- tif:cairo 6
- tiff:cairo 6
- }
- loadimage {
- bmp:cairo 1
- jpe:cairo 2
- jpg:cairo 2
- jpeg:cairo 2
- png:cairo -1
- ico:cairo 1
- }
-}
-libgvplugin_gtk.so.${LIBgvplugin_gtk_VERSION} gtk {
- device {
- gtk:cairo 0
- }
-}
-libgvplugin_pango.so.${LIBgvplugin_pango_VERSION} cairo {
- render {
- cairo 10
- }
- textlayout {
- textlayout 10
- }
- loadimage {
- png:cairo 1
-#FAILS png:lasi 2
- png:ps 2
- }
- device {
- png:cairo 10
- ps:cairo -10
- pdf:cairo 10
- svg:cairo -10
- }
-}
-libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION} poppler {
- loadimage {
- pdf:cairo 1
- }
-}
-libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION} xlib {
- device {
- xlib:cairo 0
- x11:cairo 0
- }
-}
libgvplugin_core.so.${LIBgvplugin_core_VERSION} core {
device {
dot:dot 1
@@ -148,6 +29,9 @@ libgvplugin_core.so.${LIBgvplugin_core_V
cmapx_np:map 1
}
device {
+ mp:mp -1
+ }
+ device {
ps:ps 1
ps2:ps 1
eps:ps 1
@@ -157,6 +41,12 @@ libgvplugin_core.so.${LIBgvplugin_core_V
svgz:svg 1
}
device {
+ json:json 1
+ json0:json 1
+ dot_json:json 1
+ xdot_json:json 1
+ }
+ device {
tk:tk 1
}
device {
@@ -180,12 +70,21 @@ libgvplugin_core.so.${LIBgvplugin_core_V
map 1
}
render {
+ mp -1
+ }
+ render {
ps 1
}
render {
svg 1
}
render {
+ json 1
+ json0 1
+ dot_json 1
+ xdot_json 1
+ }
+ render {
tk 1
}
render {
@@ -254,6 +153,123 @@ libgvplugin_dot_layout.so.${LIBgvplugin_
dot 0
}
}
+libgvplugin_gdk.so.${LIBgvplugin_gdk_VERSION} gdk {
+ device {
+ bmp:cairo 6
+ ico:cairo 6
+ jpe:cairo 6
+ jpeg:cairo 6
+ jpg:cairo 6
+ png:cairo 6
+ tif:cairo 6
+ tiff:cairo 6
+ }
+ loadimage {
+ bmp:cairo 1
+ jpe:cairo 2
+ jpg:cairo 2
+ jpeg:cairo 2
+ png:cairo -1
+ ico:cairo 1
+ }
+}
+libgvplugin_pango.so.${LIBgvplugin_pango_VERSION} cairo {
+ render {
+ cairo 10
+ }
+ textlayout {
+ textlayout 10
+ }
+ loadimage {
+ png:cairo 1
+#FAILS png:lasi 2
+ png:ps 2
+ }
+ device {
+ png:cairo 10
+ ps:cairo -10
+ pdf:cairo 10
+ svg:cairo -10
+ }
+}
+libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION} rsvg {
+ loadimage {
+ svg:cairo 1
+ }
+}
+libgvplugin_gd.so.${LIBgvplugin_gd_VERSION} gd {
+ render {
+ gd 1
+ }
+ render {
+ vrml 1
+ }
+ textlayout {
+ textlayout 2
+ }
+ loadimage {
+ gd:gd 1
+ gd2:gd 1
+ gif:gd 1
+ jpeg:gd 1
+ jpe:gd 1
+ jpg:gd 1
+ png:gd 1
+ xbm:gd 1
+ gd:ps 1
+#FAILS gd:lasi 1
+ gd2:ps 1
+#FAILS gd2:lasi 1
+ gif:ps 1
+#FAILS gif:lasi 1
+ jpeg:ps 1
+ jpg:ps 1
+ jpe:ps 1
+#FAILS jpeg:lasi 1
+#FAILS jpg:lasi 1
+#FAILS jpe:lasi 1
+ png:ps 1
+#FAILS png:lasi 1
+ xbm:ps 1
+#FAILS xbm:lasi 1
+ gd:cairo 1
+ gd2:cairo 1
+ gif:cairo 1
+ jpeg:cairo 1
+ jpg:cairo 1
+ jpe:cairo 1
+ png:cairo -1
+ xbm:cairo 1
+ }
+ device {
+ gif:cairo 10
+ wbmp:cairo 5
+ jpe:cairo 5
+ jpeg:cairo 5
+ jpg:cairo 5
+ png:cairo 5
+ gd:cairo 5
+ gd2:cairo 5
+ }
+ device {
+ gif:gd 1
+ wbmp:gd 1
+ jpe:gd 1
+ jpeg:gd 1
+ jpg:gd 1
+ png:gd 1
+ gd:gd 1
+ gd2:gd 1
+ }
+ device {
+ vrml:vrml 1
+ }
+}
+libgvplugin_gtk.so.${LIBgvplugin_gtk_VERSION} gtk {
+ device {
+ gtk:cairo 0
+ }
+}
libgvplugin_neato_layout.so.${LIBgvplugin_neato_layout_VERSION} neato_layout {
layout {
neato 0
@@ -268,8 +284,14 @@ libgvplugin_neato_layout.so.${LIBgvplugi
nop2 0
}
}
-libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION} rsvg {
+libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION} poppler {
loadimage {
- svg:cairo 1
+ pdf:cairo 1
+ }
+}
+libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION} xlib {
+ device {
+ xlib:cairo 0
+ x11:cairo 0
}
}
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/math/graphviz/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 6 Feb 2014 17:32:27 -0000 1.2
+++ patches/patch-Makefile_in 30 Jul 2018 04:35:16 -0000
@@ -2,13 +2,14 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0

Fix grep syntax.

---- Makefile.in.orig2 Sun Feb 2 17:33:01 2014
-+++ Makefile.in Sun Feb 2 17:33:08 2014
-@@ -1246,7 +1246,7 @@ dist-hook:
- find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -1251,7 +1251,7 @@ doxygen:
+ dist-hook:

$(top_builddir)/graphviz_version.h: config.h
-- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
+- $(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
+ $(GREP) -E '(PACKAGE|VERSION|GVPLUGIN)' config.h > graphviz_version.h

.PHONY: rpm
Index: patches/patch-cmd_dot_Makefile_in
===================================================================
RCS file: /cvs/ports/math/graphviz/patches/patch-cmd_dot_Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-cmd_dot_Makefile_in
--- patches/patch-cmd_dot_Makefile_in 6 Feb 2014 17:32:27 -0000 1.3
+++ patches/patch-cmd_dot_Makefile_in 30 Jul 2018 04:35:16 -0000
@@ -4,9 +4,10 @@ Add pthread linkage or '@exec dot -c' wi
when trying to dlopen(). Not because the file is missing, but because
there is a linker error. Sigh, obvious isn't it?

---- cmd/dot/Makefile.in.orig2 Sun Feb 2 23:23:31 2014
-+++ cmd/dot/Makefile.in Sun Feb 2 23:24:22 2014
-@@ -615,7 +615,8 @@ dot_SOURCES = dot.c no_builtins.c
+Index: cmd/dot/Makefile.in
+--- cmd/dot/Makefile.in.orig
++++ cmd/dot/Makefile.in
+@@ -657,7 +657,8 @@ dot_SOURCES = dot.c no_builtins.c
dot_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
dot_LDADD = \
$(top_builddir)/lib/gvc/libgvc.la \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/graphviz/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 28 Sep 2014 13:44:48 -0000 1.2
+++ patches/patch-configure 30 Jul 2018 04:35:16 -0000
@@ -5,9 +5,10 @@ Do not pick up guile2 until our devel/sw

Fix regex in guile detection.

---- configure.orig2 Sun Jan 12 00:15:44 2014
-+++ configure Sun Sep 28 15:30:06 2014
-@@ -21055,7 +21055,7 @@ else
+Index: configure
+--- configure.orig
++++ configure
+@@ -20909,7 +20909,7 @@ else
if test `$SWIG -help 2>&1 | $EGREP -c '\-guile *- Generate'` = 0; then
use_guile="No (swig does not support -guile option)"
else
@@ -16,7 +17,7 @@ Fix regex in guile detection.
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -21100,7 +21100,7 @@ done
+@@ -20954,7 +20954,7 @@ done
if test "x$GUILE" = "x"; then
use_guile="No (guile not available)"
else
Index: patches/patch-lib_cgraph_scan_l
===================================================================
RCS file: patches/patch-lib_cgraph_scan_l
diff -N patches/patch-lib_cgraph_scan_l
--- patches/patch-lib_cgraph_scan_l 21 Aug 2015 16:06:06 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_cgraph_scan_l,v 1.2 2015/08/21 16:06:06 jasper Exp $
-
-Security fix for CVE-2014-9157, graphviz: format string vulnerability in yyerror()
-https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081.patch
-
---- lib/cgraph/scan.l.orig2 Fri Aug 21 10:25:19 2015
-+++ lib/cgraph/scan.l Fri Aug 21 10:25:42 2015
-@@ -223,7 +223,7 @@ void yyerror(char *str)
- agxbput (&xb, buf);
- agxbput (&xb, yytext);
- agxbput (&xb,"'\n");
-- agerr(AGWARN,agxbuse(&xb));
-+ agerr(AGWARN, "%s", agxbuse(&xb));
- agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
Index: patches/patch-lib_gvc_gvconfig_c
===================================================================
RCS file: /cvs/ports/math/graphviz/patches/patch-lib_gvc_gvconfig_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_gvc_gvconfig_c
--- patches/patch-lib_gvc_gvconfig_c 6 Feb 2014 17:32:27 -0000 1.4
+++ patches/patch-lib_gvc_gvconfig_c 30 Jul 2018 04:35:16 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-lib_gvc_gvconfig_c,v 1.4

Plugin scanner fails to find our libs because we overide lib version.

---- lib/gvc/gvconfig.c.orig2 Sat Jan 11 22:59:44 2014
-+++ lib/gvc/gvconfig.c Sun Feb 2 17:23:25 2014
-@@ -421,6 +421,8 @@ static void config_rescan(GVC_t *gvc, char *config_pat
+Index: lib/gvc/gvconfig.c
+--- lib/gvc/gvconfig.c.orig
++++ lib/gvc/gvconfig.c
+@@ -417,6 +417,8 @@ static void config_rescan(GVC_t *gvc, char *config_pat

#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
sprintf(config_re,"%s%s", plugin_re_beg, plugin_re_end);
Index: patches/patch-tclpkg_tclstubs_Makefile_in
===================================================================
RCS file: /cvs/ports/math/graphviz/patches/patch-tclpkg_tclstubs_Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-tclpkg_tclstubs_Makefile_in
--- patches/patch-tclpkg_tclstubs_Makefile_in 6 Feb 2014 17:32:27 -0000 1.3
+++ patches/patch-tclpkg_tclstubs_Makefile_in 30 Jul 2018 04:35:16 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-tclpkg_tclstubs_Makefile_in,v 1.3 2014/02/06 17:32:27 edd Exp $
---- tclpkg/tclstubs/Makefile.in.orig2 Sun Feb 2 23:24:57 2014
-+++ tclpkg/tclstubs/Makefile.in Sun Feb 2 23:25:20 2014
-@@ -249,7 +249,7 @@ LIBLTDL = @LIBLTDL@
+Index: tclpkg/tclstubs/Makefile.in
+--- tclpkg/tclstubs/Makefile.in.orig
++++ tclpkg/tclstubs/Makefile.in
+@@ -295,7 +295,7 @@ LIBLTDL = @LIBLTDL@
LIBLTDL_LDFLAGS = @LIBLTDL_LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBPOSTFIX = @LIBPOSTFIX@
Index: patches/patch-tclpkg_tkstubs_Makefile_in
===================================================================
RCS file: patches/patch-tclpkg_tkstubs_Makefile_in
diff -N patches/patch-tclpkg_tkstubs_Makefile_in
--- patches/patch-tclpkg_tkstubs_Makefile_in 6 Feb 2014 17:32:27 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tclpkg_tkstubs_Makefile_in,v 1.3 2014/02/06 17:32:27 edd Exp $
---- tclpkg/tkstubs/Makefile.in.orig2 Sun Feb 2 23:25:32 2014
-+++ tclpkg/tkstubs/Makefile.in Sun Feb 2 23:25:49 2014
-@@ -250,7 +250,7 @@ LIBLTDL = @LIBLTDL@
- LIBLTDL_LDFLAGS = @LIBLTDL_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBPOSTFIX = @LIBPOSTFIX@
--LIBS = @TK_STUB_LIB_SPEC@
-+LIBS = $(TK_STUB_LIB_SPEC)
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/math/graphviz/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 DESCR-main
--- pkg/DESCR-main 20 Feb 2007 11:47:07 -0000 1.1
+++ pkg/DESCR-main 30 Jul 2018 04:35:16 -0000
@@ -1,10 +1,8 @@
-graphviz is a set of graph drawing tools for Unix or MS-Windows
-(win32), including a web service interface (webdot). Graph
-drawing addresses the problem of visualizing structural information
-by constructing geometric representations of abstract graphs and
-networks.
+Graphviz is open source graph visualization software. Graph visualization is a
+way of representing structural information as diagrams of abstract graphs and
+networks.

-The goal of graphviz has been twofold:
+The goal of graphviz has been twofold:

to find efficient algorithms for making very readable
drawings of graphs up to several hundreds of nodes,
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/math/graphviz/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 1 Jul 2016 14:25:17 -0000 1.7
+++ pkg/PLIST-main 30 Jul 2018 04:35:16 -0000
@@ -10,6 +10,7 @@ bin/circo
bin/dot2gxl
@bin bin/dot_builtins
bin/dotty
+@bin bin/edgepaint
bin/fdp
@bin bin/gc
@bin bin/gml2gv
@@ -120,6 +121,9 @@ lib/libgvc.la
lib/libgvpr.a
lib/libgvpr.la
@lib lib/libgvpr.so.${LIBgvpr_VERSION}
+lib/liblab_gamut.a
+lib/liblab_gamut.la
+@lib lib/liblab_gamut.so.${LIBlab_gamut_VERSION}
lib/libpathplan.a
lib/libpathplan.la
@lib lib/libpathplan.so.${LIBpathplan_VERSION}
@@ -130,6 +134,7 @@ lib/pkgconfig/libcdt.pc
lib/pkgconfig/libcgraph.pc
lib/pkgconfig/libgvc.pc
lib/pkgconfig/libgvpr.pc
+lib/pkgconfig/liblab_gamut.pc
lib/pkgconfig/libpathplan.pc
lib/pkgconfig/libxdot.pc
lib/tcl/graphviz/
@@ -148,12 +153,9 @@ lib/tcl/graphviz/libtcldot_builtin.la
lib/tcl/graphviz/libtclplan.a
lib/tcl/graphviz/libtclplan.la
@lib lib/tcl/graphviz/libtclplan.so.${LIBtclplan_VERSION}
-lib/tcl/graphviz/libtkspline.a
-lib/tcl/graphviz/libtkspline.la
-@lib lib/tcl/graphviz/libtkspline.so.${LIBtkspline_VERSION}
lib/tcl/graphviz/pkgIndex.tcl
-lib/tcl${MODTK_VERSION}/
-lib/tcl${MODTK_VERSION}/graphviz
+lib/tcl${MODTCL_VERSION}/
+lib/tcl${MODTCL_VERSION}/graphviz
${P5ARCH}/
${P5ARCH}/gv.pm
${P5ARCH}/gv.so
@@ -166,6 +168,7 @@ ${P5ARCH}/gv.so
@man man/man1/dijkstra.1
@man man/man1/dot.1
@man man/man1/dotty.1
+@man man/man1/edgepaint.1
@man man/man1/fdp.1
@man man/man1/gc.1
@man man/man1/gml2gv.1
@@ -181,6 +184,7 @@ ${P5ARCH}/gv.so
@man man/man1/gxl2gv.1
@man man/man1/lefty.1
@man man/man1/lneato.1
+@man man/man1/mingle.1
@man man/man1/mm2gv.1
@man man/man1/neato.1
@man man/man1/nop.1
@@ -189,6 +193,7 @@ ${P5ARCH}/gv.so
@man man/man1/prune.1
@man man/man1/sccmap.1
@man man/man1/sfdp.1
+@man man/man1/smyrna.1
@man man/man1/tred.1
@man man/man1/twopi.1
@man man/man1/unflatten.1
@@ -202,10 +207,10 @@ man/man3/gv.3perl
man/man3/gv.3tcl
@man man/man3/gvc.3
@man man/man3/gvpr.3
+@man man/man3/lab_gamut.3
@man man/man3/pack.3
@man man/man3/pathplan.3
man/man3/tcldot.3tcl
-man/man3/tkspline.3tk
@man man/man3/xdot.3
@man man/man7/graphviz.7
share/doc/graphviz/
@@ -300,6 +305,7 @@ share/doc/graphviz/html/colors.html
share/doc/graphviz/html/command.html
share/doc/graphviz/html/component.gif
share/doc/graphviz/html/constraint.gif
+share/doc/graphviz/html/cylinder.gif
share/doc/graphviz/html/diamond.gif
share/doc/graphviz/html/doublecircle.gif
share/doc/graphviz/html/doubleoctagon.gif
@@ -335,6 +341,7 @@ share/doc/graphviz/html/html3.gv
share/doc/graphviz/html/html4.gif
share/doc/graphviz/html/html4.gv
share/doc/graphviz/html/index.html
+share/doc/graphviz/html/internal_todo.html
share/doc/graphviz/html/invhouse.gif
share/doc/graphviz/html/invtrapezium.gif
share/doc/graphviz/html/invtriangle.gif
@@ -365,6 +372,7 @@ share/doc/graphviz/html/output.html
share/doc/graphviz/html/oval.gif
share/doc/graphviz/html/parallelogram.gif
share/doc/graphviz/html/pentagon.gif
+share/doc/graphviz/html/plain.gif
share/doc/graphviz/html/plaintext.gif
share/doc/graphviz/html/plugins.png
share/doc/graphviz/html/point.gif
@@ -410,6 +418,7 @@ share/doc/graphviz/pdf/dot.1.pdf
share/doc/graphviz/pdf/dotguide.pdf
share/doc/graphviz/pdf/dotty.1.pdf
share/doc/graphviz/pdf/dottyguide.pdf
+share/doc/graphviz/pdf/edgepaint.1.pdf
share/doc/graphviz/pdf/expr.3.pdf
share/doc/graphviz/pdf/fdp.1.pdf
share/doc/graphviz/pdf/gc.1.pdf
@@ -430,10 +439,12 @@ share/doc/graphviz/pdf/gvpack.1.pdf
share/doc/graphviz/pdf/gvpr.1.pdf
share/doc/graphviz/pdf/gvpr.3.pdf
share/doc/graphviz/pdf/gxl2gv.1.pdf
+share/doc/graphviz/pdf/lab_gamut.3.pdf
share/doc/graphviz/pdf/lefty.1.pdf
share/doc/graphviz/pdf/leftyguide.pdf
share/doc/graphviz/pdf/libguide.pdf
share/doc/graphviz/pdf/lneato.1.pdf
+share/doc/graphviz/pdf/mingle.1.pdf
share/doc/graphviz/pdf/mm2gv.1.pdf
share/doc/graphviz/pdf/neato.1.pdf
share/doc/graphviz/pdf/neatoguide.pdf
@@ -445,9 +456,9 @@ share/doc/graphviz/pdf/pathplan.3.pdf
share/doc/graphviz/pdf/prune.pdf
share/doc/graphviz/pdf/sccmap.1.pdf
share/doc/graphviz/pdf/sfdp.1.pdf
+share/doc/graphviz/pdf/smyrna.1.pdf
share/doc/graphviz/pdf/smyrna.pdf
share/doc/graphviz/pdf/tcldot.3tcl.pdf
-share/doc/graphviz/pdf/tkspline.3tk.pdf
share/doc/graphviz/pdf/tred.1.pdf
share/doc/graphviz/pdf/twopi.1.pdf
share/doc/graphviz/pdf/unflatten.1.pdf
@@ -477,8 +488,6 @@ share/examples/graphviz/demo/pathplan_da
share/examples/graphviz/demo/pathplan_data/rotor.dat
share/examples/graphviz/demo/pathplan_data/u.dat
share/examples/graphviz/demo/pathplan_data/unknown.dat
-share/examples/graphviz/demo/spline.tcl
-share/examples/graphviz/demo/spline.tcl.README
share/examples/graphviz/graphs/
share/examples/graphviz/graphs/directed/
share/examples/graphviz/graphs/directed/KW91.gv
@@ -566,13 +575,17 @@ share/graphviz/doc/html/schema/arguments
share/graphviz/doc/html/schema/attributes.xml
share/graphviz/doc/html/schema/attributes.xslt
share/graphviz/gvpr/
+share/graphviz/gvpr/addedges
share/graphviz/gvpr/addranks
share/graphviz/gvpr/addrings
share/graphviz/gvpr/anon
share/graphviz/gvpr/attr
share/graphviz/gvpr/bb
share/graphviz/gvpr/bbox
+share/graphviz/gvpr/binduce
+share/graphviz/gvpr/bipart
share/graphviz/gvpr/chkclusters
+share/graphviz/gvpr/chkedges
share/graphviz/gvpr/cliptree
share/graphviz/gvpr/col
share/graphviz/gvpr/collapse
@@ -588,6 +601,7 @@ share/graphviz/gvpr/dijkstra
share/graphviz/gvpr/flatten
share/graphviz/gvpr/get-layers-list
share/graphviz/gvpr/group
+share/graphviz/gvpr/histogram
share/graphviz/gvpr/indent
share/graphviz/gvpr/knbhd
share/graphviz/gvpr/maxdeg
Index: tests/test.dot
===================================================================
RCS file: tests/test.dot
diff -N tests/test.dot
--- tests/test.dot 22 Aug 2012 09:55:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-digraph g {
- "a" -> "b";
- "b" -> "c";
- "c" -> "a";
-}