December 21, 2016 - Remove usage of ast_common.h December 20, 2016 - Release 2.40.0 - network-simplex fixes and optimization (Stephen North) - built-in tred tool now available in the various swig generated language bindings (John Ellson) - number rounding added to SVG renderer (same as PS and TK rounding) to aid regression testing. (John Ellson) - additional regressson test framework, used in Travis CI builds. (Erwin Janssen) - PHP7 support (requires swig-3.0.11 or later). (John Ellson) - Allow user to specify clustering algorithm in gvmap. (Emden Gansner) - Add Sierpinski graph generator to gvgen. (Emden Gansner) - Extensive code cleanup (Erwin Janssen) - Removal of libgd source - use vanilla libgd from separate install - Windows builds (Erwin Janssen) - Appveyor CI for automated Windows build testing (Erwin Janssen) - Travis CI for Fedora/Centos builds (Erwin Janssen) - Added JSON output format, -Tjson (Emden Gansner) - New curved arrowhead, cylinder node shape. - Resolves bugs: 2599, 1172 June 18, 2016 - Experimenting with Travis CI February 13, 2016 - Add cylinder shape for databases. - Free installed plugins - Update makefile for dot so that the using libpanco_C in the static build include PANGOFT2 as well as PANGOCAIRO_LIBS (needed for some versions of Ubuntu) February 1, 2016 - Add json output format April 26, 2015 - output class value in svg files September 9, 2014 - Add plain shape for use with HTML-like labels. August 12, 2014 - Add icurve arrowhead. July 28, 2014 - Revert to old, translate to origin semantics in neato, etc. Add flag notranslate if that is what the user desires.
131 lines
5.6 KiB
Text
131 lines
5.6 KiB
Text
$NetBSD: patch-configure,v 1.7 2017/03/08 14:51:56 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 2016-12-25 03:04:52.000000000 +0000
|
|
+++ configure
|
|
@@ -3527,8 +3527,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
|
|
@@ -3544,7 +3551,6 @@ if test -z "$LIBPOSTFIX"; then
|
|
*linux* )
|
|
case "${host_cpu}" in
|
|
aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
|
|
- LIBPOSTFIX="64"
|
|
INTGOSIZE=64
|
|
;;
|
|
esac
|
|
@@ -3552,7 +3558,6 @@ if test -z "$LIBPOSTFIX"; then
|
|
*solaris* )
|
|
case "${host_cpu}" in
|
|
x86_64 | sparc64 )
|
|
- LIBPOSTFIX="/64"
|
|
INTGOSIZE=64
|
|
;;
|
|
esac
|
|
@@ -17920,7 +17925,7 @@ esac
|
|
|
|
|
|
|
|
-if test "${GCC}" == "yes"
|
|
+if test "${GCC}" = "yes"
|
|
then
|
|
# Enable common warnings flags
|
|
CFLAGS="${CFLAGS} -Wall"
|
|
@@ -20954,7 +20959,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
|
|
@@ -21586,7 +21591,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
|
|
@@ -21650,7 +21655,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
|
|
|
|
@@ -21928,8 +21933,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"
|
|
@@ -22149,17 +22154,17 @@ test -n "$PHP" || PHP="php"
|
|
if test "x$PHP" = "x"; then
|
|
use_php="No (php not available)"
|
|
else
|
|
- if test -d /usr/include/php7; then
|
|
- PHP_INCLUDES="-I/usr/include/php7 -I/usr/include/php7/main -I/usr/include/php7/Zend -I/usr/include/php7/TSRM"
|
|
+ if test -d ${PREFIX}/include/php7; then
|
|
+ PHP_INCLUDES="-I${PREFIX}/include/php7 -I${PREFIX}/include/php7/main -I${PREFIX}/include/php7/Zend -I${PREFIX}/include/php7/TSRM"
|
|
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/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib"
|
|
+ PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/TSRM -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/ext -I${PREFIX}/include/php/ext/date/lib"
|
|
fi
|
|
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"
|
|
@@ -27214,10 +27219,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
|
|
|
|
|
|
|