From owner-svn-ports-all@freebsd.org Mon Sep 23 11:21:20 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13A37F09F7; Mon, 23 Sep 2019 11:21:20 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46cMMh0Mlwz3NDS; Mon, 23 Sep 2019 11:21:20 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9E0FE0C8; Mon, 23 Sep 2019 11:21:19 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8NBLJ5w016828; Mon, 23 Sep 2019 11:21:19 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8NBLHXT016095; Mon, 23 Sep 2019 11:21:17 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201909231121.x8NBLHXT016095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Mon, 23 Sep 2019 11:21:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512625 - in head/graphics/graphviz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/graphics/graphviz: . files X-SVN-Commit-Revision: 512625 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2019 11:21:20 -0000 Author: dinoex Date: Mon Sep 23 11:21:17 2019 New Revision: 512625 URL: https://svnweb.freebsd.org/changeset/ports/512625 Log: - update to 2.42.2 - change MASTER_SITES - add webp support - use automake - sort plist Added: head/graphics/graphviz/files/patch-config-config_ruby.rb (contents, props changed) head/graphics/graphviz/files/patch-configure.ac (contents, props changed) head/graphics/graphviz/files/patch-lib-expr-exgram.h (contents, props changed) head/graphics/graphviz/files/patch-lib-expr-expr.h (contents, props changed) head/graphics/graphviz/files/version.m4 (contents, props changed) Deleted: head/graphics/graphviz/files/patch-configure Modified: head/graphics/graphviz/Makefile head/graphics/graphviz/distinfo head/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h head/graphics/graphviz/pkg-plist Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Mon Sep 23 11:00:27 2019 (r512624) +++ head/graphics/graphviz/Makefile Mon Sep 23 11:21:17 2019 (r512625) @@ -2,26 +2,29 @@ # $FreeBSD$ PORTNAME= graphviz -PORTVERSION= 2.40.1 -PORTREVISION= 11 +PORTVERSION= 2.42.2 +PORTREVISION= 0 +MASTER_SITES= https://gitlab.com/graphviz/graphviz/-/archive/${PORTVERSION}/ CATEGORIES= graphics tk -MASTER_SITES= https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/ - MAINTAINER= dinoex@FreeBSD.org COMMENT= Graph Visualization Software from AT&T and Bell Labs LICENSE= EPL LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION} LIB_DEPENDS= libltdl.so:devel/libltdl \ libpng.so:graphics/png \ + libwebp.so:graphics/webp \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libexpat.so:textproc/expat2 \ libgd.so:${GD_PORT} USES= cpe pathfix shebangfix gmake bison groff pkgconfig \ - libtool:keepla localbase:ldflags jpeg compiler:c++11-lang + libtool:keepla autoreconf localbase:ldflags jpeg \ + compiler:c++11-lang tcl:build + GNU_CONFIGURE= yes # sincos is broken on armv6, see ports/220591 CFLAGS_armv6= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \ @@ -30,31 +33,23 @@ CFLAGS_armv6= -fno-builtin-sincos -fno-builtin-sin -fn CFLAGS_armv7= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \ -fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \ -fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl +MAKE_ENV= EXPR_COMPAT=yes +INSTALL_TARGET= install-strip +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} PLIST_SUB= PORTVERSION="${PORTVERSION}" -MAKE_ENV= EXPR_COMPAT=yes - -FIX_INCLUDE= \ - lib/cdt/dthdr.h \ - lib/pathplan/tri.h lib/pathplan/pathplan.h \ +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/arith.h lib/common/logic.h \ - lib/common/globals.h \ + lib/common/logic.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 \ + tclpkg/tclpathplan/demo/pathplan.tcl -PATCH_TCL_SCRIPTS= tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \ - tclpkg/tclpathplan/demo/pathplan.tcl -PATCH_TK_SCRIPTS= ${PATCH_TCL_SCRIPTS} - -PDOCS_TXT= doc/Dot.ref doc/latex_suggestions.txt -PDOCS_PDF= doc/*.pdf */*/*.pdf -PDOCS_HTML= doc/*.html doc/info/*.gif - -USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} - OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO POPPLER \ - ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA MING DEVIL \ + ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA DEVIL \ GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS \ DOCS EXAMPLES OPTIONS_DEFAULT= XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS @@ -70,7 +65,6 @@ GDK_DESC= gdk library support (requires GTK2) GDK_PIXBUF_DESC=gdk pixbuf support (requires GDK) GNOMEUI_DESC= libgnomeui support SMYRNA_DESC= SMYRNA graph viewer (requires GTK2) -MING_DESC= ming plugin DEVIL_DESC= devil plugin GHOSTSCRIPT_DESC=ghostscript plugin (requires PANGOCAIRO) PERL_DESC= Perl bindings (swig) @@ -96,15 +90,14 @@ PHP_USES= php:build PYTHON_USES= python:2.7,build RUBY_USE= RUBY=yes LUA_USES= lua -TCL_USES= tcl:build TK_USES= tk:build -TK_IMPLIES= TCL +DOCS_USES= ghostscript:build + POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib ANN_LIB_DEPENDS= libann.so:math/ann GTS_LIB_DEPENDS= libgts.so:graphics/gts SMYRNA_LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \ libgtkglext-x11-1.0.so:x11-toolkits/gtkglext -MING_LIB_DEPENDS= libming.so:graphics/ming DEVIL_LIB_DEPENDS= libIL.so:graphics/devil GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded @@ -126,9 +119,9 @@ GDK_PIXBUF_CONFIGURE_WITH= gdk-pixbuf GDK_PIXBUF_IMPLIES= GTK2 GDK GNOMEUI_CONFIGURE_WITH= gnomeui GNOMEUI_IMPLIES= GTK2 +SMYRNA_CONFIGURE_OFF= --with-glut=no SMYRNA_CONFIGURE_WITH= smyrna glade gtkgl gtkglext SMYRNA_IMPLIES= GTK2 GTS -MING_CONFIGURE_WITH= ming DEVIL_CONFIGURE_WITH= devil GHOSTSCRIPT_CONFIGURE_OFF= --with-ghostscript=no GHOSTSCRIPT_IMPLIES= PANGOCAIRO @@ -150,14 +143,14 @@ LUA_CONFIGURE_ENV= LUA="${LUA_BINDIR}/lua" \ LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER} LUA_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.lua TCL_CONFIGURE_ENABLE= tcl -TCL_CPPFLAGS= -I${TK_INCLUDEDIR} -TCL_CONFIGURE_ON= --with-tclsh=${TCLSH} --enable-tcl=yes +TCL_CPPFLAGS= -I${TCL_INCLUDEDIR} TCL_CONFIGURE_ENV= TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh" TCL_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.tcl \ PLIST_SUB+=TCL_VER="${TCL_VER}" TK_CPPFLAGS= -I${TK_INCLUDEDIR} TK_CONFIGURE_ON= --with-wish=${WISH} TK_CONFIGURE_ENV= TKCONFIG="${TK_LIBDIR}/tkConfig.sh" +TK_IMPLIES= TCL GUILE_CONFIGURE_ENABLE= guile NVTHREADS_LDFLAGS= -lpthread @@ -171,22 +164,15 @@ CONFIGURE_ARGS+= --program-transform-name="s/x/x/" \ --enable-r=no \ --with-freetype2=yes \ --with-libgd \ + --with-webp \ --with-fontconfigincludedir=${LOCALBASE}/include \ --with-fontconfiglibdir=${LOCALBASE}/lib \ + --with-tclsh=${TCLSH} \ --without-rsvg \ --with-qt=no \ --disable-io --disable-ocaml --disable-java \ --disable-sharp -.if ${PORT_OPTIONS:MMING} -BROKEN= Ming incomplete, uses removed libgraph -.endif - -.if ${PORT_OPTIONS:MTK} -# USES=tk:build is BROKEN: Does not allow to set both tcl and tk depedencies -BUILD_DEPENDS+= tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION} -.endif - .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= --with-iconvlibdir=${ICONV_PREFIX}/lib CONFIGURE_ARGS+= --with-iconvincludedir=${ICONV_PREFIX}/include @@ -208,90 +194,41 @@ CONFIGURE_ENV+= SWIG="/nonexistent" .include -.if ${PORT_OPTIONS:MPHP} -.if ${PHP_VER} < 70 -# force old PHP API -MAKE_ARGS+= SWIG_PHP_OPT=-php5 -.endif -.endif - post-patch: - ${FIND} ${WRKSRC} -name Makefile.in | \ - ${XARGS} ${REINPLACE_CMD} \ - -e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \ - -e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g" \ - -e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g" \ - -e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g" \ - -e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g" \ - -e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \ - -e 's|txtdir = $$(pkgdatadir)/doc|txtdir = ${DOCSDIR}|' \ - -e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|'; ${REINPLACE_CMD} \ - -e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \ - ${WRKSRC}/cmd/tools/Makefile.in \ - ${WRKSRC}/cmd/gvpr/Makefile.in - ${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \ - ${XARGS} ${REINPLACE_CMD} \ - -e 's|pkglibdir = $$(libdir)/@PACKAGE@|pkglibdir = $$(libdir)|g' \ - -e 's|libdir = @libdir@|libdir = @libdir@/@PACKAGE@|g'; - ${FIND} ${WRKSRC}/lib -name '*.pc.in' | \ - ${XARGS} ${REINPLACE_CMD} \ - -e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|'; - ${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \ - -e "s|vendorarchdir|sitearchdir|g" \ - -e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \ - -e "s|ruby-1[.]9|ruby-${RUBY_VER}|g" \ - -e 's|PHP_INSTALL_DIR=.*|PHP_INSTALL_DIR="${PREFIX}/lib/php/${PHP_EXT_DIR}"|' \ -e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \ - -e '/if test/ s| == | = |g' ${WRKSRC}/configure + -e 's|LUA_INSTALL_DIR=.*|LUA_INSTALL_DIR="${LUA_MODLIBDIR}"|' \ + ${WRKSRC}/configure.ac ${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \ ${WRKSRC}/cmd/smyrna/tvnodes.h - ${REINPLACE_CMD} -e 's|GTS_LIBS)|GTS_LIBS) $$(MATH_LIBS)|' \ - ${WRKSRC}/cmd/smyrna/Makefile.in - ${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/ ${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} \ + -e 's|exec wish |exec wish${TCL_VER} |' ${FIX_TK_SCRIPT} -post-patch-DOCS-off: - ${REINPLACE_CMD} -e 's| install-txtDATA$$||' \ - ${WRKSRC}/Makefile.in +pre-configure-DOCS-off: + ${REINPLACE_CMD} -e 's| doc | |' ${WRKSRC}/Makefile.am + ${FIND} ${WRKSRC} -name Makefile.am | \ + ${XARGS} ${REINPLACE_CMD} \ + -e 's|^pdf_DATA|#pdf_DATA|'; pre-install-PHP-on: ${MKDIR} "${STAGEDIR}/${PREFIX}/share/php" post-install: install-ldconfig-file - cd ${WRKSRC}/lib/expr && \ - ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET} cd ${WRKSRC} && \ ${INSTALL_DATA} ${FIX_INCLUDE} ${STAGEDIR}${PREFIX}/include/graphviz/ - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/html - ${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf - cd ${WRKSRC} && \ - ${INSTALL_DATA} ${PDOCS_TXT} ${STAGEDIR}${DOCSDIR}/ && \ - ${INSTALL_DATA} ${PDOCS_PDF} ${STAGEDIR}${DOCSDIR}/pdf/ && \ - ${INSTALL_DATA} ${PDOCS_HTML} ${STAGEDIR}${DOCSDIR}/html/ - -post-install-EXAMPLES-on: - @${ECHO_MSG} "Installing demo data..." - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_SCRIPT} \ - ${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \ - ${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \ - ${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl \ - ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl \ - ${STAGEDIR}${EXAMPLESDIR}/ - ${INSTALL_DATA} \ - ${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl.README \ - ${WRKSRC}/tclpkg/tcldot/demo/doted.tcl.README \ - ${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \ - ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \ - ${STAGEDIR}${EXAMPLESDIR}/ - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pathplan_data - ${INSTALL_DATA} \ - ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \ - ${STAGEDIR}${EXAMPLESDIR}/pathplan_data/ .include Modified: head/graphics/graphviz/distinfo ============================================================================== --- head/graphics/graphviz/distinfo Mon Sep 23 11:00:27 2019 (r512624) +++ head/graphics/graphviz/distinfo Mon Sep 23 11:21:17 2019 (r512625) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482692977 -SHA256 (graphviz-2.40.1.tar.gz) = ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421 -SIZE (graphviz-2.40.1.tar.gz) = 25633455 +TIMESTAMP = 1568894923 +SHA256 (graphviz-2.42.2.tar.gz) = b92a92bb16755b11875be9203a6216e5b827eb1d6cf8dda6824380457cd18c55 +SIZE (graphviz-2.42.2.tar.gz) = 34691166 Added: head/graphics/graphviz/files/patch-config-config_ruby.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/graphviz/files/patch-config-config_ruby.rb Mon Sep 23 11:21:17 2019 (r512625) @@ -0,0 +1,19 @@ +--- 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" Added: head/graphics/graphviz/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/graphviz/files/patch-configure.ac Mon Sep 23 11:21:17 2019 (r512625) @@ -0,0 +1,40 @@ +--- configure.ac.orig 2019-09-12 02:11:30 UTC ++++ configure.ac +@@ -697,7 +697,7 @@ else + if test "x$GUILE" = "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_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 +@@ -882,17 +882,17 @@ 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 + 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` + LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" + + pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` + if test "x$?" = "x0"; then +- LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lualib$l` ++ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lualib$l` + LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l` + fi + break +@@ -1412,6 +1412,7 @@ else + use_ruby="No (ruby not available)" + else + RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`" ++ RUBY_CFLAGS="${RUBY_CFLAGS} -I`$RUBY $srcdir/config/config_ruby.rb inc`" + # hack for powerpc-darwin8 (10.4) + if test "x$DARWIN" = "xyes"; then + RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'` Added: head/graphics/graphviz/files/patch-lib-expr-exgram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/graphviz/files/patch-lib-expr-exgram.h Mon Sep 23 11:21:17 2019 (r512625) @@ -0,0 +1,11 @@ +--- lib/expr/exgram.h.orig 2019-09-12 02:11:30 UTC ++++ lib/expr/exgram.h +@@ -23,7 +23,7 @@ extern "C" { + * sometimes free stuff can cost a lot + */ + +-#if !defined(_EXGRAM_H) && ( defined(MINTOKEN) || defined(YYTOKENTYPE) ) ++#if !defined(_EXGRAM_H) + #define _EXGRAM_H + + #if !defined(_EXPARSE_H) Added: head/graphics/graphviz/files/patch-lib-expr-expr.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/graphviz/files/patch-lib-expr-expr.h Mon Sep 23 11:21:17 2019 (r512625) @@ -0,0 +1,10 @@ +--- lib/expr/expr.h.orig 2019-09-12 02:11:30 UTC ++++ lib/expr/expr.h +@@ -27,6 +27,7 @@ extern "C" { + + #include + #include ++#include + + #undef RS /* hp.pa grabs this!! */ + Modified: head/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h ============================================================================== --- head/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h Mon Sep 23 11:00:27 2019 (r512624) +++ head/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h Mon Sep 23 11:21:17 2019 (r512625) @@ -1,4 +1,4 @@ ---- lib/vmalloc/vmhdr.h.orig 2016-12-22 05:44:41 UTC +--- 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 @@ -8,6 +8,6 @@ +/* No sbrk on FreeBSD/AArch64 */ +#define _std_malloc 1 +#endif - #ifdef WIN32 + #ifdef _WIN32 #include #endif Added: head/graphics/graphviz/files/version.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/graphviz/files/version.m4 Mon Sep 23 11:21:17 2019 (r512625) @@ -0,0 +1,9 @@ +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) Modified: head/graphics/graphviz/pkg-plist ============================================================================== --- head/graphics/graphviz/pkg-plist Mon Sep 23 11:00:27 2019 (r512624) +++ head/graphics/graphviz/pkg-plist Mon Sep 23 11:21:17 2019 (r512625) @@ -1,14 +1,14 @@ bin/acyclic bin/bcomps +bin/ccomps bin/circo bin/cluster -bin/ccomps bin/diffimg bin/dijkstra bin/dot bin/dot2gxl -%%XPM%%bin/dotty bin/dot_builtins +%%XPM%%bin/dotty bin/edgepaint bin/fdp bin/gc @@ -22,8 +22,8 @@ bin/gvmap bin/gvmap.sh bin/gvpack bin/gvpr -bin/gxl2gv bin/gxl2dot +bin/gxl2gv %%XPM%%bin/lefty %%XPM%%bin/lneato %%ANN%%bin/mingle @@ -48,20 +48,20 @@ include/graphviz/dthdr.h include/graphviz/geom.h include/graphviz/globals.h include/graphviz/graphviz_version.h -include/graphviz/gv.i include/graphviz/gv.cpp +include/graphviz/gv.i include/graphviz/gvc.h include/graphviz/gvcext.h -include/graphviz/gvcommon.h -include/graphviz/gvconfig.h include/graphviz/gvcint.h include/graphviz/gvcjob.h +include/graphviz/gvcommon.h +include/graphviz/gvconfig.h include/graphviz/gvplugin.h -include/graphviz/gvplugin_render.h +include/graphviz/gvplugin_device.h include/graphviz/gvplugin_layout.h include/graphviz/gvplugin_loadimage.h +include/graphviz/gvplugin_render.h include/graphviz/gvplugin_textlayout.h -include/graphviz/gvplugin_device.h include/graphviz/gvpr.h include/graphviz/logic.h include/graphviz/pack.h @@ -76,26 +76,16 @@ include/graphviz/usershape.h include/graphviz/vis.h include/graphviz/vispath.h include/graphviz/xdot.h -lib/graphviz/libcdt.la -lib/graphviz/libcdt.so -lib/graphviz/libcdt.so.5 -lib/graphviz/libcdt.so.5.0.0 -lib/graphviz/libcgraph.la -lib/graphviz/libcgraph.so -lib/graphviz/libcgraph.so.6 -lib/graphviz/libcgraph.so.6.0.0 -lib/graphviz/libpathplan.la -lib/graphviz/libpathplan.so -lib/graphviz/libpathplan.so.4 -lib/graphviz/libpathplan.so.4.0.0 -lib/graphviz/libgvc.la -lib/graphviz/libgvc.so -lib/graphviz/libgvc.so.6 -lib/graphviz/libgvc.so.6.0.0 +%%GUILE%%lib/graphviz/guile/libgv_guile.la +%%GUILE%%lib/graphviz/guile/libgv_guile.so lib/graphviz/libgvplugin_core.la lib/graphviz/libgvplugin_core.so lib/graphviz/libgvplugin_core.so.6 lib/graphviz/libgvplugin_core.so.6.0.0 +%%DEVIL%%lib/graphviz/libgvplugin_devil.la +%%DEVIL%%lib/graphviz/libgvplugin_devil.so +%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6 +%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6.0.0 lib/graphviz/libgvplugin_dot_layout.la lib/graphviz/libgvplugin_dot_layout.so lib/graphviz/libgvplugin_dot_layout.so.6 @@ -104,6 +94,10 @@ lib/graphviz/libgvplugin_gd.la lib/graphviz/libgvplugin_gd.so lib/graphviz/libgvplugin_gd.so.6 lib/graphviz/libgvplugin_gd.so.6.0.0 +%%GDK%%lib/graphviz/libgvplugin_gdk.la +%%GDK%%lib/graphviz/libgvplugin_gdk.so +%%GDK%%lib/graphviz/libgvplugin_gdk.so.6 +%%GDK%%lib/graphviz/libgvplugin_gdk.so.6.0.0 %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6 @@ -112,13 +106,6 @@ lib/graphviz/libgvplugin_gd.so.6.0.0 %%GTK2%%lib/graphviz/libgvplugin_gtk.so %%GTK2%%lib/graphviz/libgvplugin_gtk.so.6 %%GTK2%%lib/graphviz/libgvplugin_gtk.so.6.0.0 -%%MING%%lib/graphviz/libgvplugin_ming.so -%%MING%%lib/graphviz/libgvplugin_ming.so.6 -%%MING%%lib/graphviz/libgvplugin_ming.so.6.0.0 -%%GDK%%lib/graphviz/libgvplugin_gdk.la -%%GDK%%lib/graphviz/libgvplugin_gdk.so -%%GDK%%lib/graphviz/libgvplugin_gdk.so.6 -%%GDK%%lib/graphviz/libgvplugin_gdk.so.6.0.0 lib/graphviz/libgvplugin_neato_layout.la lib/graphviz/libgvplugin_neato_layout.so lib/graphviz/libgvplugin_neato_layout.so.6 @@ -131,25 +118,36 @@ lib/graphviz/libgvplugin_neato_layout.so.6.0.0 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so %%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6.0.0 +lib/graphviz/libgvplugin_visio.la +lib/graphviz/libgvplugin_visio.so +lib/graphviz/libgvplugin_visio.so.6 +lib/graphviz/libgvplugin_visio.so.6.0.0 +lib/graphviz/libgvplugin_webp.la +lib/graphviz/libgvplugin_webp.so +lib/graphviz/libgvplugin_webp.so.6 +lib/graphviz/libgvplugin_webp.so.6.0.0 %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.la %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6 %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6.0.0 -lib/graphviz/libgvpr.la -lib/graphviz/libgvpr.so -lib/graphviz/libgvpr.so.2 -lib/graphviz/libgvpr.so.2.0.0 -%%GUILE%%lib/graphviz/guile/libgv_guile.la -%%GUILE%%lib/graphviz/guile/libgv_guile.so -lib/graphviz/liblab_gamut.la -lib/graphviz/liblab_gamut.so -lib/graphviz/liblab_gamut.so.1 -lib/graphviz/liblab_gamut.so.1.0.0 +%%LUA%%lib/graphviz/lua/gv.so +%%LUA%%lib/graphviz/lua/libgv_lua.la +%%LUA%%lib/graphviz/lua/libgv_lua.so +%%PERL%%lib/graphviz/perl/gv.pm +%%PERL%%lib/graphviz/perl/gv.so +%%PERL%%lib/graphviz/perl/libgv_perl.la +%%PERL%%lib/graphviz/perl/libgv_perl.so %%PHP%%lib/graphviz/php/gv.php %%PHP%%lib/graphviz/php/gv.so %%PHP%%lib/graphviz/php/libgv_php.la %%PHP%%lib/graphviz/php/libgv_php.so -%%PHP%%lib/php/%%PHP_EXT_DIR%%/gv.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 +%%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 @@ -169,6 +167,41 @@ lib/graphviz/liblab_gamut.so.1.0.0 %%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 +lib/libcdt.so.5 +lib/libcdt.so.5.0.0 +lib/libcgraph.la +lib/libcgraph.so +lib/libcgraph.so.6 +lib/libcgraph.so.6.0.0 +lib/libgvc.la +lib/libgvc.so +lib/libgvc.so.6 +lib/libgvc.so.6.0.0 +lib/libgvpr.la +lib/libgvpr.so +lib/libgvpr.so.2 +lib/libgvpr.so.2.0.0 +lib/liblab_gamut.la +lib/liblab_gamut.so +lib/liblab_gamut.so.1 +lib/liblab_gamut.so.1.0.0 +lib/libpathplan.la +lib/libpathplan.so +lib/libpathplan.so.4 +lib/libpathplan.so.4.0.0 +lib/libxdot.la +lib/libxdot.so +lib/libxdot.so.4 +lib/libxdot.so.4.0.0 +%%LUA%%lib/lua/%%LUA_VER%%/gv.so +%%PERL%%%%SITE_ARCH%%/gv.pm +%%PERL%%%%SITE_ARCH%%/gv.so +%%PHP%%lib/php/%%PHP_EXT_DIR%%/gv.so +%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so +%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py +%%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 @@ -188,82 +221,56 @@ lib/graphviz/liblab_gamut.so.1.0.0 %%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 -%%LUA%%lib/graphviz/lua/gv.so -%%LUA%%lib/graphviz/lua/libgv_lua.la -%%LUA%%lib/graphviz/lua/libgv_lua.so -%%LUA%%lib/lua/%%LUA_VER%%/gv.so -%%PERL%%lib/graphviz/perl/gv.so -%%PERL%%lib/graphviz/perl/gv.pm -%%PERL%%lib/graphviz/perl/libgv_perl.la -%%PERL%%lib/graphviz/perl/libgv_perl.so -%%PERL%%%%SITE_ARCH%%/gv.pm -%%PERL%%%%SITE_ARCH%%/gv.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%%%%PYTHON_LIBDIR%%/site-packages/_gv.so -%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py -%%RUBY%%lib/graphviz/ruby/gv.so -%%RUBY%%lib/graphviz/ruby/libgv_ruby.la -%%RUBY%%lib/graphviz/ruby/libgv_ruby.so -%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so -%%DEVIL%%lib/graphviz/libgvplugin_devil.la -%%DEVIL%%lib/graphviz/libgvplugin_devil.so -%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6 -%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6.0.0 -lib/graphviz/libxdot.la -lib/graphviz/libxdot.so -lib/graphviz/libxdot.so.4 -lib/graphviz/libxdot.so.4.0.0 @postexec %D/bin/dot -c @postunexec rm -f %D/lib/graphviz/config6 libdata/pkgconfig/libcdt.pc libdata/pkgconfig/libcgraph.pc -libdata/pkgconfig/libpathplan.pc libdata/pkgconfig/libgvc.pc libdata/pkgconfig/libgvpr.pc libdata/pkgconfig/liblab_gamut.pc +libdata/pkgconfig/libpathplan.pc libdata/pkgconfig/libxdot.pc man/man1/acyclic.1.gz man/man1/bcomps.1.gz man/man1/ccomps.1.gz +man/man1/circo.1.gz man/man1/cluster.1.gz 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 -man/man1/graphml2gv.1.gz man/man1/gml2gv.1.gz +man/man1/graphml2gv.1.gz +man/man1/gv2gml.1.gz man/man1/gv2gxl.1.gz +man/man1/gvcolor.1.gz man/man1/gvgen.1.gz man/man1/gvmap.1.gz man/man1/gvmap.sh.1.gz -man/man1/gvcolor.1.gz 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 man/man1/nop.1.gz man/man1/osage.1.gz man/man1/patchwork.1.gz man/man1/prune.1.gz man/man1/sccmap.1.gz +man/man1/sfdp.1.gz %%SMYRNA%%man/man1/smyrna.1.gz man/man1/tred.1.gz +man/man1/twopi.1.gz man/man1/unflatten.1.gz man/man1/vimdot.1.gz -man/man1/circo.1.gz -man/man1/fdp.1.gz -man/man1/neato.1.gz -man/man1/sfdp.1.gz -man/man1/twopi.1.gz -man/man1/gv2gml.1.gz -man/man1/gxl2gv.1.gz man/man3/cdt.3.gz man/man3/cgraph.3.gz man/man3/expr.3.gz @@ -288,124 +295,192 @@ man/man7/graphviz.7.gz %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/Dot.ref %%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/addingLayout.txt %%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/winbuild.html -%%PORTDOCS%%%%DOCSDIR%%/html/Mcircle.gif -%%PORTDOCS%%%%DOCSDIR%%/html/Mdiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/Msquare.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_box.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_crow.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_diamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_dot.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_ediamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_empty.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_forward.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_halfopen.gif -%%PORTDOCS%%%%DOCSDIR%%/html/box.gif -%%PORTDOCS%%%%DOCSDIR%%/html/box3d.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_inv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_invdot.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_invempty.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_invodot.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_lteeoldiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_nohead.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_none.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_normal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_obox.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_odiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_odot.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_open.gif -%%PORTDOCS%%%%DOCSDIR%%/html/a_tee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_box.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_crow.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_diamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_dot.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_inv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_lbox.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_lcrow.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_ldiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_linv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_lnormal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_ltee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_lvee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_none.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_normal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_obox.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_odiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_odot.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_oinv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_olbox.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_oldiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_olinv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_olnormal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_onormal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_orbox.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_ordiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_orinv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_ornormal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rbox.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rcrow.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rdiamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rinv.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rnormal.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rtee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_rvee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_tee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/aa_vee.gif -%%PORTDOCS%%%%DOCSDIR%%/html/back.gif -%%PORTDOCS%%%%DOCSDIR%%/html/both.gif -%%PORTDOCS%%%%DOCSDIR%%/html/circle.gif -%%PORTDOCS%%%%DOCSDIR%%/html/colorlist.gif -%%PORTDOCS%%%%DOCSDIR%%/html/component.gif -%%PORTDOCS%%%%DOCSDIR%%/html/constraint.gif -%%PORTDOCS%%%%DOCSDIR%%/html/cylinder.gif -%%PORTDOCS%%%%DOCSDIR%%/html/diamond.gif -%%PORTDOCS%%%%DOCSDIR%%/html/doublecircle.gif -%%PORTDOCS%%%%DOCSDIR%%/html/doubleoctagon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/egg.gif -%%PORTDOCS%%%%DOCSDIR%%/html/ellipse.gif -%%PORTDOCS%%%%DOCSDIR%%/html/fill.gif -%%PORTDOCS%%%%DOCSDIR%%/html/folder.gif -%%PORTDOCS%%%%DOCSDIR%%/html/forward.gif -%%PORTDOCS%%%%DOCSDIR%%/html/hexagon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/house.gif -%%PORTDOCS%%%%DOCSDIR%%/html/html1.gif -%%PORTDOCS%%%%DOCSDIR%%/html/html2.gif -%%PORTDOCS%%%%DOCSDIR%%/html/html3.gif -%%PORTDOCS%%%%DOCSDIR%%/html/html4.gif +%%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.jpg +%%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/invhouse.gif -%%PORTDOCS%%%%DOCSDIR%%/html/invtrapezium.gif -%%PORTDOCS%%%%DOCSDIR%%/html/invtriangle.gif -%%PORTDOCS%%%%DOCSDIR%%/html/mrecord.gif -%%PORTDOCS%%%%DOCSDIR%%/html/nohead.gif -%%PORTDOCS%%%%DOCSDIR%%/html/none.gif -%%PORTDOCS%%%%DOCSDIR%%/html/note.gif -%%PORTDOCS%%%%DOCSDIR%%/html/octagon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/oval.gif -%%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif -%%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/plain.gif -%%PORTDOCS%%%%DOCSDIR%%/html/plaintext.gif -%%PORTDOCS%%%%DOCSDIR%%/html/point.gif -%%PORTDOCS%%%%DOCSDIR%%/html/polygon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/record.gif -%%PORTDOCS%%%%DOCSDIR%%/html/record2.gif -%%PORTDOCS%%%%DOCSDIR%%/html/rect.gif -%%PORTDOCS%%%%DOCSDIR%%/html/rectangle.gif -%%PORTDOCS%%%%DOCSDIR%%/html/round.gif -%%PORTDOCS%%%%DOCSDIR%%/html/septagon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/square.gif -%%PORTDOCS%%%%DOCSDIR%%/html/tab.gif +%%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/trapezium.gif -%%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif -%%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif -%%PORTDOCS%%%%DOCSDIR%%/html/underline.gif +%%PORTDOCS%%%%DOCSDIR%%/html/winbuild.html %%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt %%PORTDOCS%%%%DOCSDIR%%/pdf/Agraph.pdf *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***