aboutsummaryrefslogtreecommitdiff
path: root/graphics/graphviz/files
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2017-01-04 22:08:55 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2017-01-04 22:08:55 +0000
commite1183199fbf735a815b3495e287a81002cac0216 (patch)
treea18aecc703dc96e506f268e2734de18666f628ae /graphics/graphviz/files
parent15cc32ac31330f5ef5b9317d29ef3ebd9550ba8a (diff)
downloadports-e1183199fbf735a815b3495e287a81002cac0216.tar.gz
ports-e1183199fbf735a815b3495e287a81002cac0216.zip
- update to 2.40.1
- add LICENSE
Notes
Notes: svn path=/head/; revision=430598
Diffstat (limited to 'graphics/graphviz/files')
-rw-r--r--graphics/graphviz/files/patch-Makefile.in15
-rw-r--r--graphics/graphviz/files/patch-cmd-tools-gmlscan.l11
-rw-r--r--graphics/graphviz/files/patch-lib-cgraph-scan.l20
-rw-r--r--graphics/graphviz/files/patch-plugin_xlib_vimdot.sh20
4 files changed, 10 insertions, 56 deletions
diff --git a/graphics/graphviz/files/patch-Makefile.in b/graphics/graphviz/files/patch-Makefile.in
deleted file mode 100644
index aad90436897e..000000000000
--- a/graphics/graphviz/files/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from https://github.com/ellson/graphviz/pull/1179
-
-Use egrep so that the command works with base's BSD grep when it is built
-without compatibility with GNU grep.
---- Makefile.in.orig 2016-12-05 10:31:12.865899000 +0100
-+++ Makefile.in 2016-12-05 10:31:32.065451000 +0100
-@@ -1246,7 +1246,7 @@
- find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
-
- $(top_builddir)/graphviz_version.h: config.h
-- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-+ $(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-
- .PHONY: rpm
- rpm: dist
diff --git a/graphics/graphviz/files/patch-cmd-tools-gmlscan.l b/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
deleted file mode 100644
index 75c7c5cc940d..000000000000
--- a/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmd/tools/gmlscan.l.orig 2014-04-13 22:40:25.000000000 +0200
-+++ cmd/tools/gmlscan.l 2015-07-29 14:51:42.000000000 +0200
-@@ -127,7 +127,7 @@
- return;
- errors = 1;
- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
-- agerr(AGWARN,buf);
-+ agerr(AGWARN, "%s", buf);
- }
-
- int gmlerrors()
diff --git a/graphics/graphviz/files/patch-lib-cgraph-scan.l b/graphics/graphviz/files/patch-lib-cgraph-scan.l
deleted file mode 100644
index 7d11037f02a9..000000000000
--- a/graphics/graphviz/files/patch-lib-cgraph-scan.l
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/cgraph/scan.l.orig 2014-04-13 22:40:25.000000000 +0200
-+++ lib/cgraph/scan.l 2015-07-29 14:51:27.000000000 +0200
-@@ -149,7 +149,7 @@
- agxbput(&xb,buf);
- agxbput(&xb,fname);
- agxbput(&xb, " splits into two tokens\n");
-- agerr(AGWARN,agxbuse(&xb));
-+ agerr(AGWARN, "%s", agxbuse(&xb));
-
- agxbfree(&xb);
- return 1;
-@@ -225,7 +225,7 @@
- agxbput (&xb, buf);
- agxbput (&xb, yytext);
- agxbput (&xb,"'\n");
-- agerr(AGERR,agxbuse(&xb));
-+ agerr(AGERR, "%s", agxbuse(&xb));
- agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
diff --git a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
index 76d8843b6cde..44f41fc3433a 100644
--- a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
+++ b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
@@ -1,15 +1,15 @@
---- plugin/xlib/vimdot.sh.orig 2016-09-26 23:00:07 UTC
-+++ plugin/xlib/vimdot.sh
-@@ -3,7 +3,7 @@
+--- plugin/xlib/vimdot.sh.orig 2016-12-01 06:43:36.000000000 +0100
++++ plugin/xlib/vimdot.sh 2016-12-25 20:26:20.202321000 +0100
+@@ -5,7 +5,7 @@
- error() { echo "$0: $*" >&2; exit 1; }
+ # Try $EDITOR first, else try vim or vi
+ editor="$EDITOR"
+-[ -x "$editor" ] || editor="/usr/bin/vim"
++[ -x "$editor" ] || editor="/usr/local/bin/vim"
+ [ -x "$editor" ] || editor="/usr/bin/vi"
+ [ -x "$editor" ] || error "EDITOR not found or not executable";
--editor="/usr/bin/vim"
-+editor="/usr/local/bin/vim"
-
- if ! test -x "$editor"; then error "the \"$editor\" editor not found or not executable"; fi
-
-@@ -23,7 +23,7 @@ digraph G {
+@@ -25,7 +25,7 @@
vim [href="http://www.vim.org/"]
dot [href="http://www.graphviz.org/"]