From owner-svn-ports-all@freebsd.org  Fri Jan  6 21:38:12 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B1B0CA34CF;
 Fri,  6 Jan 2017 21:38:12 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 298611076;
 Fri,  6 Jan 2017 21:38:12 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v06LcBIr002259;
 Fri, 6 Jan 2017 21:38:11 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v06LcBja002257;
 Fri, 6 Jan 2017 21:38:11 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201701062138.v06LcBja002257@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 6 Jan 2017 21:38:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r430752 - in head/math: R libRmath
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2017 21:38:12 -0000

Author: antoine
Date: Fri Jan  6 21:38:11 2017
New Revision: 430752
URL: https://svnweb.freebsd.org/changeset/ports/430752

Log:
  Fix configure with zlib 1.2.10, configure script believes that version
  1.2.10 is lower than 1.2.5
  
  Reported by:	pkg-fallout
  MFH:		2017Q1

Modified:
  head/math/R/Makefile
  head/math/libRmath/Makefile

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Fri Jan  6 21:35:34 2017	(r430751)
+++ head/math/R/Makefile	Fri Jan  6 21:38:11 2017	(r430752)
@@ -18,6 +18,7 @@ LIB_DEPENDS=		libcurl.so:ftp/curl \
 CONFIGURE_ARGS=		--disable-java \
 			--with-readline \
 			rdocdir=${DOCSDIR}
+CONFIGURE_ENV=		r_cv_header_zlib_h=yes
 GNU_CONFIGURE=		yes
 INSTALL_TARGET=		install-strip
 ONLY_FOR_ARCHS=		i386 amd64

Modified: head/math/libRmath/Makefile
==============================================================================
--- head/math/libRmath/Makefile	Fri Jan  6 21:35:34 2017	(r430751)
+++ head/math/libRmath/Makefile	Fri Jan  6 21:38:11 2017	(r430752)
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=		--disable-nls --with-IC
 			--with-jpeglib=no --with-libpng=no --with-libtiff=no \
 			--with-readline=no --with-tcltk=no --with-x=no \
 			--without-libintl-prefix
-CONFIGURE_ENV+=		ac_cv_header_iconv_h=no
+CONFIGURE_ENV+=		ac_cv_header_iconv_h=no r_cv_header_zlib_h=yes
 GNU_CONFIGURE=		yes
 RMATH_SOVERSION=	1
 USES=			fortran localbase