summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/graphviz/Makefile5
-rw-r--r--graphics/graphviz/PLIST20
-rw-r--r--graphics/graphviz/distinfo13
-rw-r--r--graphics/graphviz/patches/patch-lib_cgraph_scan.l89
-rw-r--r--graphics/graphviz/patches/patch-lib_gvc_Makefile.in10
-rw-r--r--graphics/graphviz/patches/patch-plugin_gd_Makefile.am12
-rw-r--r--graphics/graphviz/patches/patch-plugin_gd_Makefile.in12
7 files changed, 27 insertions, 134 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index a5358a8f088..2446e8b1155 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.138 2014/02/12 23:18:00 tron Exp $
+# $NetBSD: Makefile,v 1.139 2014/04/03 09:34:03 wiz Exp $
-DISTNAME= graphviz-2.34.0
-PKGREVISION= 7
+DISTNAME= graphviz-2.36.0
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 8ec78f3bdbc..46b9284a12c 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2013/10/09 18:30:22 sno Exp $
+@comment $NetBSD: PLIST,v 1.46 2014/04/03 09:34:03 wiz Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -61,7 +61,7 @@ include/graphviz/gvpr.h
include/graphviz/pack.h
include/graphviz/pathgeom.h
include/graphviz/pathplan.h
-include/graphviz/textpara.h
+include/graphviz/textspan.h
include/graphviz/types.h
include/graphviz/usershape.h
include/graphviz/xdot.h
@@ -69,7 +69,7 @@ ${PLIST.guile}lib/graphviz/guile/libgv_guile.la
lib/graphviz/libgvplugin_core.la
lib/graphviz/libgvplugin_dot_layout.la
${PLIST.gd}lib/graphviz/libgvplugin_gd.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la
${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la
lib/graphviz/libgvplugin_neato_layout.la
@@ -111,7 +111,13 @@ lib/pkgconfig/libgvc.pc
lib/pkgconfig/libgvpr.pc
lib/pkgconfig/libpathplan.pc
lib/pkgconfig/libxdot.pc
-${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtclplan.la
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtkspline.la
+${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/pkgIndex.tcl
man/man1/acyclic.1
man/man1/bcomps.1
man/man1/ccomps.1
@@ -152,13 +158,13 @@ man/man3/cdt.3
man/man3/cgraph.3
man/man3/expr.3
${PLIST.tcl}${PLIST.gd}man/man3/gdtclft.3tcl
-man/man3/graph.3
${PLIST.guile}man/man3/gv.3guile
${PLIST.lua}man/man3/gv.3lua
${PLIST.ocaml}man/man3/gv.3ocaml
${PLIST.perl}man/man3/gv.3perl
${PLIST.tcl}man/man3/gv.3tcl
man/man3/gvc.3
+man/man3/gvpr.3
man/man3/pack.3
man/man3/pathplan.3
${PLIST.tcl}man/man3/tcldot.3tcl
@@ -371,6 +377,7 @@ share/graphviz/doc/html/info/tab.gif
share/graphviz/doc/html/info/trapezium.gif
share/graphviz/doc/html/info/triangle.gif
share/graphviz/doc/html/info/tripleoctagon.gif
+share/graphviz/doc/html/info/underline.gif
share/graphviz/doc/html/pspdf.png
share/graphviz/doc/html/schema/arguments.xml
share/graphviz/doc/html/schema/attributes.xml
@@ -413,6 +420,7 @@ share/graphviz/doc/pdf/gvmap.1.pdf
share/graphviz/doc/pdf/gvmap.sh.1.pdf
share/graphviz/doc/pdf/gvpack.1.pdf
share/graphviz/doc/pdf/gvpr.1.pdf
+share/graphviz/doc/pdf/gvpr.3.pdf
share/graphviz/doc/pdf/gxl2gv.1.pdf
${PLIST.x11}share/graphviz/doc/pdf/lefty.1.pdf
share/graphviz/doc/pdf/leftyguide.pdf
@@ -503,10 +511,12 @@ share/graphviz/gvpr/anon
share/graphviz/gvpr/attr
share/graphviz/gvpr/bb
share/graphviz/gvpr/bbox
+share/graphviz/gvpr/chkclusters
share/graphviz/gvpr/cliptree
share/graphviz/gvpr/col
share/graphviz/gvpr/collapse
share/graphviz/gvpr/color
+share/graphviz/gvpr/cycle
share/graphviz/gvpr/dechain
share/graphviz/gvpr/deghist
share/graphviz/gvpr/deledges
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 5ce915d0130..2b004cf9201 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.49 2014/01/10 15:27:11 drochner Exp $
+$NetBSD: distinfo,v 1.50 2014/04/03 09:34:03 wiz Exp $
-SHA1 (graphviz-2.34.0.tar.gz) = 5a0c00bebe7f4c7a04523db21f40966dc9f0d441
-RMD160 (graphviz-2.34.0.tar.gz) = 583a2332bcf0f9c8d24d19044415cd768be51745
-Size (graphviz-2.34.0.tar.gz) = 23921350 bytes
+SHA1 (graphviz-2.36.0.tar.gz) = a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19
+RMD160 (graphviz-2.36.0.tar.gz) = 91a6ea69c787578bf54bebc6eb5d2d8be8070744
+Size (graphviz-2.36.0.tar.gz) = 23846318 bytes
SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
SHA1 (patch-configure) = 8f45d8cbaf9798a01216d7850c5c1dbe9dfd9106
SHA1 (patch-configure.ac) = 02ab80dfe182586e78b49d91a8cde69d1d266d4e
-SHA1 (patch-lib_cgraph_scan.l) = c7ad8c47ed478eddc8904865988ada76af781a84
-SHA1 (patch-lib_gvc_Makefile.in) = 44c514720a840574c9aa75f4c67798471138a642
-SHA1 (patch-plugin_gd_Makefile.am) = 81de41e7589eaf7682a21636155840123a7716ab
-SHA1 (patch-plugin_gd_Makefile.in) = 0008791375bfcaf2f264d07ac59db0310905e5a0
+SHA1 (patch-lib_gvc_Makefile.in) = a0c4cbd30712b3933ca0ce48897d8670bf1ceab5
diff --git a/graphics/graphviz/patches/patch-lib_cgraph_scan.l b/graphics/graphviz/patches/patch-lib_cgraph_scan.l
deleted file mode 100644
index 9c2e898a1e3..00000000000
--- a/graphics/graphviz/patches/patch-lib_cgraph_scan.l
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-lib_cgraph_scan.l,v 1.2 2014/01/10 15:27:11 drochner Exp $
-
-http://secunia.com/advisories/55666/
-
-https://github.com/ellson/graphviz/commit/7aaddf52cd98589fb0c3ab72a393f8411838438a#diff-0
-https://github.com/ellson/graphviz/commit/d266bb2b4154d11c27252b56d86963aef4434750
-https://github.com/ellson/graphviz/commit/1d1bdec6318746f6f19f245db589eddc887ae8ff
-
---- lib/cgraph/scan.l.orig 2013-09-07 01:07:52.000000000 +0000
-+++ lib/cgraph/scan.l
-@@ -16,6 +16,7 @@
- %{
- #include <grammar.h>
- #include <cghdr.h>
-+#include <agxbuf.h>
- #include <ctype.h>
- #define GRAPH_EOF_TOKEN '@' /* lex class must be defined below */
- /* this is a workaround for linux flex */
-@@ -128,15 +129,32 @@ static void ppDirective (void)
- * and report this to the user.
- */
- static int chkNum(void) {
-- unsigned char c = (unsigned char)yytext[yyleng-1]; /* last character */
-- if (!isdigit(c) && (c != '.')) { /* c is letter */
-- char buf[BUFSIZ];
-- sprintf(buf,"syntax error - badly formed number '%s' in line %d of %s\n",yytext,line_num, InputFile);
-- strcat (buf, "splits into two name tokens\n");
-- agerr(AGWARN,buf);
-- return 1;
-- }
-- else return 0;
-+ unsigned char c = (unsigned char)yytext[yyleng-1]; /* last character */
-+ if (!isdigit(c) && (c != '.')) { /* c is letter */
-+ unsigned char xbuf[BUFSIZ];
-+ char buf[BUFSIZ];
-+ agxbuf xb;
-+ char* fname;
-+
-+ if (InputFile)
-+ fname = InputFile;
-+ else
-+ fname = "input";
-+
-+ agxbinit(&xb, BUFSIZ, xbuf);
-+
-+ agxbput(&xb,"syntax ambiguity - badly delimited number '");
-+ agxbput(&xb,yytext);
-+ sprintf(buf,"' in line %d of ", line_num);
-+ agxbput(&xb,buf);
-+ agxbput(&xb,fname);
-+ agxbput(&xb, " splits into two tokens\n");
-+ agerr(AGWARN,agxbuse(&xb));
-+
-+ agxbfree(&xb);
-+ return 1;
-+ }
-+ else return 0;
- }
-
- /* The LETTER class below consists of ascii letters, underscore, all non-ascii
-@@ -191,13 +209,22 @@ ID ({NAME}|{NUMBER})
- %%
- void yyerror(char *str)
- {
-+ unsigned char xbuf[BUFSIZ];
- char buf[BUFSIZ];
-- if (InputFile)
-- sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num,
-- str,line_num,yytext);
-- else
-- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
-- agerr(AGWARN,buf);
-+ agxbuf xb;
-+
-+ agxbinit(&xb, BUFSIZ, xbuf);
-+ if (InputFile) {
-+ agxbput (&xb, InputFile);
-+ agxbput (&xb, ": ");
-+ }
-+ agxbput (&xb, str);
-+ sprintf(buf," in line %d near '", line_num);
-+ agxbput (&xb, buf);
-+ agxbput (&xb, yytext);
-+ agxbput (&xb,"'\n");
-+ agerr(AGWARN,agxbuse(&xb));
-+ agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
- void aglexeof() { unput(GRAPH_EOF_TOKEN); }
diff --git a/graphics/graphviz/patches/patch-lib_gvc_Makefile.in b/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
index c1eeef6ed9a..a5ac3d85cc2 100644
--- a/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
+++ b/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_gvc_Makefile.in,v 1.1 2013/09/06 21:30:00 wiz Exp $
+$NetBSD: patch-lib_gvc_Makefile.in,v 1.2 2014/04/03 09:34:03 wiz Exp $
---- lib/gvc/Makefile.in.orig 2009-03-13 18:19:15.000000000 +0000
-+++ lib/gvc/Makefile.in 2009-04-25 20:20:54.000000000 +0000
-@@ -433,7 +431,7 @@
+--- lib/gvc/Makefile.in.orig 2014-01-11 23:15:53.000000000 +0000
++++ lib/gvc/Makefile.in
+@@ -569,7 +569,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
$(top_builddir)/lib/cdt/libcdt.la \
- $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+ $(top_builddir)/lib/cgraph/libcgraph.la \
$(top_builddir)/lib/pathplan/libpathplan.la \
- $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS)
+ $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
diff --git a/graphics/graphviz/patches/patch-plugin_gd_Makefile.am b/graphics/graphviz/patches/patch-plugin_gd_Makefile.am
deleted file mode 100644
index 9e74088442f..00000000000
--- a/graphics/graphviz/patches/patch-plugin_gd_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-plugin_gd_Makefile.am,v 1.1 2013/09/06 21:30:00 wiz Exp $
-
---- plugin/gd/Makefile.am.orig 2013-08-01 17:35:15.000000000 +0000
-+++ plugin/gd/Makefile.am
-@@ -41,6 +41,7 @@ if WITH_LIBGD
- libgvplugin_gd_la_LIBADD = \
- $(top_builddir)/lib/gvc/libgvc.la \
- $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
-+ $(top_builddir)/lib/pathplan/libpathplan.la \
- $(top_builddir)/lib/cdt/libcdt.la @PANGOCAIRO_LIBS@ @GD_LIBS@ @MATH_LIBS@
- libgvplugin_gd_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la
-
diff --git a/graphics/graphviz/patches/patch-plugin_gd_Makefile.in b/graphics/graphviz/patches/patch-plugin_gd_Makefile.in
deleted file mode 100644
index e7e3eb4cfb8..00000000000
--- a/graphics/graphviz/patches/patch-plugin_gd_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-plugin_gd_Makefile.in,v 1.1 2013/09/06 21:30:00 wiz Exp $
-
---- plugin/gd/Makefile.in.orig 2013-08-01 17:39:16.000000000 +0000
-+++ plugin/gd/Makefile.in
-@@ -533,6 +535,7 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi
- @WITH_LIBGD_TRUE@libgvplugin_gd_la_LIBADD = \
- @WITH_LIBGD_TRUE@ $(top_builddir)/lib/gvc/libgvc.la \
- @WITH_LIBGD_TRUE@ $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
-+@WITH_LIBGD_TRUE@ $(top_builddir)/lib/pathplan/libpathplan.la \
- @WITH_LIBGD_TRUE@ $(top_builddir)/lib/cdt/libcdt.la \
- @WITH_LIBGD_TRUE@ @PANGOCAIRO_LIBS@ @GD_LIBS@ @MATH_LIBS@ \
- @WITH_LIBGD_TRUE@ $(am__append_2)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 07:53:40 +0000