948131ca43
April 13, 2014 - Release 2.38.0 - Resolves bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425 March 27, 2014 - Enable packing for dot - Allow scaling to work for all non-dot layouts March 9, 2014 - Add overline text characteristic. March 4, 2014 - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs. - Add edgepaint program for coloring edges to make them easier to tell apart. - Modify neato to avoid unnecessary translations of output. This allows positions given on input to remain the same on output. - Fix swig java package to work and support gv.renderresult. - Fix test for the absence of layout (old test relied on statically allocated Agraphinfo_t). - HTML-like tables and cells can now specify which borders should be drawn. - The fixedsize attribute now takes the value "shape" which allows labels much larger than the node shape.
115 lines
4.9 KiB
Text
115 lines
4.9 KiB
Text
$NetBSD: patch-configure,v 1.6 2014/05/06 09:33:13 wiz Exp $
|
|
|
|
1. chunk: fix
|
|
./configure.lineno: 1: Syntax error: Bad substitution
|
|
http://www.graphviz.org/mantisbt/view.php?id=2362
|
|
2. chunk: use the same path for all platforms in pkgsrc
|
|
other chunks: use lua/php/... from pkgsrc
|
|
last chunk: fix
|
|
./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi")
|
|
http://www.graphviz.org/mantisbt/view.php?id=2362
|
|
last last chunk: fix sed expression not to use + which is not in BRE (guile)
|
|
|
|
--- configure.orig 2014-04-13 20:41:48.000000000 +0000
|
|
+++ configure
|
|
@@ -3521,8 +3521,15 @@ case "${host_os}" in
|
|
# For the build number: months since Jan 2000, day of month from the timestamp
|
|
# For the revision number: hour, minute from the timestamp
|
|
if test $GRAPHVIZ_VERSION_MICRO != "0"; then
|
|
- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
|
|
- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
|
|
+ # JR: patch from Michael van Elst:
|
|
+ # if we have a shellm we should have a working awk, too
|
|
+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
|
|
+ print "GRAPHVIZ_VERSION_BUILD=" \
|
|
+ (substr($1,1,4)-2000)*12+substr($1,5,2) \
|
|
+ substr($1,7,2)
|
|
+ print "GRAPHVIZ_VERSION_REVISION=" \
|
|
+ substr($1,10,4)
|
|
+ }'`
|
|
fi
|
|
;;
|
|
esac
|
|
@@ -3536,14 +3543,12 @@ if test -z "$LIBPOSTFIX"; then
|
|
*linux* )
|
|
case "${host_cpu}" in
|
|
aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
|
|
- LIBPOSTFIX="64"
|
|
;;
|
|
esac
|
|
;;
|
|
*solaris* )
|
|
case "${host_cpu}" in
|
|
x86_64 | sparc64 )
|
|
- LIBPOSTFIX="/64"
|
|
;;
|
|
esac
|
|
;;
|
|
@@ -21101,7 +21106,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
|
|
@@ -21733,7 +21738,7 @@ $as_echo_n "checking for Lua headers and
|
|
LUA_VERSION=`$PKGCONFIG --modversion lua$l`
|
|
LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
|
|
LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
|
|
- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
|
|
+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
|
|
|
|
pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
|
|
if test "x$?" = "x0"; then
|
|
@@ -21797,7 +21802,7 @@ $as_echo_n "checking for Lua headers and
|
|
LUA_INCLUDES=`$LUACONFIG --include`
|
|
LUA_LIBS=`$LUACONFIG --libs`
|
|
LUA_VERSION="5.0.x"
|
|
- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
|
|
+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
|
|
fi
|
|
fi
|
|
|
|
@@ -22075,8 +22080,8 @@ $as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
- OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
|
|
- OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
|
|
+ OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml
|
|
+ OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
|
|
ac_fn_c_check_header_mongrel "$LINENO" "caml/mlvalues.h" "ac_cv_header_caml_mlvalues_h" "$ac_includes_default"
|
|
@@ -22291,13 +22296,13 @@ done
|
|
if test "x$PHP" = "x"; then
|
|
use_php="No (php not available)"
|
|
else
|
|
- if test -d /usr/include/php5; then
|
|
- PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
|
|
+ if test -d ${PREFIX}/include/php5; then
|
|
+ PHP_INCLUDES="-I${PREFIX}/include/php5 -I${PREFIX}/include/php5/main -I${PREFIX}/include/php5/Zend -I${PREFIX}/include/php5/TSRM"
|
|
else
|
|
- PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
|
|
+ PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
|
|
fi
|
|
- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
|
|
- PHP_INSTALL_DATADIR="/usr/share/php"
|
|
+ PHP_INSTALL_DIR="${PREFIX}/lib${LIBPOSTFIX}/php/modules"
|
|
+ PHP_INSTALL_DATADIR="${PREFIX}/share/php"
|
|
PHP_LIBS=
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
|
|
@@ -27347,10 +27352,6 @@ fi
|
|
|
|
|
|
|
|
-# Check whether --with-platformsdkincludedir was given.
|
|
-if test "${with_platformsdkincludedir+set}" = set; then :
|
|
- withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }
|
|
-fi
|
|
|
|
|
|
|