svn commit: r378808 - in head/math/R: . files

[Sean Bruno]

Author: sbruno
Date: Tue Feb 10 22:24:01 2015
New Revision: 378808
URL: https://svnweb.freebsd.org/changeset/ports/378808
QAT: https://qat.redports.org/buildarchive/r378808/

Log:
  Repair overflow condition where WCHAR_MAX != INT_MAX
  https://github.com/andreas-schwab/tre/commit/182e1060dc3bfc175490f6e0e961d9330971299c
  
  Add MISSING option to the default build on armv6.
  
  PR:		194183
  Submitted by:	mikael.urankar at gmail.com, Adreas Schwab
  Approved by:	maintainer timeout (3 months without PR comment)

Added:
  head/math/R/files/patch-src_extra_tre_tre-internal.h   (contents, props changed)
Modified:
  head/math/R/Makefile

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Tue Feb 10 22:18:00 2015	(r378807)
+++ head/math/R/Makefile	Tue Feb 10 22:24:01 2015	(r378808)
@@ -91,6 +91,8 @@ X11_DESC=		X11() graphics device
 OPTIONS_DEFAULT+=	GHOSTSCRIPT INFO_MANUALS JPEG LIBR PANGOCAIRO PNG \
 			TCLTK TIFF X11
 
+OPTIONS_DEFAULT_armv6+=	MISSING
+
 .endif # !LIBR_SLAVEPORT
 PLIST_SUB=		R_SOVERSION="${R_SOVERSION}" \
 			RBLAS_SOVERSION="${RBLAS_SOVERSION}" \

Added: head/math/R/files/patch-src_extra_tre_tre-internal.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/R/files/patch-src_extra_tre_tre-internal.h	Tue Feb 10 22:24:01 2015	(r378808)
@@ -0,0 +1,22 @@
+--- src/extra/tre/tre-internal.h.orig	2015-01-20 15:25:01 UTC
++++ src/extra/tre/tre-internal.h
+@@ -17,6 +17,7 @@
+ #include <wctype.h>
+ #endif /* !HAVE_WCTYPE_H */
+ 
++#include <limits.h>
+ #include <ctype.h>
+ #include "tre.h"
+ 
+@@ -48,7 +49,11 @@
+ 
+ /* Wide characters. */
+ typedef wint_t tre_cint_t;
++#if WCHAR_MAX <= INT_MAX
+ #define TRE_CHAR_MAX WCHAR_MAX
++#else /* WCHAR_MAX > INT_MAX */
++#define TRE_CHAR_MAX INT_MAX
++#endif
+ 
+ #ifdef TRE_MULTIBYTE
+ #define TRE_MB_CUR_MAX MB_CUR_MAX