Attachment #161935 for bug #203418




MASTER_SITE_SUBDIR=	src/base/R-${PORTVERSION:C|\..*||}
DISTNAME=	R-${PORTVERSION}

PATCH_SITES=		LOCAL/bf
#PATCHFILES=		R-patched-20131112-r64207.diff.bz2

MAINTAINER=	bf@FreeBSD.org
COMMENT?=	Language for statistical computing and graphics



BUILD_DEPENDS=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed \
			texi2dvi:${PORTSDIR}/print/texinfo

CONFIGURE_ENV=		LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
			SED="${LOCALBASE}/bin/gsed" \
			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes


.if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}
USE_TEX=		texlive dvipsk kpathsea pdftex
#BUILD_DEPENDS +=	texi2dvi:${PORTSDIR}/print/texinfo
ALL_TARGET+=		pdf
CONFIGURE_ENV +=	INSTALL_INFO="${LOCALBASE}/bin/install-info" \
			MAKEINFO="${LOCALBASE}/bin/makeinfo"

	${TAR} -czf temptgz --exclude='*/po/*' @$$tarfile ; \
	${MV} temptgz $$tarfile ; \
	done)
	@${REINPLACE_CMD} -e '/ls -d $$srcdir\/inst/d' \
		${WRKSRC}/src/library/translations/Makefile.in
.endif



do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib
	${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib

.else # LIBR_SLAVEPORT


.endif # LIBR_SLAVEPORT
.else # !LIBRMATH_SLAVEPORT
do-install:
	${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
	${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
	${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so \
	${STAGEDIR}${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION}
	@(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} libRmath.so)





--- configure.orig	2015-08-13 09:21:16 UTC
+++ configure
@@ -20589,13 +20589,13 @@ if test "x$ac_cv_lib_mw__mwvalidcheckl" 
   LIBM="-lmw"
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lm" >&5
+$as_echo_n "checking for cos in -lquadmath -lm... " >&6; }
 if ${ac_cv_lib_m_cos+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+LIBS="-lquadmath -lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20626,18 +20626,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
 $as_echo "$ac_cv_lib_m_cos" >&6; }
 if test "x$ac_cv_lib_m_cos" = xyes; then :
-  LIBM="$LIBM -lm"
+  LIBM="$LIBM -lquadmath -lm"
 fi
 
   ;;
 *)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lm" >&5
+$as_echo_n "checking for cos in -lquadmath -lm... " >&6; }
 if ${ac_cv_lib_m_cos+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+LIBS="-lquadmath -lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20668,7 +20668,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
 $as_echo "$ac_cv_lib_m_cos" >&6; }
 if test "x$ac_cv_lib_m_cos" = xyes; then :
-  LIBM="-lm"
+  LIBM="-lquadmath -lm"
 fi
 
   ;;
@@ -20679,13 +20679,13 @@ esac
 ## </NOTE>
 ## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do
 ## the following as well.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-$as_echo_n "checking for sin in -lm... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lquadmath -lm" >&5
+$as_echo_n "checking for sin in -lquadmath -lm... " >&6; }
 if ${ac_cv_lib_m_sin+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+LIBS="-lquadmath -lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20720,7 +20720,7 @@ if test "x$ac_cv_lib_m_sin" = xyes; then
 #define HAVE_LIBM 1
 _ACEOF
 
-  LIBS="-lm $LIBS"
+  LIBS="-lquadmath -lm $LIBS"
 
 fi
 
@@ -26166,7 +26166,7 @@ fi
 ## if nothing was obtained for SHLIB_CXXLDFLAGS.
 ##
 ## Note also that some systems (formerly AIX) do not allow for unresolved
-## symbols at link time.  For such systems, we link against -lm (in case
+## symbols at link time.  For such systems, we link against -lquadmath -lm (in case
 ## it exists) when building a shlib module via SHLIB_LIBADD.
 
 main_ld="${CC}"
@@ -28310,7 +28310,7 @@ if ${ac_cv_lib_rt_clock_gettime+:} false
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
+LIBS=" $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -28353,7 +28353,7 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
 #define HAVE_LIBRT 1
 _ACEOF
 
-  LIBS="-lrt $LIBS"
+  LIBS="$LIBS"
 
 fi
 
@@ -33267,7 +33267,7 @@ fi
     ## Part 2.  Try finding the tk library.
     if test -n "${TK_CONFIG}"; then

Lines 1-6 Link Here

(-)b/math/R/files/patch-src__nmath__standalone__test.c (-3 / +3 lines)
1	--- src/nmath/standalone/test.c.orig 2009-06-22 18:12:00.000000000 -0400	1	--- src/nmath/standalone/test.c.orig 2012-04-15 22:05:35 UTC
2	+++ src/nmath/standalone/test.c 2009-06-22 18:12:34.000000000 -0400	2	+++ src/nmath/standalone/test.c
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@ main(int argc, char** argv)
4	qnorm(0.7, 0.0, 1.0, 0, 0);	4	qnorm(0.7, 0.0, 1.0, 0, 0);
5	printf("*** loaded '%s'\n", argv[0]);	5	printf("*** loaded '%s'\n", argv[0]);
6	set_seed(123, 456);	6	set_seed(123, 456);

Lines 1-4 Link Here

(-)b/math/R/files/patch-src_extra_tre_tre-internal.h (-1 / +1 lines)
1	--- src/extra/tre/tre-internal.h.orig 2015-01-20 15:25:01 UTC	1	--- src/extra/tre/tre-internal.h.orig 2014-06-13 22:15:07 UTC
2	+++ src/extra/tre/tre-internal.h	2	+++ src/extra/tre/tre-internal.h
3	@@ -17,6 +17,7 @@	3	@@ -17,6 +17,7 @@
4	#include <wctype.h>	4	#include <wctype.h>

Return to bug 203418

Lines 21-29 MASTER_SITES= http://cran.r-project.org/%SUBDIR%/ \ Link Here

(-)b/math/R/Makefile (-9 / +6 lines)
21	MASTER_SITE_SUBDIR= src/base/R-${PORTVERSION:C\|\..*\|\|}	21	MASTER_SITE_SUBDIR= src/base/R-${PORTVERSION:C\|\..*\|\|}
22	DISTNAME= R-${PORTVERSION}	22	DISTNAME= R-${PORTVERSION}
23		23
24	PATCH_SITES= LOCAL/bf
25	#PATCHFILES= R-patched-20131112-r64207.diff.bz2
26
27	MAINTAINER= bf@FreeBSD.org	24	MAINTAINER= bf@FreeBSD.org
28	COMMENT?= Language for statistical computing and graphics	25	COMMENT?= Language for statistical computing and graphics
29		26
Lines 31-36 LICENSE= GPLv2 Link Here
31		28
32	BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed \	29	BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed \
33	texi2dvi:${PORTSDIR}/print/texinfo	30	texi2dvi:${PORTSDIR}/print/texinfo
		31
34	CONFIGURE_ENV= LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \	32	CONFIGURE_ENV= LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
35	SED="${LOCALBASE}/bin/gsed" \	33	SED="${LOCALBASE}/bin/gsed" \
36	ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes	34	ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
Lines 269-275 INFO= R-FAQ R-admin R-data R-exts R-intro R-lang Link Here
269		267
270	.if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}	268	.if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}
271	USE_TEX= texlive dvipsk kpathsea pdftex	269	USE_TEX= texlive dvipsk kpathsea pdftex
272	#BUILD_DEPENDS += texi2dvi:${PORTSDIR}/print/texinfo
273	ALL_TARGET+= pdf	270	ALL_TARGET+= pdf
274	CONFIGURE_ENV += INSTALL_INFO="${LOCALBASE}/bin/install-info" \	271	CONFIGURE_ENV += INSTALL_INFO="${LOCALBASE}/bin/install-info" \
275	MAKEINFO="${LOCALBASE}/bin/makeinfo"	272	MAKEINFO="${LOCALBASE}/bin/makeinfo"
Lines 328-334 post-patch: Link Here
328	${TAR} -czf temptgz --exclude='/po/' @$$tarfile ; \	325	${TAR} -czf temptgz --exclude='/po/' @$$tarfile ; \
329	${MV} temptgz $$tarfile ; \	326	${MV} temptgz $$tarfile ; \
330	done)	327	done)
331	@${REINPLACE_CMD} -e '/ls -d $$(srcdir)\/inst/d' \	328	@${REINPLACE_CMD} -e '/ls -d $$srcdir\/inst/d' \
332	${WRKSRC}/src/library/translations/Makefile.in	329	${WRKSRC}/src/library/translations/Makefile.in
333	.endif	330	.endif
334		331
Lines 351-357 do-build: Link Here
351		348
352	do-install:	349	do-install:
353	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib	350	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib
354	@${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib	351	${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
355		352
356	.else # LIBR_SLAVEPORT	353	.else # LIBR_SLAVEPORT
357		354
Lines 383-391 post-install: Link Here
383	.endif # LIBR_SLAVEPORT	380	.endif # LIBR_SLAVEPORT
384	.else # !LIBRMATH_SLAVEPORT	381	.else # !LIBRMATH_SLAVEPORT
385	do-install:	382	do-install:
386	@${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include	383	${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
387	@${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib	384	${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
388	@${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so \	385	${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so \
389	${STAGEDIR}${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION}	386	${STAGEDIR}${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION}
390	@(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} libRmath.so)	387	@(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} libRmath.so)
391		388

Lines 1-5 Link Here

(-)b/math/R/files/patch-configure (-1 / +103 lines)
1	--- configure.orig 2015-09-27 13:20:13 UTC	1	--- configure.orig 2015-08-13 09:21:16 UTC
2	+++ configure	2	+++ configure
		3	@@ -20589,13 +20589,13 @@ if test "x$ac_cv_lib_mw__mwvalidcheckl"
		4	LIBM="-lmw"
		5	fi
		6
		7	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
		8	-$as_echo_n "checking for cos in -lm... " >&6; }
		9	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lm" >&5
		10	+$as_echo_n "checking for cos in -lquadmath -lm... " >&6; }
		11	if ${ac_cv_lib_m_cos+:} false; then :
		12	$as_echo_n "(cached) " >&6
		13	else
		14	ac_check_lib_save_LIBS=$LIBS
		15	-LIBS="-lm $LIBS"
		16	+LIBS="-lquadmath -lm $LIBS"
		17	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		18	/* end confdefs.h. */
		19
		20	@@ -20626,18 +20626,18 @@ fi
		21	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
		22	$as_echo "$ac_cv_lib_m_cos" >&6; }
		23	if test "x$ac_cv_lib_m_cos" = xyes; then :
		24	- LIBM="$LIBM -lm"
		25	+ LIBM="$LIBM -lquadmath -lm"
		26	fi
		27
		28	;;
		29	*)
		30	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
		31	-$as_echo_n "checking for cos in -lm... " >&6; }
		32	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lm" >&5
		33	+$as_echo_n "checking for cos in -lquadmath -lm... " >&6; }
		34	if ${ac_cv_lib_m_cos+:} false; then :
		35	$as_echo_n "(cached) " >&6
		36	else
		37	ac_check_lib_save_LIBS=$LIBS
		38	-LIBS="-lm $LIBS"
		39	+LIBS="-lquadmath -lm $LIBS"
		40	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		41	/* end confdefs.h. */
		42
		43	@@ -20668,7 +20668,7 @@ fi
		44	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
		45	$as_echo "$ac_cv_lib_m_cos" >&6; }
		46	if test "x$ac_cv_lib_m_cos" = xyes; then :
		47	- LIBM="-lm"
		48	+ LIBM="-lquadmath -lm"
		49	fi
		50
		51	;;
		52	@@ -20679,13 +20679,13 @@ esac
		53	## </NOTE>
		54	## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do
		55	## the following as well.
		56	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
		57	-$as_echo_n "checking for sin in -lm... " >&6; }
		58	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lquadmath -lm" >&5
		59	+$as_echo_n "checking for sin in -lquadmath -lm... " >&6; }
		60	if ${ac_cv_lib_m_sin+:} false; then :
		61	$as_echo_n "(cached) " >&6
		62	else
		63	ac_check_lib_save_LIBS=$LIBS
		64	-LIBS="-lm $LIBS"
		65	+LIBS="-lquadmath -lm $LIBS"
		66	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
67	/* end confdefs.h. */
68
69	@@ -20720,7 +20720,7 @@ if test "x$ac_cv_lib_m_sin" = xyes; then
70	#define HAVE_LIBM 1
71	_ACEOF
72
73	- LIBS="-lm $LIBS"
74	+ LIBS="-lquadmath -lm $LIBS"
75
76	fi
77
78	@@ -26166,7 +26166,7 @@ fi
79	## if nothing was obtained for SHLIB_CXXLDFLAGS.
80	##
81	## Note also that some systems (formerly AIX) do not allow for unresolved
82	-## symbols at link time. For such systems, we link against -lm (in case
83	+## symbols at link time. For such systems, we link against -lquadmath -lm (in case
84	## it exists) when building a shlib module via SHLIB_LIBADD.
85
86	main_ld="${CC}"
87	@@ -28310,7 +28310,7 @@ if ${ac_cv_lib_rt_clock_gettime+:} false
88	$as_echo_n "(cached) " >&6
89	else
90	ac_check_lib_save_LIBS=$LIBS
91	-LIBS="-lrt $LIBS"
92	+LIBS=" $LIBS"
93	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
94	/* end confdefs.h. */
95
96	@@ -28353,7 +28353,7 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
97	#define HAVE_LIBRT 1
98	_ACEOF
99
100	- LIBS="-lrt $LIBS"
101	+ LIBS="$LIBS"
102
103	fi
104
3	@@ -33267,7 +33267,7 @@ fi	105	@@ -33267,7 +33267,7 @@ fi
4	## Part 2. Try finding the tk library.	106	## Part 2. Try finding the tk library.
5	if test -n "${TK_CONFIG}"; then	107	if test -n "${TK_CONFIG}"; then