1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
$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
|
