summaryrefslogtreecommitdiff
path: root/graphics/graphviz/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/graphviz/files')
-rw-r--r--graphics/graphviz/files/patch-config-config_ruby.rb19
-rw-r--r--graphics/graphviz/files/patch-configure48
-rw-r--r--graphics/graphviz/files/patch-configure.ac40
-rw-r--r--graphics/graphviz/files/patch-lib-expr-exgram.h11
-rw-r--r--graphics/graphviz/files/patch-lib-expr-expr.h10
-rw-r--r--graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h4
-rw-r--r--graphics/graphviz/files/version.m49
7 files changed, 91 insertions, 50 deletions
diff --git a/graphics/graphviz/files/patch-config-config_ruby.rb b/graphics/graphviz/files/patch-config-config_ruby.rb
new file mode 100644
index 000000000000..ed6368c99a27
--- /dev/null
+++ b/graphics/graphviz/files/patch-config-config_ruby.rb
@@ -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"
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
deleted file mode 100644
index 8133ff3f7ec4..000000000000
--- a/graphics/graphviz/files/patch-configure
+++ /dev/null
@@ -1,48 +0,0 @@
---- configure.orig 2016-12-25 03:04:52 UTC
-+++ configure
-@@ -18067,6 +18067,9 @@ test -n "$RC" || RC="false"
- CFLAGS="${CFLAGS} -fno-common -Wall"
- LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
- ;;
-+ *alpha*-freebsd* )
-+ CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
-+ ;;
- *-freebsd* )
- CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
- ;;
-@@ -20954,7 +20957,7 @@ done
- 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
-@@ -21522,7 +21525,9 @@ fi
-
- LUA_INCLUDES=""
- LUA_LIBS=""
-- LUA_INSTALL_DIR=""
-+ if test -z "$LUA_INSTALL_DIR" ; then
-+ LUA_INSTALL_DIR=""
-+ fi
-
- if test -n "$lua_inc"; then
- CFLAGS="$CFLAGS -I$lua_inc"
-@@ -21584,13 +21589,13 @@ $as_echo_n "checking for Lua headers and
- pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
- if test "x$?" = "x0" ; then
- LUA_VERSION=`$PKGCONFIG --modversion lua$l`
-- LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
-+ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lua$l`
- LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
-
- pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
- if test "x$?" = "x0"; then
-- LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
-+ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lualib$l`
- LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
- fi
- break
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
new file mode 100644
index 000000000000..5dfb4d89befd
--- /dev/null
+++ b/graphics/graphviz/files/patch-configure.ac
@@ -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/'`
diff --git a/graphics/graphviz/files/patch-lib-expr-exgram.h b/graphics/graphviz/files/patch-lib-expr-exgram.h
new file mode 100644
index 000000000000..518f196ede8d
--- /dev/null
+++ b/graphics/graphviz/files/patch-lib-expr-exgram.h
@@ -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)
diff --git a/graphics/graphviz/files/patch-lib-expr-expr.h b/graphics/graphviz/files/patch-lib-expr-expr.h
new file mode 100644
index 000000000000..8c80866a3fb0
--- /dev/null
+++ b/graphics/graphviz/files/patch-lib-expr-expr.h
@@ -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 <ast.h>
+ #include <inttypes.h>
++#include <limits.h>
+
+ #undef RS /* hp.pa <signal.h> grabs this!! */
+
diff --git a/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h b/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h
index 3b97079dc39b..b82ff4a86dd0 100644
--- a/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h
+++ b/graphics/graphviz/files/patch-lib-vmalloc-vmhdr.h
@@ -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 <io.h>
#endif
diff --git a/graphics/graphviz/files/version.m4 b/graphics/graphviz/files/version.m4
new file mode 100644
index 000000000000..04a4ec85170f
--- /dev/null
+++ b/graphics/graphviz/files/version.m4
@@ -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)
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 20:18:55 +0000