diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2015-07-04 12:28:09 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2015-07-04 12:28:09 +0000 |
| commit | aa166227b71ecdf91a5d5cc1c30c35692629e3a2 (patch) | |
| tree | b1310553eaf8911fdd1324d33ca03ddc78556da8 /math | |
| parent | 97ca752c56deaa6338951ee3fee4a2e023550f63 (diff) | |
| download | ports-aa166227b71ecdf91a5d5cc1c30c35692629e3a2.tar.gz ports-aa166227b71ecdf91a5d5cc1c30c35692629e3a2.zip | |
Fix build with texinfo 6.0
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=391303
Diffstat (limited to 'math')
| -rw-r--r-- | math/R/files/patch-configure | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/math/R/files/patch-configure b/math/R/files/patch-configure index 0c50ef2a326f..a2080bef1904 100644 --- a/math/R/files/patch-configure +++ b/math/R/files/patch-configure @@ -1,12 +1,22 @@ -#extra linker flags for threaded tk ---- configure.orig 2009-06-03 19:08:21.000000000 -0400 -+++ configure 2009-06-03 19:48:48.000000000 -0400 -@@ -43400,7 +43400,7 @@ +# Recognize makeinfo from texinfo 6.0 +# Extra linker flags for threaded tk +--- configure.orig 2013-09-17 22:06:13 UTC ++++ configure +@@ -5181,7 +5181,7 @@ if ${r_cv_prog_makeinfo_v4+:} false; the + $as_echo_n "(cached) " >&6 + else + makeinfo_version=`${MAKEINFO} --version | \ +- grep "^makeinfo" | sed 's/[^)]*) \(.*\)/\1/'` ++ grep -E "^(makeinfo|texi2any)" | sed 's/[^)]*) \(.*\)/\1/'` + makeinfo_version_maj=`echo ${makeinfo_version} | cut -f1 -d.` + makeinfo_version_min=`echo ${makeinfo_version} | \ + cut -f2 -d. | tr -dc '0123456789.' ` +@@ -32742,7 +32742,7 @@ fi ## Part 2. Try finding the tk library. if test -n "${TK_CONFIG}"; then . ${TK_CONFIG} - TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW}" + TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW} ${TCL_LD_FLAGS}" else - - { echo "$as_me:$LINENO: checking for Tk_Init in -ltk" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk_Init in -ltk" >&5 + $as_echo_n "checking for Tk_Init in -ltk... " >&6; } |