Import of pkgsrc-2016Q3

math/R/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.162 2015/09/11 13:16:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.168 2016/09/08 20:41:25 joerg Exp $
 
-DISTNAME=		R-3.2.2
+DISTNAME=		R-3.3.1
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-3/}
 
@@ -69,6 +69,8 @@ CONFIGURE_ENV+=		r_cv_complete_blas=yes
 
 # Broken test for bzlib >= 1.0.5 in R 2.7.0
 CONFIGURE_ENV+=		r_cv_have_bzlib=yes
+# Override zlib 1.2.5 requirement
+CONFIGURE_ENV+=		r_cv_header_zlib_h=yes
 
 CONFIGURE_ENV+=		GETWD=${TOOLS_PWD_CMD}
 CONFIGURE_ENV+=		lt_cv_path_LD=${LD:Q}
@@ -85,11 +87,7 @@ CONFIGURE_ENV+=		LIBnn=lib
 # been installed SHAREMODE
 SHAREMODE=		644
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-openmp
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-openmp
 
 # R_PAPERSIZE can be: A4, Letter, Legal, Executive
 .if defined(PAPERSIZE)
@@ -132,8 +130,7 @@ SUBST_STAGE.fixwrap=	post-build
 SUBST_FILES.fixwrap=	libtool
 SUBST_SED.fixwrap=	-e "s,${WRAPPER_BINDIR}/libtool,${PKG_LIBTOOL},g"
 
-BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
-BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5
+BUILDLINK_API_DEPENDS.bzip2+=	bzip2>=1.0.5
 
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
 CONFIGURE_ARGS+=	--enable-mbcs=no
@@ -144,16 +141,10 @@ CONFIGURE_ARGS+=	--enable-mbcs=no
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
 fix-darwin-install-name:
-	install_name_tool -id ${PREFIX}/lib/R/lib/libR.dylib		\
-		${DESTDIR}${PREFIX}/lib/R/lib/libR.dylib
-	install_name_tool -id ${PREFIX}/lib/R/lib/libRlapack.dylib	\
-		${DESTDIR}${PREFIX}/lib/R/lib/libRlapack.dylib
 	${FIND} ${DESTDIR}${PREFIX} -name "*.so" | while read lib; do	\
 		libname=`basename $${lib}`;				\
 		libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`;	\
-		install_name_tool -id $${libdir}/$${libname}		\
-			-change libR.dylib				\
-			${PREFIX}/lib/R/lib/libR.dylib $${lib};		\
+		install_name_tool -id $${libdir}/$${libname} $${lib};	\
 	done
 .endif
 
@@ -170,6 +161,7 @@ fix-darwin-install-name:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"