0aa51ce9f6
pkgsrc changes: fix a bit of pkglint. Todo: add an option to enable smyrna.
Upstream changelog:
January 26, 2010
- Release 2.26.3
- libcgraph.so version bumped from 4 to 5 due to API changes
- Allow ranksep to specify multiple radial differences in twopi
- Allow the user to specify all pairwise distances in neato with
- Fixed bugs: 1280, 1409, 1567, 1583, 1624, 1631, 1655, 1708, 1709,
1727, 1784, 1792, 1798, 1800, 1813, 1814, 1830, 1831, 1833, 1836,
1839
December 10, 2009
- Release 2.26.0
- Core features:
- added: "smyrna" - a new opengl-based viewer for large graphs
- added: rudimentary "gml2gv", "gv2gml" converters
- extended support for various image formats in node images
- removed vestiges of codegens, now all putput formats supported
through plugins. Dropped some output formats for which
plugins have not been developed: -Tdia, -Tmif
- gvpr converted to a library; additional array handling and
text processing functions added; language extended to allow
multiple BEG_G/N/E blocks.
- allow background images specified via xdot
- Fixed bugs:
1683, 1713, 1718, 1720, 1738, 1747, 1759, 1770, 1776, 1786,
1799, 1816, 1827
115 lines
4.5 KiB
Text
115 lines
4.5 KiB
Text
$NetBSD: patch-ab,v 1.19 2010/11/17 15:46:21 dholland Exp $
|
|
|
|
--- configure.orig 2010-01-26 16:01:10.000000000 +0000
|
|
+++ configure
|
|
@@ -2822,11 +2822,18 @@ 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
|
|
+esac
|
|
|
|
|
|
|
|
@@ -6850,6 +6857,9 @@ test -n "$RC" || RC="false"
|
|
;;
|
|
*-sgi-irix* )
|
|
;;
|
|
+ *-ibm-aix* )
|
|
+ CC=cc_r
|
|
+ ;;
|
|
esac
|
|
else
|
|
for ac_prog in windres
|
|
@@ -24867,7 +24877,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
|
|
@@ -24931,7 +24941,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
|
|
|
|
@@ -25535,8 +25545,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"
|
|
if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then
|
|
@@ -26003,13 +26013,13 @@ fi
|
|
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"
|
|
@@ -32259,7 +32269,7 @@ 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// /\\ }
|
|
+ withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=`echo ${PLATFORMSDKINCLUDE} | sed "s/'\\'/\\\\/g" | sed "s/ /\\ /g"`
|
|
fi
|
|
|
|
|
|
@@ -34907,10 +34917,12 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|
|
|
#include <stdio.h>
|
|
#include <assert.h>
|
|
+ #include <time.h>
|
|
#define PI 3.14159265358979323846
|
|
extern void sincos(double x, double *s, double *c);
|
|
int main () {
|
|
double sinx=0.0, cosx=1.0;
|
|
+ sincos(time(NULL)&1,&sinx,&cosx);
|
|
sincos(PI/2.0,&sinx,&cosx);
|
|
assert(sinx>0.9999999);
|
|
assert(sinx<1.0000001);
|
|
@@ -38777,7 +38791,7 @@ else
|
|
use_gv_tcl="Yes"
|
|
fi
|
|
if test "x$use_gd" != "xYes"; then
|
|
- if test "x$use_gd" == "xYes (internal)"; then
|
|
+ if test "x$use_gd" = "xYes (internal)"; then
|
|
use_gdtclft="Yes"
|
|
else
|
|
use_gdtclft="No (gd not available)"
|