From owner-svn-ports-all@FreeBSD.ORG Tue Feb 10 22:24:03 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2ECA9B2E; Tue, 10 Feb 2015 22:24:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F40F21F5; Tue, 10 Feb 2015 22:24:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AMO2fE060780; Tue, 10 Feb 2015 22:24:02 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AMO2Z4060778; Tue, 10 Feb 2015 22:24:02 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201502102224.t1AMO2Z4060778@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 10 Feb 2015 22:24:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378808 - in head/math/R: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2015 22:24:03 -0000 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@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 + #endif /* !HAVE_WCTYPE_H */ + ++#include + #include + #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