svn commit: r430833 - in branches/2017Q1/math: R libRmath

[Antoine Brodin]

Author: antoine
Date: Sat Jan  7 21:21:25 2017
New Revision: 430833
URL: https://svnweb.freebsd.org/changeset/ports/430833

Log:
  MFH: r430752
  
  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

Modified:
  branches/2017Q1/math/R/Makefile
  branches/2017Q1/math/libRmath/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/math/R/Makefile
==============================================================================
--- branches/2017Q1/math/R/Makefile	Sat Jan  7 21:20:13 2017	(r430832)
+++ branches/2017Q1/math/R/Makefile	Sat Jan  7 21:21:25 2017	(r430833)
@@ -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: branches/2017Q1/math/libRmath/Makefile
==============================================================================
--- branches/2017Q1/math/libRmath/Makefile	Sat Jan  7 21:20:13 2017	(r430832)
+++ branches/2017Q1/math/libRmath/Makefile	Sat Jan  7 21:21:25 2017	(r430833)
@@ -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