diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-03 12:45:03 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-03 12:45:03 +0000 |
| commit | f628ba76a1b435b96a83c4ccb4cb9280f8fc177a (patch) | |
| tree | 366203fbb41bbfcac0ce086d5cc871998325bf93 /math | |
| parent | 47ab09b1a665c0be30f62fe54f99a6d03b648d55 (diff) | |
| download | pkgsrc-f628ba76a1b435b96a83c4ccb4cb9280f8fc177a.tar.gz | |
Fix texinfo version check.
Diffstat (limited to 'math')
| -rw-r--r-- | math/R/distinfo | 4 | ||||
| -rw-r--r-- | math/R/patches/patch-ac | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/math/R/distinfo b/math/R/distinfo index 9fe0b8c8a45..b64e0cada01 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.67 2015/06/30 02:38:52 wen Exp $ +$NetBSD: distinfo,v 1.68 2015/07/03 12:45:03 joerg Exp $ SHA1 (R-3.2.1.tar.gz) = 74476c4d356f227bf0f17c8c21e63459861fbc93 RMD160 (R-3.2.1.tar.gz) = dea095b5c7b32189b6768d5949243bd869564e9f Size (R-3.2.1.tar.gz) = 29197870 bytes -SHA1 (patch-ac) = 1722685e650c651467be8f67c37a5766aefad7af +SHA1 (patch-ac) = bf54bef2396714b1d92418d0ad1ecf09610abdfd SHA1 (patch-ad) = 0a08f293bc1cdc130047868e5d574c2df1f4c6cf SHA1 (patch-src_include_GraphicsBase.h) = 5f999e4d124afd38d5c7e18d936942f2c6f27c86 SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8 diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index 17ad6a83b76..c542add0dab 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,9 +1,10 @@ -$NetBSD: patch-ac,v 1.34 2015/05/13 12:48:05 ryoon Exp $ +$NetBSD: patch-ac,v 1.35 2015/07/03 12:45:03 joerg Exp $ Do not include system paths in R_LD_LIBRARY_PATH. FreeBSD 10 is not FreeBSD 1. +Fix texi2any version check. ---- configure.orig 2015-04-08 22:16:36.000000000 +0000 +--- configure.orig 2015-06-10 22:16:27.000000000 +0000 +++ configure @@ -4012,7 +4012,7 @@ fi @@ -23,6 +24,15 @@ FreeBSD 10 is not FreeBSD 1. LTOALL=-flto fi +@@ -5270,7 +5270,7 @@ if test -z "${texi2any_version_maj}" \ + || test -z "${texi2any_version_min}"; then + r_cv_prog_texi2any_v5=no + elif test ${texi2any_version_maj} -lt 5 \ +- || test ${texi2any_version_min} -lt 1; then ++ || test ${texi2any_version_maj} = 5 -a ${texi2any_version_min} -lt 1; then + r_cv_prog_texi2any_v5=no + else + r_cv_prog_texi2any_v5=yes @@ -19921,7 +19921,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; |