Attachment 161935 Details for Bug 203418 – Make portlint happier

[patch] Make portlint happier

make_portlint_happier.patch (text/plain), 6.88 KB, created by TAKATSU Tomonari on 2015-10-12 10:06:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TAKATSU Tomonari

Created: 2015-10-12 10:06:30 UTC

Size: 6.88 KB

patch

obsolete

>diff --git a/math/R/Makefile b/math/R/Makefile
>index ce4c0c9..3c4e9d3 100644
>--- a/math/R/Makefile
>+++ b/math/R/Makefile
>@@ -21,9 +21,6 @@ MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
> 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
> 
>@@ -31,6 +28,7 @@ LICENSE=	GPLv2
> 
> 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
>@@ -269,7 +267,6 @@ INFO=		R-FAQ R-admin R-data R-exts R-intro R-lang
> 
> .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"
>@@ -328,7 +325,7 @@ post-patch:
> 	${TAR} -czf temptgz --exclude='*/po/*' @$$tarfile ; \
> 	${MV} temptgz $$tarfile ; \
> 	done)
>-	@${REINPLACE_CMD} -e '/ls -d $$(srcdir)\/inst/d' \
>+	@${REINPLACE_CMD} -e '/ls -d $$srcdir\/inst/d' \
> 		${WRKSRC}/src/library/translations/Makefile.in
> .endif
> 
>@@ -351,7 +348,7 @@ do-build:
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib
>-	@${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
>+	${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
> 
> .else # LIBR_SLAVEPORT
> 
>@@ -383,9 +380,9 @@ post-install:
> .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 \
>+	${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)
> 
>diff --git a/math/R/files/patch-configure b/math/R/files/patch-configure
>index 4e96e78..238406c 100644
>--- a/math/R/files/patch-configure
>+++ b/math/R/files/patch-configure
>@@ -1,5 +1,107 @@
>---- configure.orig	2015-09-27 13:20:13 UTC
>+--- 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
>diff --git a/math/R/files/patch-src__nmath__standalone__test.c b/math/R/files/patch-src__nmath__standalone__test.c
>index c79bcee..582d1cb 100644
>--- a/math/R/files/patch-src__nmath__standalone__test.c
>+++ b/math/R/files/patch-src__nmath__standalone__test.c
>@@ -1,6 +1,6 @@
>---- src/nmath/standalone/test.c.orig	2009-06-22 18:12:00.000000000 -0400
>-+++ src/nmath/standalone/test.c	2009-06-22 18:12:34.000000000 -0400
>-@@ -38,7 +38,7 @@
>+--- src/nmath/standalone/test.c.orig	2012-04-15 22:05:35 UTC
>++++ src/nmath/standalone/test.c
>+@@ -38,7 +38,7 @@ main(int argc, char** argv)
>      qnorm(0.7, 0.0, 1.0, 0, 0);
>      printf("*** loaded '%s'\n", argv[0]);
>      set_seed(123, 456);
>diff --git a/math/R/files/patch-src_extra_tre_tre-internal.h b/math/R/files/patch-src_extra_tre_tre-internal.h
>index b9d3932..36a8c99 100644
>--- a/math/R/files/patch-src_extra_tre_tre-internal.h
>+++ b/math/R/files/patch-src_extra_tre_tre-internal.h
>@@ -1,4 +1,4 @@
>---- src/extra/tre/tre-internal.h.orig	2015-01-20 15:25:01 UTC
>+--- src/extra/tre/tre-internal.h.orig	2014-06-13 22:15:07 UTC
> +++ src/extra/tre/tre-internal.h
> @@ -17,6 +17,7 @@
>  #include <wctype.h>

Actions: View | Diff

Attachments on bug 203418: 161497 | 161935 | 161936