R: pkgsrc changes

PkgSrc changes:
* On Darwin, use Aqua interface instead of X11
* Cairo support also requires Pango
* Allow Cairo with other backends, not only X11 (e.g. to make it work on Darwin)

4 files changed, 46 insertions, 19 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index c5a5d85a1a6..785982690db 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.176 2017/10/06 20:47:37 rumko Exp $
+# $NetBSD: Makefile,v 1.177 2017/10/18 16:14:30 adam Exp $
 
-DISTNAME=		R-3.3.3
-PKGREVISION=		2
-CATEGORIES=		math
-MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-3/}
+DISTNAME=	R-3.3.3
+PKGREVISION=	2
+CATEGORIES=	math
+MASTER_SITES=	${MASTER_SITE_R_CRAN:=base/R-3/}
 
-MAINTAINER=		markd@NetBSD.org
-HOMEPAGE=		http://www.R-project.org/
-COMMENT=		Statistical language for data analysis and graphics
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	markd@NetBSD.org
+HOMEPAGE=	http://www.R-project.org/
+COMMENT=	Statistical language for data analysis and graphics
+LICENSE=	gnu-gpl-v2
 
 #needs FPC code not found in older versions of NetBSD
 NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
@@ -19,11 +19,10 @@ USE_GCC_RUNTIME=	yes
 BUILD_TARGET=		all info
 INSTALL_TARGET=		install install-info
 TEST_TARGET=		check
-USE_TOOLS+=		gmake gzip:run makeinfo perl:run sed unzip:run xmkmf
-USE_TOOLS+=		pkg-config
-USE_TOOLS+=		aclocal autoconf autoreconf automake
 USE_LANGUAGES=		c c++ fortran
 USE_LIBTOOL=		yes
+USE_TOOLS+=		aclocal autoconf autoreconf automake
+USE_TOOLS+=		gmake gzip:run makeinfo perl:run pkg-config sed unzip:run
 TEXINFO_REQD=		5.1
 INFO_FILES=		yes
 
@@ -31,7 +30,6 @@ PTHREAD_AUTO_VARS=	yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-R-shlib
-CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-tcltk
 CONFIGURE_ARGS+=	--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
@@ -51,9 +49,18 @@ CONFIGURE_ARGS+=	--enable-long-double=no
 USE_GNU_ICONV=		yes		# latin1 support, iconvlist
 .endif
 
+PLIST_VARS+=		x11
+
 # Disable Mac OS specific support used by R.app
+.if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--disable-R-framework
-CONFIGURE_ARGS+=	--without-aqua
+CONFIGURE_ARGS+=	--with-aqua
+CONFIGURE_ARGS+=	--without-x
+.else
+USE_TOOLS+=		xmkmf
+CONFIGURE_ARGS+=	--with-x
+PLIST.x11=		yes
+.endif
 
 # Use BLAS (math/blas)
 CONFIGURE_ARGS+=	--without-atlas
@@ -157,6 +164,7 @@ fix-darwin-install-name:
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 # uses callback interface
 .include "../../devel/readline/buildlink3.mk"
@@ -167,9 +175,12 @@ fix-darwin-install-name:
 .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"
 
+.if ${OPSYS} != "Darwin"
+.include "../../x11/libXt/buildlink3.mk"
+.endif
+
 INSTALL_TEMPLATES+=	../../math/R/files/pkg-index.tmpl
 DEINSTALL_TEMPLATES+=	../../math/R/files/pkg-index.tmpl
 PRINT_PLIST_AWK+=	/^lib\/R\/doc\/html\/packages.html$$/ { next; }
diff --git a/math/R/PLIST b/math/R/PLIST
index 94c33698001..36d2015762b 100644
--- a/math/R/PLIST
+++ b/math/R/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2017/03/11 09:50:34 wen Exp $
+@comment $NetBSD: PLIST,v 1.27 2017/10/18 16:14:30 adam Exp $
 bin/R
 bin/Rscript
 info/R-FAQ.info.gz
@@ -1431,8 +1431,8 @@ lib/R/library/utils/iconvlist
 lib/R/library/utils/libs/utils.so
 lib/R/library/utils/misc/exDIF.csv
 lib/R/library/utils/misc/exDIF.dif
-lib/R/modules/R_X11.so
-lib/R/modules/R_de.so
+${PLIST.x11}lib/R/modules/R_X11.so
+${PLIST.x11}lib/R/modules/R_de.so
 lib/R/modules/internet.so
 lib/R/modules/lapack.so
 lib/R/share/R/REMOVE.R
diff --git a/math/R/distinfo b/math/R/distinfo
index 184b807d56b..7630c9eb62a 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2017/10/06 20:47:37 rumko Exp $
+$NetBSD: distinfo,v 1.77 2017/10/18 16:14:30 adam Exp $
 
 SHA1 (R-3.3.3.tar.gz) = 9e205a817970578ecd80384f397bae35b46f13b9
 RMD160 (R-3.3.3.tar.gz) = 5f0d3aa3cf26132ac8774d2589083a12493c18ad
@@ -7,6 +7,7 @@ Size (R-3.3.3.tar.gz) = 29804326 bytes
 SHA1 (patch-ad) = a43b4875a2ee4677b5f762abf3f9a623fd12cbb5
 SHA1 (patch-configure.ac) = c3e77e8f7bf784a269d09c937ab1997ef701aa81
 SHA1 (patch-m4_R.m4) = 704d5514e10adf0b5217bb71b06f44a612eca6e0
+SHA1 (patch-m4_cairo.m4) = a0c4ec68d7d6d3a73a2a24481d0dee8c192bf154
 SHA1 (patch-src_include_GraphicsBase.h) = eed25eaca982ca76bf75d199dd8bf48be2a99ac5
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
 SHA1 (patch-src_main_character.c) = 1271cbd68ec57e28cf6a394398d21d6a18b6760b
diff --git a/math/R/patches/patch-m4_cairo.m4 b/math/R/patches/patch-m4_cairo.m4
new file mode 100644
index 00000000000..8c3b14f21f8
--- /dev/null
+++ b/math/R/patches/patch-m4_cairo.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-m4_cairo.m4,v 1.1 2017/10/18 16:14:30 adam Exp $
+
+Detect cairo with any backend (not only X11).
+
+--- m4/cairo.m4.orig	2017-10-18 15:50:34.000000000 +0000
++++ m4/cairo.m4
+@@ -70,7 +70,7 @@ else
+                     [AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ #include <pango/pango.h>
+ #include <pango/pangocairo.h>
+-#include <cairo-xlib.h>
++#include <cairo.h>
+ #if CAIRO_VERSION  < 10200
+ #error cairo version >= 1.2 required
+ #endif