update to graphviz-7.1.0

- split Tcl support off to a subpackage
- generate config6 file at build time instead of relying on a
pregenerated one in ${FILESDIR}

feedback/ok edd@ (maintainer)
master
sthen 2023-03-01 11:30:25 +00:00
parent 947551c525
commit 067e75fc4c
12 changed files with 133 additions and 1011 deletions

View File

@ -1,65 +1,60 @@
COMMENT-main= graph drawing software
COMMENT-tcl= Tcl bindings to graphviz
DISTNAME= graphviz-2.42.3
V= 7.1.0
DISTNAME= graphviz-$V
PKGNAME-main= ${DISTNAME}
REVISION= 1
PKGNAME-tcl= graphviz-tcl-$V
CATEGORIES= math devel graphics
# there is only one multi-package due to legacy, but maybe more
# will appear in the form of language bindings.
MULTI_PACKAGES= -main
MULTI_PACKAGES= -main -tcl
# to let update-patches work in a simpler way
PATCHORIG= .orig2
MASTER_SITES= https://www2.graphviz.org/Packages/stable/portable_source/
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 += gvplugin_visio 0.0 # 6.0
SHARED_LIBS += gvplugin_webp 0.0 # 6.0
MASTER_SITES= https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/$V/
SHARED_LIBS += cdt 2.0 # 5.0
SHARED_LIBS += xdot 1.0 # 4.0
SHARED_LIBS += cgraph 1.0 # 6.0
SHARED_LIBS += pathplan 3.0 # 4.0
SHARED_LIBS += gvc 2.0 # 6.0
SHARED_LIBS += cgraph 1.0 # 6.0
SHARED_LIBS += gvpr 1.0 # 2.0
SHARED_LIBS += xdot 1.0 # 4.0
SHARED_LIBS += gdtclft 4.0 # unknown
SHARED_LIBS += tcldot 4.0 # unknown
SHARED_LIBS += tcldot_builtin 4.0 # unknown
SHARED_LIBS += tclplan 4.0 # unknown
SHARED_LIBS += lab_gamut 0.0 # 1.0
SHARED_LIBS += gvpr 1.0 # 2.0
HOMEPAGE= http://www.graphviz.org/
# plugins loaded by dlopen() in graphviz, not traditional shared libraries
# linked by other software. following upstream numbering reduces the patches
# needed to handle this to a simple .0 addition in configure.ac.
.for plugin in \
gvplugin_core gvplugin_gd gvplugin_gdk gvplugin_gtk \
gvplugin_pango gvplugin_rsvg gvplugin_visio gvplugin_xlib \
gvplugin_dot_layout gvplugin_neato_layout gvplugin_webp \
gvplugin_poppler
SHARED_LIBS += ${plugin} 6.0
.endfor
HOMEPAGE= https://graphviz.org/
MAINTAINER= Edd Barrett <edd@openbsd.org>
# Eclipse Public License v1.0
PERMIT_PACKAGE= Yes
WANTLIB += ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xmu Xpm Xrandr Xrender
WANTLIB += Xt atk-1.0 c cairo cairo-gobject 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 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 pcre2-8 perl pixman-1 png
WANTLIB += poppler poppler-glib pthread rsvg-2 ${COMPILER_LIBCXX}
WANTLIB += tiff webp xcb xcb-render xcb-shm xml2 z zstd fribidi
WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xdmcp Xext Xrender cairo
WANTLIB += expat ffi fontconfig freetype fribidi gd gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 harfbuzz iconv intl
WANTLIB += jpeg ltdl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre2-8 pixman-1 png tiff webp xcb xcb-render xcb-shm
WANTLIB += z zstd
# "extra" - tcldot is built against Tcl headers
WANTLIB += ${MODTCL_WANTLIB}
WANTLIB-main += ${WANTLIB}
WANTLIB-main += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr
WANTLIB-main += atk-1.0 c cairo-gobject gc gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB-main += gmp gtk-x11-2.0 guile-2.2 lcms2 openjp2 perl poppler
WANTLIB-main += poppler-glib rsvg-2 unistring xml2
COMPILER= base-clang ports-gcc base-gcc
# "extra" libtclXX: tcldot is built against Tcl headers
WANTLIB-tcl += ${WANTLIB} ${MODTCL_WANTLIB}
WANTLIB-tcl += cdt cgraph gvc pathplan xdot
COMPILER= base-clang ports-gcc
MODULES= lang/tcl \
perl
@ -72,10 +67,12 @@ LIB_DEPENDS= graphics/jpeg \
graphics/graphite2 \
devel/harfbuzz \
print/poppler \
lang/guile \
lang/guile2
LIB_DEPENDS-tcl=math/graphviz,-main \
${MODTCL_LIB_DEPENDS}
BUILD_DEPENDS= devel/swig
TEST_DEPENDS= ${FULLPKGNAME}:math/graphviz
MODTCL_VERSION= 8.6
USE_GMAKE= Yes
USE_GROFF= Yes
@ -88,42 +85,44 @@ AUTOMAKE_VERSION= 1.16
LIBTOOL_FLAGS += --tag=disable-static
# Note: --with-tclsh is misspelled "--with-tcl" in configure's help output
CONFIGURE_ARGS= --enable-tcl=yes \
--enable-perl \
CONFIGURE_ARGS= --disable-man-pdfs \
--enable-swig \
--disable-sharp \
--disable-d \
--disable-go \
--enable-guile \
--with-tclsh=${MODTCL_BIN} \
--disable-lua \
--disable-io \
--disable-java \
--disable-javascript \
--disable-lua \
--disable-ocaml \
--enable-perl \
--disable-php \
--disable-python \
--disable-python2 \
--disable-python3 \
--disable-ruby \
--disable-rpath \
--disable-sharp \
--disable-r \
--disable-gts \
--disable-go \
--without-ghostscript \
--disable-ruby \
--enable-tcl
CONFIGURE_ARGS+= --with-tclsh=${MODTCL_BIN} \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
--without-devil \
--without-ghostscript \
--without-lasi \
--without-gts \
--without-ann \
--without-glade \
--without-qt \
--without-glut \
--with-gd \
--with-gdincludedir=${LOCALBASE}/include \
--with-gdlibdir=${LOCALBASE}/lib \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib
# hardcodes -lstdc++
CONFIGURE_ARGS+= --without-ipsepcola
--without-glut
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
TCLCONFIG=${MODTCL_CONFIG}
TCLCONFIG=${MODTCL_CONFIG} \
GUILE=guile2.2
DOCBASE= ${PREFIX}/share/doc/graphviz
EXBASE= ${PREFIX}/share/examples/graphviz
@ -131,52 +130,30 @@ EXBASE= ${PREFIX}/share/examples/graphviz
MAKE_FLAGS= TCL_STUB_LIB_SPEC='-L${LOCALBASE}/lib \
-ltclstub${MODTCL_VERSION:S/.//}_pic'
CFLAGS += -DLT_DEBUG_LOADERS
# needs "criterion" to actually do anything
TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH}
TEST_TARGET= check
FAKE_FLAGS= htmldir="${DOCBASE}/html" \
pdfdir="${DOCBASE}/pdf" \
txtdir="${DOCBASE}" \
demodir="${EXBASE}/demo" \
directeddir="${EXBASE}/graphs/directed" \
leftydir="${EXBASE}/lefty" \
pathplanexampledir="${EXBASE}/demo/pathplan_data" \
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
post-install:
# install pre-generated config6 to avoid @exec/@unexec-delete
${SUBST_CMD} -m 0644 -c ${FILESDIR}/config6 ${PREFIX}/lib/graphviz/config6
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/graphviz/config6
# Once upon a time, graphviz used to install the symlink:
# ${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz -> ${PREFIX}/lib/tcl/graphviz
# Now it installs a copy of the dir, however, 'pkg_add -u' can't update a
# symlink to a dir, so we manually hack back the old symlink.
rm -Rf ${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz
ln -s ${TRUEPREFIX}/lib/tcl/graphviz \
${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz
# generate config6 from fake-install directkry, so we don't need
# @exec or a pregenerated file
GVBINDIR=${PREFIX}/lib/graphviz \
LD_LIBRARY_PATH=${PREFIX}/lib \
${PREFIX}/bin/dot -v -c
# We never want to install .la files.
find ${PREFIX}/lib/ -name '*.la' -delete
TEST_DEPENDS= shells/ksh93 \
${FULLPKGNAME}:${FULLPKGPATH}
TEST_TARGET= check
pre-test:
sed -i s,#!/bin/ksh,#!/${LOCALBASE}/bin/ksh93, ${WRKSRC}/rtest/rtest.sh
# NOTE: When updating this port run 'dot -c' (as root) to generate a
# /usr/local/lib/graphviz/config6. Then substitute all hard-coded library
# versions to ${LIBlibname_VERSION}. Put the resulting file in files/config6.
#
# A vim regex for doing the substitution:
# :%s/^lib\(.*\)\.so\.[0-9]\+\.[0-9]\+/lib\1.so.${LIB\1_VERSION}/g
# Second copy of tcl extensions isn't needed
rm -R ${PREFIX}/lib/tcl${MODTCL_VERSION}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (graphviz-2.42.3.tar.gz) = j68/wlMXsdFRZiBb9kwbSu1VqKaVncq6pk260Zfket0=
SIZE (graphviz-2.42.3.tar.gz) = 26246717
SHA256 (graphviz-7.1.0.tar.gz) = aV7zCp07Ai5Ap5HKG+/ZF+/2QBcauxeit5NnooqiaHY=
SIZE (graphviz-7.1.0.tar.gz) = 27565398

View File

@ -1,581 +0,0 @@
# This file was generated by "dot -c" at time of install.
# You may temporarily disable a plugin by removing or commenting out
# a line in this file, or you can modify its "quality" value to affect
# default plugin selection.
# Manual edits to this file **will be lost** on upgrade.
libgvplugin_core.so.${LIBgvplugin_core_VERSION} core {
device {
dot:dot 1
gv:dot 1
canon:dot 1
plain:dot 1
plain-ext:dot 1
xdot:xdot 1
xdot1.2:xdot 1
xdot1.4:xdot 1
}
device {
fig:fig 1
}
device {
ismap:map 1
cmap:map 1
imap:map 1
cmapx:map 1
imap_np:map 1
cmapx_np:map 1
}
device {
ps:ps 1
ps2:ps 1
eps:ps 1
}
device {
svg:svg 1
svgz:svg 1
}
device {
tk:tk 1
}
device {
vml:vml 1
vmlz:vml 1
}
device {
pic:pic -1
}
device {
pov:pov 1
}
render {
dot 1
xdot 1
}
render {
fig 1
}
render {
map 1
}
render {
ps 1
}
render {
svg 1
}
render {
tk 1
}
render {
vml 1
}
render {
pic -1
}
render {
pov 1
}
loadimage {
png:svg 1
gif:svg 1
jpeg:svg 1
jpe:svg 1
jpg:svg 1
png:fig 1
gif:fig 1
jpeg:fig 1
jpe:fig 1
jpg:fig 1
png:vrml 1
gif:vrml 1
jpeg:vrml 1
jpe:vrml 1
jpg:vrml 1
eps:ps 1
ps:ps 1
(lib):ps 1
png:map 1
gif:map 1
jpeg:map 1
jpe:map 1
jpg:map 1
ps:map 1
eps:map 1
svg:map 1
png:dot 1
gif:dot 1
jpeg:dot 1
jpe:dot 1
jpg:dot 1
ps:dot 1
eps:dot 1
svg:dot 1
png:xdot 1
gif:xdot 1
jpeg:xdot 1
jpe:xdot 1
jpg:xdot 1
ps:xdot 1
eps:xdot 1
svg:xdot 1
svg:svg 1
png:vml 1
gif:vml 1
jpeg:vml 1
jpe:vml 1
jpg:vml 1
gif:tk 1
}
}
libgvplugin_core.so.${LIBgvplugin_core_VERSION} core {
device {
dot:dot 1
gv:dot 1
canon:dot 1
plain:dot 1
plain-ext:dot 1
xdot:xdot 1
xdot1.2:xdot 1
xdot1.4:xdot 1
}
device {
fig:fig 1
}
device {
ismap:map 1
cmap:map 1
imap:map 1
cmapx:map 1
imap_np:map 1
cmapx_np:map 1
}
device {
mp:mp -1
}
device {
ps:ps 1
ps2:ps 1
eps:ps 1
}
device {
svg:svg 1
svgz:svg 1
}
device {
json:json 1
json0:json 1
dot_json:json 1
xdot_json:json 1
}
device {
tk:tk 1
}
device {
vml:vml 1
vmlz:vml 1
}
device {
pic:pic -1
}
device {
pov:pov 1
}
render {
dot 1
xdot 1
}
render {
fig 1
}
render {
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 {
vml 1
}
render {
pic -1
}
render {
pov 1
}
loadimage {
png:svg 1
gif:svg 1
jpeg:svg 1
jpe:svg 1
jpg:svg 1
png:fig 1
gif:fig 1
jpeg:fig 1
jpe:fig 1
jpg:fig 1
png:vrml 1
gif:vrml 1
jpeg:vrml 1
jpe:vrml 1
jpg:vrml 1
eps:ps 1
ps:ps 1
(lib):ps 1
png:map 1
gif:map 1
jpeg:map 1
jpe:map 1
jpg:map 1
ps:map 1
eps:map 1
svg:map 1
png:dot 1
gif:dot 1
jpeg:dot 1
jpe:dot 1
jpg:dot 1
ps:dot 1
eps:dot 1
svg:dot 1
png:xdot 1
gif:xdot 1
jpeg:xdot 1
jpe:xdot 1
jpg:xdot 1
ps:xdot 1
eps:xdot 1
svg:xdot 1
svg:svg 1
png:vml 1
gif:vml 1
jpeg:vml 1
jpe:vml 1
jpg:vml 1
gif:tk 1
}
}
libgvplugin_dot_layout.so.${LIBgvplugin_dot_layout_VERSION} dot_layout {
layout {
dot 0
}
}
libgvplugin_dot_layout.so.${LIBgvplugin_dot_layout_VERSION} dot_layout {
layout {
dot 0
}
}
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_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_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_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_gtk.so.${LIBgvplugin_gtk_VERSION} gtk {
device {
gtk:cairo 0
}
}
libgvplugin_neato_layout.so.${LIBgvplugin_neato_layout_VERSION} neato_layout {
layout {
neato 0
fdp 0
sfdp 0
twopi 0
circo 0
patchwork 0
osage 0
nop 0
nop1 0
nop2 0
}
}
libgvplugin_neato_layout.so.${LIBgvplugin_neato_layout_VERSION} neato_layout {
layout {
neato 0
fdp 0
sfdp 0
twopi 0
circo 0
patchwork 0
osage 0
nop 0
nop1 0
nop2 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_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
eps:cairo -10
pdf:cairo 10
svg:cairo -10
}
}
libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION} poppler {
loadimage {
pdf:cairo 1
}
}
libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION} poppler {
loadimage {
pdf:cairo 1
}
}
libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION} rsvg {
loadimage {
svg:cairo 1
}
}
libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION} rsvg {
loadimage {
svg:cairo 1
}
}
libgvplugin_visio.so.${LIBgvplugin_visio_VERSION} visio {
device {
vdx:visio 1
}
render {
visio 1
}
}
libgvplugin_webp.so.${LIBgvplugin_webp_VERSION} webp {
device {
webp:cairo 1
}
loadimage {
webp:cairo 1
}
}
libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION} xlib {
device {
xlib:cairo 0
x11:cairo 0
}
}
libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION} xlib {
device {
xlib:cairo 0
x11:cairo 0
}
}

View File

@ -1,10 +0,0 @@
hardcodes -lstdc++
Index: cmd/Makefile.am
--- cmd/Makefile.am.orig
+++ cmd/Makefile.am
@@ -2,3 +2,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = dot tools gvpr lefty lneato dotty smyrna gvmap gvedit mingle edgepaint
+SUBDIRS = dot tools gvpr lefty lneato dotty smyrna gvmap gvedit mingle

View File

@ -1,7 +1,6 @@
Correctly detect install directory
--- config/config_perl.pl.orig2 Sat Jan 11 22:59:44 2014
+++ config/config_perl.pl Mon Feb 3 10:19:35 2014
Index: config/config_perl.pl
--- config/config_perl.pl.orig
+++ config/config_perl.pl
@@ -11,14 +11,5 @@ if ($ARGV[0] eq "PERL_INCLUDES") {
print "-I$archlib/CORE";
}

View File

@ -1,17 +1,21 @@
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -693,11 +693,12 @@ else
if test `$SWIG -help 2>&1 | $EGREP -c '\-guile *- Generate'` = 0; then
use_guile="No (swig does not support -guile option)"
else
- AC_CHECK_PROGS(GUILE,guile2 guile1.8 guile)
+ AC_CHECK_PROGS(GUILE,guile1.8 guile)
if test "x$GUILE" = "x"; then
@@ -77,7 +77,7 @@ case "${host_os}" in
GVPLUGIN_VERSION=`expr $GVPLUGIN_CURRENT + 1`
;;
* )
- GVPLUGIN_VERSION=$GVPLUGIN_CURRENT
+ GVPLUGIN_VERSION=$GVPLUGIN_CURRENT.0
;;
esac
AC_DEFINE_UNQUOTED(GVPLUGIN_VERSION,$GVPLUGIN_VERSION,[Compatibility version number for plugins.])
@@ -642,7 +642,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/^Guile \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][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 -En '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
AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile)

View File

@ -1,14 +0,0 @@
Plugin scanner fails to find our libs because we overide lib version.
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);
+#elif defined(__OpenBSD__)
+ sprintf(config_re,"%s[0-9]\\.[0-9]%s", plugin_re_beg, plugin_re_end);
#elif defined(GVPLUGIN_VERSION)
sprintf(config_re,"%s%d%s", plugin_re_beg, GVPLUGIN_VERSION, plugin_re_end);
#else

View File

@ -1,8 +0,0 @@
A couple of tests have missing files in the source distribution.
Index: tests/regression_tests/Makefile.am
--- tests/regression_tests/Makefile.am.orig
+++ tests/regression_tests/Makefile.am
@@ -1 +1 @@
-SUBDIRS = shapes vuln
+#SUBDIRS = shapes vuln

View File

@ -1,18 +1,14 @@
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.
The goal of graphviz has been twofold:
Graph visualization is a way of representing structural information as
diagrams of abstract graphs and networks. It has important applications
in networking, bioinformatics, software engineering, database and web
design, machine learning, and in visual interfaces for other technical
domains.
to find efficient algorithms for making very readable
drawings of graphs up to several hundreds of nodes,
approaching the quality of manual layouts (made
with CAD tools). The algorithms should scale even
further, as layout of large graphs can also offer
a gestalt view of complex systems.
to create convenient graph drawing systems and web
services. This means defining useful interfaces and
features to support applications.
The Graphviz layout programs take descriptions of graphs in a simple
text language, and make diagrams in useful formats, such as images and
SVG for web pages; PDF or Postscript for inclusion in other documents;
or display in an interactive graph browser. Graphviz has many useful
features for concrete diagrams, such as options for colors, fonts,
tabular node layouts, line styles, hyperlinks, and custom shapes.

View File

@ -0,0 +1 @@
Tcl bindings for graphviz.

View File

@ -8,7 +8,7 @@ bin/circo
@bin bin/dot
bin/dot2gxl
@bin bin/dot_builtins
bin/dotty
@bin bin/edgepaint
bin/fdp
@bin bin/gc
@bin bin/gml2gv
@ -23,8 +23,6 @@ bin/gvmap.sh
@bin bin/gvpr
bin/gxl2dot
@bin bin/gxl2gv
@bin bin/lefty
bin/lneato
@bin bin/mm2gv
bin/neato
@bin bin/nop
@ -99,15 +97,6 @@ lib/pkgconfig/libgvpr.pc
lib/pkgconfig/liblab_gamut.pc
lib/pkgconfig/libpathplan.pc
lib/pkgconfig/libxdot.pc
lib/tcl/graphviz/
@lib lib/tcl/graphviz/libgdtclft.so.${LIBgdtclft_VERSION}
@so lib/tcl/graphviz/libgv_tcl.so
@lib lib/tcl/graphviz/libtcldot.so.${LIBtcldot_VERSION}
@lib lib/tcl/graphviz/libtcldot_builtin.so.${LIBtcldot_builtin_VERSION}
@lib lib/tcl/graphviz/libtclplan.so.${LIBtclplan_VERSION}
lib/tcl/graphviz/pkgIndex.tcl
lib/tcl${MODTCL_VERSION}/
lib/tcl${MODTCL_VERSION}/graphviz
${P5ARCH}/
${P5ARCH}/gv.pm
@so ${P5ARCH}/gv.so
@ -120,7 +109,7 @@ ${P5ARCH}/gv.pm
@man man/man1/dijkstra.1
@man man/man1/dot.1
@man man/man1/dot2gxl.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
@ -135,9 +124,6 @@ ${P5ARCH}/gv.pm
@man man/man1/gvpr.1
@man man/man1/gxl2dot.1
@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
@ -153,271 +139,52 @@ ${P5ARCH}/gv.pm
@man man/man3/cdt.3
@man man/man3/cgraph.3
@man man/man3/expr.3
man/man3/gdtclft.3tcl
man/man3/gv.3guile
man/man3/gv.3perl
man/man3/gv.3python
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 man/man3/xdot.3
@man man/man7/graphviz.7
share/doc/graphviz/
share/doc/graphviz/AUTHORS
share/doc/graphviz/CHANGELOG.md
share/doc/graphviz/COPYING
share/doc/graphviz/ChangeLog
share/doc/graphviz/Dot.ref
share/doc/graphviz/NEWS
share/doc/graphviz/addingLayout.txt
share/doc/graphviz/cpl1.0.txt
share/doc/graphviz/fontfaq.txt
share/doc/graphviz/html/
share/doc/graphviz/html/FAQ.html
share/doc/graphviz/html/Mcircle.gif
share/doc/graphviz/html/Mdiamond.gif
share/doc/graphviz/html/Msquare.gif
share/doc/graphviz/html/a_box.gif
share/doc/graphviz/html/a_crow.gif
share/doc/graphviz/html/a_diamond.gif
share/doc/graphviz/html/a_dot.gif
share/doc/graphviz/html/a_ediamond.gif
share/doc/graphviz/html/a_empty.gif
share/doc/graphviz/html/a_forward.gif
share/doc/graphviz/html/a_halfopen.gif
share/doc/graphviz/html/a_inv.gif
share/doc/graphviz/html/a_invdot.gif
share/doc/graphviz/html/a_invempty.gif
share/doc/graphviz/html/a_invodot.gif
share/doc/graphviz/html/a_lteeoldiamond.gif
share/doc/graphviz/html/a_nohead.gif
share/doc/graphviz/html/a_none.gif
share/doc/graphviz/html/a_normal.gif
share/doc/graphviz/html/a_obox.gif
share/doc/graphviz/html/a_odiamond.gif
share/doc/graphviz/html/a_odot.gif
share/doc/graphviz/html/a_open.gif
share/doc/graphviz/html/a_tee.gif
share/doc/graphviz/html/aa_box.gif
share/doc/graphviz/html/aa_crow.gif
share/doc/graphviz/html/aa_diamond.gif
share/doc/graphviz/html/aa_dot.gif
share/doc/graphviz/html/aa_inv.gif
share/doc/graphviz/html/aa_lbox.gif
share/doc/graphviz/html/aa_lcrow.gif
share/doc/graphviz/html/aa_ldiamond.gif
share/doc/graphviz/html/aa_linv.gif
share/doc/graphviz/html/aa_lnormal.gif
share/doc/graphviz/html/aa_ltee.gif
share/doc/graphviz/html/aa_lvee.gif
share/doc/graphviz/html/aa_none.gif
share/doc/graphviz/html/aa_normal.gif
share/doc/graphviz/html/aa_obox.gif
share/doc/graphviz/html/aa_odiamond.gif
share/doc/graphviz/html/aa_odot.gif
share/doc/graphviz/html/aa_oinv.gif
share/doc/graphviz/html/aa_olbox.gif
share/doc/graphviz/html/aa_oldiamond.gif
share/doc/graphviz/html/aa_olinv.gif
share/doc/graphviz/html/aa_olnormal.gif
share/doc/graphviz/html/aa_onormal.gif
share/doc/graphviz/html/aa_orbox.gif
share/doc/graphviz/html/aa_ordiamond.gif
share/doc/graphviz/html/aa_orinv.gif
share/doc/graphviz/html/aa_ornormal.gif
share/doc/graphviz/html/aa_rbox.gif
share/doc/graphviz/html/aa_rcrow.gif
share/doc/graphviz/html/aa_rdiamond.gif
share/doc/graphviz/html/aa_rinv.gif
share/doc/graphviz/html/aa_rnormal.gif
share/doc/graphviz/html/aa_rtee.gif
share/doc/graphviz/html/aa_rvee.gif
share/doc/graphviz/html/aa_tee.gif
share/doc/graphviz/html/aa_vee.gif
share/doc/graphviz/html/arrows.html
share/doc/graphviz/html/attrs.html
share/doc/graphviz/html/back.gif
share/doc/graphviz/html/both.gif
share/doc/graphviz/html/box.gif
share/doc/graphviz/html/box3d.gif
share/doc/graphviz/html/build.html
share/doc/graphviz/html/c_bold.png
share/doc/graphviz/html/c_dashed.png
share/doc/graphviz/html/c_dotted.png
share/doc/graphviz/html/c_filled.png
share/doc/graphviz/html/c_rounded.png
share/doc/graphviz/html/c_solid.png
share/doc/graphviz/html/c_striped.png
share/doc/graphviz/html/char.html
share/doc/graphviz/html/circle.gif
share/doc/graphviz/html/colorlist.gif
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
share/doc/graphviz/html/e_bold.png
share/doc/graphviz/html/e_dashed.png
share/doc/graphviz/html/e_dotted.png
share/doc/graphviz/html/e_solid.png
share/doc/graphviz/html/egg.gif
share/doc/graphviz/html/ellipse.gif
share/doc/graphviz/html/fill.gif
share/doc/graphviz/html/folder.gif
share/doc/graphviz/html/forward.gif
share/doc/graphviz/html/g_lin0.png
share/doc/graphviz/html/g_lin180.png
share/doc/graphviz/html/g_lin270.png
share/doc/graphviz/html/g_lin360.png
share/doc/graphviz/html/g_lin45.png
share/doc/graphviz/html/g_lin90.png
share/doc/graphviz/html/g_rad0.png
share/doc/graphviz/html/g_rad180.png
share/doc/graphviz/html/g_rad270.png
share/doc/graphviz/html/g_rad360.png
share/doc/graphviz/html/g_rad45.png
share/doc/graphviz/html/g_rad90.png
share/doc/graphviz/html/gdtclft.entities.example.png
share/doc/graphviz/html/hexagon.gif
share/doc/graphviz/html/house.gif
share/doc/graphviz/html/html1.gif
share/doc/graphviz/html/html2.gif
share/doc/graphviz/html/html2.gv
share/doc/graphviz/html/html3.gif
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/info/
share/doc/graphviz/html/info/arrows.html
share/doc/graphviz/html/info/attrs.html
share/doc/graphviz/html/info/colors.html
share/doc/graphviz/html/info/command.html
share/doc/graphviz/html/info/index.html
share/doc/graphviz/html/info/lang.html
share/doc/graphviz/html/info/output.html
share/doc/graphviz/html/info/shapes.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
share/doc/graphviz/html/lang.html
share/doc/graphviz/html/mrecord.gif
share/doc/graphviz/html/n_bold.png
share/doc/graphviz/html/n_dashed.png
share/doc/graphviz/html/n_diagonals.png
share/doc/graphviz/html/n_dotted.png
share/doc/graphviz/html/n_filled.png
share/doc/graphviz/html/n_rounded.png
share/doc/graphviz/html/n_solid.png
share/doc/graphviz/html/n_striped.png
share/doc/graphviz/html/n_wedged.png
share/doc/graphviz/html/nohead.gif
share/doc/graphviz/html/none.gif
share/doc/graphviz/html/none_back.png
share/doc/graphviz/html/none_both.png
share/doc/graphviz/html/none_forward.png
share/doc/graphviz/html/none_none.png
share/doc/graphviz/html/normal_back.png
share/doc/graphviz/html/normal_both.png
share/doc/graphviz/html/normal_forward.png
share/doc/graphviz/html/normal_none.png
share/doc/graphviz/html/note.gif
share/doc/graphviz/html/octagon.gif
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
share/doc/graphviz/html/polygon.gif
share/doc/graphviz/html/pspdf.png
share/doc/graphviz/html/record.gif
share/doc/graphviz/html/record2.gif
share/doc/graphviz/html/rect.gif
share/doc/graphviz/html/rectangle.gif
share/doc/graphviz/html/round.gif
share/doc/graphviz/html/sdlshapes.jpg
share/doc/graphviz/html/sdlshapes.png
share/doc/graphviz/html/septagon.gif
share/doc/graphviz/html/shapes.html
share/doc/graphviz/html/spline_curved.png
share/doc/graphviz/html/spline_line.png
share/doc/graphviz/html/spline_none.png
share/doc/graphviz/html/spline_ortho.png
share/doc/graphviz/html/spline_polyline.png
share/doc/graphviz/html/spline_spline.png
share/doc/graphviz/html/square.gif
share/doc/graphviz/html/tab.gif
share/doc/graphviz/html/schema/
share/doc/graphviz/html/schema/arguments.xml
share/doc/graphviz/html/schema/attributes.xml
share/doc/graphviz/html/schema/attributes.xslt
share/doc/graphviz/html/tcldot.html
share/doc/graphviz/html/todo.html
share/doc/graphviz/html/trapezium.gif
share/doc/graphviz/html/triangle.gif
share/doc/graphviz/html/tripleoctagon.gif
share/doc/graphviz/html/underline.gif
share/doc/graphviz/html/winbuild.html
share/doc/graphviz/latex_suggestions.txt
share/doc/graphviz/pdf/
share/doc/graphviz/pdf/Agraph.pdf
share/doc/graphviz/pdf/acyclic.1.pdf
share/doc/graphviz/pdf/bcomps.1.pdf
share/doc/graphviz/pdf/ccomps.1.pdf
share/doc/graphviz/pdf/cdt.3.pdf
share/doc/graphviz/pdf/cgraph.3.pdf
share/doc/graphviz/pdf/circo.1.pdf
share/doc/graphviz/pdf/cluster.1.pdf
share/doc/graphviz/pdf/diffimg.1.pdf
share/doc/graphviz/pdf/dijkstra.1.pdf
share/doc/graphviz/pdf/dot.1.pdf
share/doc/graphviz/pdf/dot2gxl.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/expr.3.pdf
share/doc/graphviz/pdf/fdp.1.pdf
share/doc/graphviz/pdf/gc.1.pdf
share/doc/graphviz/pdf/gdtclft.3tcl.pdf
share/doc/graphviz/pdf/gml2gv.1.pdf
share/doc/graphviz/pdf/graphml2gv.1.pdf
share/doc/graphviz/pdf/gv.3guile.pdf
share/doc/graphviz/pdf/gv.3perl.pdf
share/doc/graphviz/pdf/gv.3python.pdf
share/doc/graphviz/pdf/gv.3tcl.pdf
share/doc/graphviz/pdf/gv2gml.1.pdf
share/doc/graphviz/pdf/gv2gxl.1.pdf
share/doc/graphviz/pdf/gvc.3.pdf
share/doc/graphviz/pdf/gvcolor.1.pdf
share/doc/graphviz/pdf/gvgen.1.pdf
share/doc/graphviz/pdf/gvmap.1.pdf
share/doc/graphviz/pdf/gvmap.sh.1.pdf
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/gxl2dot.1.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
share/doc/graphviz/pdf/nop.1.pdf
share/doc/graphviz/pdf/osage.1.pdf
share/doc/graphviz/pdf/pack.3.pdf
share/doc/graphviz/pdf/patchwork.1.pdf
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.pdf
share/doc/graphviz/pdf/tcldot.3tcl.pdf
share/doc/graphviz/pdf/tred.1.pdf
share/doc/graphviz/pdf/twopi.1.pdf
share/doc/graphviz/pdf/unflatten.1.pdf
share/doc/graphviz/pdf/vimdot.1.pdf
share/doc/graphviz/pdf/xdot.3.pdf
share/examples/graphviz/
share/examples/graphviz/demo/
share/examples/graphviz/demo/doted.tcl
@ -427,6 +194,8 @@ share/examples/graphviz/demo/entities.tcl
share/examples/graphviz/demo/entities.tcl.README
share/examples/graphviz/demo/gcat.tcl
share/examples/graphviz/demo/gcat.tcl.README
share/examples/graphviz/demo/modgraph.pl
share/examples/graphviz/demo/modgraph.tcl
share/examples/graphviz/demo/pathplan.tcl
share/examples/graphviz/demo/pathplan.tcl.README
share/examples/graphviz/demo/pathplan_data/
@ -505,29 +274,7 @@ share/examples/graphviz/graphs/undirected/Heawood.gv
share/examples/graphviz/graphs/undirected/Petersen.gv
share/examples/graphviz/graphs/undirected/ngk10_4.gv
share/examples/graphviz/graphs/undirected/process.gv
share/examples/graphviz/lefty/
share/examples/graphviz/lefty/box.lefty
share/examples/graphviz/lefty/def.lefty
share/examples/graphviz/lefty/dotty.lefty
share/examples/graphviz/lefty/dotty_draw.lefty
share/examples/graphviz/lefty/dotty_edit.lefty
share/examples/graphviz/lefty/dotty_layout.lefty
share/examples/graphviz/lefty/dotty_ui.lefty
share/examples/graphviz/lefty/fractal.lefty
share/examples/graphviz/lefty/fractal2.lefty
share/examples/graphviz/lefty/lefty.psp
share/examples/graphviz/lefty/slides.lefty
share/examples/graphviz/lefty/tree.lefty
share/graphviz/
share/graphviz/demo/
share/graphviz/demo/modgraph.pl
share/graphviz/demo/modgraph.tcl
share/graphviz/doc/
share/graphviz/doc/html/
share/graphviz/doc/html/schema/
share/graphviz/doc/html/schema/arguments.xml
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

View File

@ -0,0 +1,11 @@
@conflict graphviz-<3
lib/tcl/graphviz/
@so lib/tcl/graphviz/libgdtclft.so
@so lib/tcl/graphviz/libgv_tcl.so
@so lib/tcl/graphviz/libtcldot.so
@so lib/tcl/graphviz/libtcldot_builtin.so
@so lib/tcl/graphviz/libtclplan.so
lib/tcl/graphviz/pkgIndex.tcl
man/man3/gdtclft.3tcl
man/man3/gv.3tcl
man/man3/tcldot.3tcl