svn commit: r430752 - in head/math: R libRmath

[Antoine Brodin]

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