[pkgsrc/trunk]: pkgsrc/graphics/graphviz Update to version 2.0.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/graphviz Update to version 2.0.
From: seb <seb%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:06:02 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/466f779a91cc
branches:  trunk
changeset: 486191:466f779a91cc
user:      seb <seb%pkgsrc.org@localhost>
date:      Fri Dec 24 18:26:56 2004 +0000

description:
Update to version 2.0.

Package changes:
  - use GD library from the graphics/gd package

Changes since last packaged version (1.16):
December 11, 2004
  - release 2.0
  - new CPL license
  - re indent all sources
December 11, 2004
  - release 1.18
 dotneato
  - fix bugs: 451, 536, 545, 547, 548, 559, 561, 565, 572
  - increase max size  of HTML tables.
  - spline cluster edges in fdp
  - center userimages in nodes
  - support user images in HTML table cells
  - syntax extension for node:port:compass as well as node:compass
  - FreeBSD fixes
  - sync with gd-2.0.32
  - attempt to catch some out-of-memory conditions with very large graphs
  - support background and node-fill partial transparency when truecolor=true

diffstat:

 graphics/graphviz/MESSAGE          |    3 +-
 graphics/graphviz/Makefile         |    7 +-
 graphics/graphviz/PLIST            |   20 +-----
 graphics/graphviz/distinfo         |   27 ++++----
 graphics/graphviz/patches/patch-aa |   13 ----
 graphics/graphviz/patches/patch-ab |   55 ++++++++++--------
 graphics/graphviz/patches/patch-ac |   53 ++++++++++-------
 graphics/graphviz/patches/patch-ar |   25 ++++++-
 graphics/graphviz/patches/patch-as |   70 ++++++++++++++----------
 graphics/graphviz/patches/patch-bv |   32 +++++++---
 graphics/graphviz/patches/patch-bw |  107 +++++++++++++++++++-----------------
 graphics/graphviz/patches/patch-bx |   10 +-
 graphics/graphviz/patches/patch-by |   18 +++---
 graphics/graphviz/patches/patch-bz |   16 +++--
 graphics/graphviz/patches/patch-ca |   36 ++++++------
 15 files changed, 261 insertions(+), 231 deletions(-)

diffs (truncated from 1101 to 300 lines):

diff -r e6c0c691b459 -r 466f779a91cc graphics/graphviz/MESSAGE
--- a/graphics/graphviz/MESSAGE Fri Dec 24 17:22:02 2004 +0000
+++ b/graphics/graphviz/MESSAGE Fri Dec 24 18:26:56 2004 +0000
@@ -1,9 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:06 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2004/12/24 18:26:56 seb Exp $
 
 Please read graphviz license terms in:
 
-${PREFIX}/share/doc/graphviz/MINTERMS.txt
 ${PREFIX}/share/doc/graphviz/COPYING
 
 ===========================================================================
diff -r e6c0c691b459 -r 466f779a91cc graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Fri Dec 24 17:22:02 2004 +0000
+++ b/graphics/graphviz/Makefile        Fri Dec 24 18:26:56 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/12/03 11:42:57 seb Exp $
+# $NetBSD: Makefile,v 1.27 2004/12/24 18:26:56 seb Exp $
 #
 
-DISTNAME=      graphviz-1.16
+DISTNAME=      graphviz-2.0
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -23,7 +23,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=       --with-mylibgd
 CONFIGURE_ENV+=                TCLCONFIG=${TCLCONFIG_SH}
 CONFIGURE_ENV+=                TKCONFIG=${TKCONFIG_SH}
 CONFIGURE_ENV+=                X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
@@ -40,10 +39,12 @@
 pre-build:
        ${TOUCH} ${WRKSRC}/Makefile
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff -r e6c0c691b459 -r 466f779a91cc graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST   Fri Dec 24 17:22:02 2004 +0000
+++ b/graphics/graphviz/PLIST   Fri Dec 24 18:26:56 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/29 22:11:51 seb Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/12/24 18:26:56 seb Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -41,6 +41,7 @@
 include/graphviz/circpos.h
 include/graphviz/circular.h
 include/graphviz/closest.h
+include/graphviz/clusteredges.h
 include/graphviz/colortbl.h
 include/graphviz/comp.h
 include/graphviz/conjgrad.h
@@ -56,21 +57,10 @@
 include/graphviz/edgelist.h
 include/graphviz/edges.h
 include/graphviz/embed_graph.h
-include/graphviz/entities.h
 include/graphviz/exgram.h
 include/graphviz/exlib.h
 include/graphviz/expr.h
 include/graphviz/fdp.h
-include/graphviz/gd.h
-include/graphviz/gd_io.h
-include/graphviz/gdcache.h
-include/graphviz/gdfontg.h
-include/graphviz/gdfontl.h
-include/graphviz/gdfontmb.h
-include/graphviz/gdfonts.h
-include/graphviz/gdfontt.h
-include/graphviz/gdfx.h
-include/graphviz/gdhelpers.h
 include/graphviz/geometry.h
 include/graphviz/globals.h
 include/graphviz/grammar.h
@@ -84,7 +74,6 @@
 include/graphviz/htmllex.h
 include/graphviz/htmltable.h
 include/graphviz/info.h
-include/graphviz/jisx0208.h
 include/graphviz/kkutils.h
 include/graphviz/libgraph.h
 include/graphviz/macros.h
@@ -120,7 +109,6 @@
 include/graphviz/vispath.h
 include/graphviz/vmstub.h
 include/graphviz/voronoi.h
-include/graphviz/wbmp.h
 include/graphviz/xlayout.h
 lib/graphviz/libagraph.la
 lib/graphviz/libcdt.la
@@ -132,7 +120,6 @@
 lib/graphviz/libfdpgen.la
 lib/graphviz/libgdtclft.la
 lib/graphviz/libgraph.la
-lib/graphviz/libgvgd.la
 lib/graphviz/libgvrender.la
 lib/graphviz/libneatogen.la
 lib/graphviz/libpack.la
@@ -193,15 +180,14 @@
 share/doc/graphviz/ChangeLog
 share/doc/graphviz/Dot.ref
 share/doc/graphviz/FAQ.txt
-share/doc/graphviz/MINTERMS.txt
 share/doc/graphviz/NEWS
 share/doc/graphviz/latex_suggestions.txt
 share/doc/graphviz/pdf/dotguide.pdf
 share/doc/graphviz/pdf/dottyguide.pdf
 share/doc/graphviz/pdf/leftyguide.pdf
 share/doc/graphviz/pdf/neatoguide.pdf
+share/doc/html/graphviz/CPL.html
 share/doc/html/graphviz/FAQ.html
-share/doc/html/graphviz/LICENSE.html
 share/doc/html/graphviz/Mcircle.gif
 share/doc/html/graphviz/Mdiamond.gif
 share/doc/html/graphviz/Msquare.gif
diff -r e6c0c691b459 -r 466f779a91cc graphics/graphviz/distinfo
--- a/graphics/graphviz/distinfo        Fri Dec 24 17:22:02 2004 +0000
+++ b/graphics/graphviz/distinfo        Fri Dec 24 18:26:56 2004 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2004/11/29 22:11:51 seb Exp $
+$NetBSD: distinfo,v 1.13 2004/12/24 18:26:56 seb Exp $
 
-SHA1 (graphviz-1.16/graphviz-1.16.tar.gz) = f613884100c62fb409ec5a2571df46d9caafe5e0
-Size (graphviz-1.16/graphviz-1.16.tar.gz) = 4387670 bytes
-SHA1 (patch-aa) = 65d3092648d74ec2cbd4c4c685ae97048d6b8369
-SHA1 (patch-ab) = a0f006b1dfe0869a1faca7ff1152154bd39a62c1
-SHA1 (patch-ac) = 3322fce515598b9fddd6b87c84bb1973e15d37e4
+SHA1 (graphviz-2.0/graphviz-2.0.tar.gz) = f324c9010fedcc97bd65a880d83b645dbe6282ef
+Size (graphviz-2.0/graphviz-2.0.tar.gz) = 4384874 bytes
+SHA1 (patch-ab) = c04269613e3e7ecefe9492b075d3303a1f125515
+SHA1 (patch-ac) = a03e3427863b64735aeff895e0bd8dcb0e6714e1
 SHA1 (patch-ad) = 93c24f960bf5bfb405ab2d8751efc1e652cd92a0
 SHA1 (patch-ae) = 9255ba6000a7ebc3483d915ff8468e3a448200f8
 SHA1 (patch-af) = 37d2492fd95256fb7b4031d5013c068c89a27946
@@ -19,8 +18,8 @@
 SHA1 (patch-ao) = e165189a3e9c8e83a0fbb1c614b1e230f9919793
 SHA1 (patch-ap) = 157a1185fcfcc9376e08ec6392050d67890ade58
 SHA1 (patch-aq) = 1cb76e7209e080a934da091921061eddb704dd1a
-SHA1 (patch-ar) = 7c8ac4768071cbc4554da3f27ca4bcc8538229ab
-SHA1 (patch-as) = 05b2f1721ed181b0f12daf32700c96c74e00658f
+SHA1 (patch-ar) = fc3892b5a70f2e22d45f4af6abab40895384be24
+SHA1 (patch-as) = 5a44b60202f70746efacfc6cf2d6d808f40a0f92
 SHA1 (patch-at) = 31057001f25260b72da8f8617c24627d721cf413
 SHA1 (patch-au) = 1b47f17ba332918378ab72750ca6d5a8fb510555
 SHA1 (patch-av) = b6f3789262b1df0004deba32a960e5aa26373b2d
@@ -49,12 +48,12 @@
 SHA1 (patch-bs) = f9e0a38cb1113129ccf801bfb3347adb3827686a
 SHA1 (patch-bt) = 301fec1d5c7b6879f71c7f89663ca313834611ff
 SHA1 (patch-bu) = af47727c3a1dd592f5d0b4f006ba7452b8f44da8
-SHA1 (patch-bv) = 69d8265ae78b376faf6c500960e0c2a823ce9ee0
-SHA1 (patch-bw) = 20eaaa7c849db653f7486e7ac9626455a0704ce4
-SHA1 (patch-bx) = 8f59d965eab1671ec238ed33f81734a6ef22c6ed
-SHA1 (patch-by) = d0dc92ad3680e2c6845c8600281da5e4d3a1f365
-SHA1 (patch-bz) = ca697013c8c3b95990d2c99b256646287e199bdd
-SHA1 (patch-ca) = b6bcf483ee384bd8a51383a49dda8b61a437bdb6
+SHA1 (patch-bv) = 7d6dc89a1ee5da5cbefe437cf8ffed62108d276c
+SHA1 (patch-bw) = 1912e141b9ef60be69099c94f9aa4342bcc18d80
+SHA1 (patch-bx) = 00d43b4790b9849a2ee89d93456af22784a9b8b5
+SHA1 (patch-by) = 25306d179e069581ada7ddb6f55607cfb1ab1512
+SHA1 (patch-bz) = 988f3c93b6eeb2bd0efdf486e18189ec558d3769
+SHA1 (patch-ca) = 3a15d19801a946330a08ad1ffd2da4e95c0feb11
 SHA1 (patch-cb) = 50210dc6f6e0676df267af54422aab240feded78
 SHA1 (patch-cc) = ee35c991c06e09ec21b83fbf3d9ecdb8fdfaaf8f
 SHA1 (patch-cd) = d1ea0b21b4fc6806c7437becc608644436424306
diff -r e6c0c691b459 -r 466f779a91cc graphics/graphviz/patches/patch-aa
--- a/graphics/graphviz/patches/patch-aa        Fri Dec 24 17:22:02 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/11/29 22:11:51 seb Exp $
-
---- MINTERMS.txt.orig  2002-04-16 20:37:02.000000000 +0000
-+++ MINTERMS.txt
-@@ -2,7 +2,7 @@
- Appendix A - Minimum Terms
- --------------------------
- 
--LICENSOR: ______________
-+LICENSOR: The NetBSD Project
- 
- LICENSE AGREEMENT
- 
diff -r e6c0c691b459 -r 466f779a91cc graphics/graphviz/patches/patch-ab
--- a/graphics/graphviz/patches/patch-ab        Fri Dec 24 17:22:02 2004 +0000
+++ b/graphics/graphviz/patches/patch-ab        Fri Dec 24 18:26:56 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-ab,v 1.9 2004/12/24 18:26:57 seb Exp $
 
---- configure.ac.orig  2004-09-14 22:04:08.000000000 +0000
+--- configure.ac.orig  2004-12-11 20:38:20.000000000 +0000
 +++ configure.ac
-@@ -25,7 +25,10 @@ case "${target_os}" in
+@@ -36,7 +36,10 @@ case "${target_os}" in
        PATHSEPARATOR=":"
        ;;
    * ) # This sucks!  Whatever happened to standards for file system layout?
@@ -14,7 +14,7 @@
        PATHSEPARATOR=":"
        ;;
  esac
-@@ -206,71 +209,12 @@ dnl INCLUDES and LIBS for TCL
+@@ -217,75 +220,12 @@ dnl INCLUDES and LIBS for TCL
  # start by assuming we have it
  HAVE_TCL=1 
  
@@ -55,12 +55,11 @@
 -    if test "x$TCL_INCLUDES" != "x" ; then
 -        AC_MSG_RESULT([using tcl headers from $TCL_INCLUDES])
 -    fi
--    AC_SUBST(TCL_INCLUDES)
++. ${TCLCONFIG}
++TCL_INCLUDES=${TCL_INCLUDE_SPEC}
+     AC_SUBST(TCL_INCLUDES)
 -    save_CPPFLAGS=$CPPFLAGS
 -    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
-+. ${TCLCONFIG}
-+TCL_INCLUDES=${TCL_INCLUDE_SPEC}
-+AC_SUBST(TCL_INCLUDES)
      AC_CHECK_HEADER(tcl.h,,[
          AC_MSG_WARN([Unable to find header tcl.h. The Tcl packages will not be built])
          HAVE_TCL=0])
@@ -70,11 +69,15 @@
 -if test "$HAVE_TCL" = "1"; then
 -    # Some systems don't have Tcl.  Don't build
 -    # the Tcl products if we don't have the library.
--    if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
--        TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
+-    if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
+-        TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh
 -    else
--        if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
--            TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+-        if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tclConfig.sh; then
+-            TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tclConfig.sh
+-        else
+-            if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
+-                TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+-            fi
 -        fi
 -    fi
 -    if test "x$TCLCONFIG" != "x"; then
@@ -89,11 +92,10 @@
  
  if test "$HAVE_TCL" = "1"; then
      # TCL STUBS support is required
-@@ -353,77 +297,13 @@ if test "$HAVE_TCL" = "0"; then
- fi
+@@ -369,80 +309,13 @@ fi
  
  HAVE_TK=$HAVE_TCL
--                                                                                
+                                                                                 
 -if test "$HAVE_TK" = "1"; then
 -    AC_ARG_WITH(wish,
 -        [  --with-wish=PROG        build graphviz for specific wish],
@@ -134,12 +136,11 @@
 -    if test "x$TK_INCLUDES" != "x" ; then
 -      AC_MSG_RESULT([using tk headers from $TK_INCLUDES])
 -    fi
--    AC_SUBST(TK_INCLUDES)
--    save_CPPFLAGS=$CPPFLAGS
--    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES"
 +. ${TKCONFIG}
 +TK_INCLUDES="-I${TK_PREFIX}/include"
-+AC_SUBST(TK_INCLUDES)
+     AC_SUBST(TK_INCLUDES)
+-    save_CPPFLAGS=$CPPFLAGS
+-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES $X_CFLAGS"
      AC_CHECK_HEADER(tk.h,,[
          AC_MSG_WARN([Unable to find header tk.h. The Tk packages will not be built])
          HAVE_TK=0])
@@ -148,13 +149,17 @@
  
 -if test "$HAVE_TK" = "1"; then
 -    # Some systems don't have Tcl.  Don't build
--    # Some systems have Tcl, but not TK.  Don't build
+-    # Some systems have Tcl, but not Tk.  Don't build
 -    # the Tk products if we don't have the library.
--    if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
--        TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
+-    if test -f ${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tk${TK_VERSION_FOUND}/tkConfig.sh; then
+-        TKCONFIG=${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tk${TK_VERSION_FOUND}/tkConfig.sh
 -    else
--        if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
--          TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+-        if test -f ${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tkConfig.sh; then
+-          TKCONFIG=${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tkConfig.sh
Prev by Date: [pkgsrc/trunk]: pkgsrc Adjust dependencies after ocaml has been splitted into...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/ocaml Looks like the rpath problem is a bit more ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc Adjust dependencies after ocaml has been splitted into...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/ocaml Looks like the rpath problem is a bit more ...
Indexes:
Home | Main Index | Thread Index | Old Index