Attachment 171733 Details for Bug 210513 – patch to update to 3.3.1

patch to update to 3.3.1

R331.diff.txt (text/plain), 2.81 KB, created by Wen Heping on 2016-06-24 08:26:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2016-06-24 08:26:22 UTC

Size: 2.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 417413)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME?=	R
>-PORTVERSION=	3.3.0
>+PORTVERSION=	3.3.1
> CATEGORIES=	math lang
> MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
> 		ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
>@@ -28,7 +28,8 @@
> 
> BUILD_DEPENDS=		${LOCALBASE}/bin/gsed:textproc/gsed \
> 			texi2dvi:print/texinfo
>-LIB_DEPENDS=		libcurl.so:ftp/curl
>+LIB_DEPENDS=		libcurl.so:ftp/curl \
>+			libpcre.so:devel/pcre
> 
> CONFIGURE_ENV=		LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
> 			SED="${LOCALBASE}/bin/gsed" \
>@@ -54,16 +55,14 @@
> 			--with-system-bzlib --with-system-zlib
> CONFIGURE_ENV+=		FCFLAGS="${FFLAGS}" \
> 			R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
>-CPPFLAGS+=		-I${LOCALBASE}/include
>-LDFLAGS+=		-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE+=	ATLAS ICU PCRE_PORT THREADS
>+OPTIONS_DEFINE+=	ATLAS ICU THREADS
> 
> ATLAS_DESC=		Use ATLAS instead of BLAS/LAPACK
> ICU_DESC=		Use ICU for collation in multibyte locales
>-PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
> 
>-OPTIONS_DEFAULT+=	ICU PCRE_PORT THREADS
>+OPTIONS_DEFAULT+=	ICU THREADS
>+
> .if !defined(LIBR_SLAVEPORT)
> RUN_DEPENDS+=		${LOCALBASE}/bin/gsed:textproc/gsed
> USE_LDCONFIG=		${PREFIX}/lib/R/lib
>@@ -174,13 +173,6 @@
> PLIST_SUB+=		NLS="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MPCRE_PORT}
>-LIB_DEPENDS+=		libpcre.so:devel/pcre
>-CONFIGURE_ARGS+=	--with-system-pcre
>-.else
>-CONFIGURE_ARGS+=	--without-system-pcre
>-.endif
>-
> .if ${PORT_OPTIONS:MTHREADS}
> CONFIGURE_ARGS+=	--enable-threads=posix
> .else
>@@ -379,6 +371,8 @@
> 	done)
> .endif
> 
>+	${FIND} ${STAGEDIR}${PREFIX}/lib/ -name "*.so" | ${XARGS} ${STRIP_CMD}
>+
> .endif # LIBR_SLAVEPORT
> .else # !LIBRMATH_SLAVEPORT
> do-install:
>Index: distinfo
>===================================================================
>--- distinfo	(revision 417413)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (R-3.3.0.tar.gz) = 9256b154b1a5993d844bee7b1955cd49c99ad72cef03cce3cd1bdca1310311e4
>-SIZE (R-3.3.0.tar.gz) = 29820067
>+TIMESTAMP = 1466579734
>+SHA256 (R-3.3.1.tar.gz) = 3dc59ae5831f5380f83c169bac2103ad052efe0ecec4ffa74bde4d85a0fda9e2
>+SIZE (R-3.3.1.tar.gz) = 29848329
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 417413)
>+++ pkg-plist	(working copy)
>@@ -772,6 +772,7 @@
> lib/R/library/nlme/CITATION
> lib/R/library/nlme/DESCRIPTION
> lib/R/library/nlme/INDEX
>+lib/R/library/nlme/LICENCE
> lib/R/library/nlme/Meta/Rd.rds
> lib/R/library/nlme/Meta/data.rds
> lib/R/library/nlme/Meta/hsearch.rds
>@@ -813,6 +814,7 @@
> lib/R/library/nlme/scripts/ch05.R
> lib/R/library/nlme/scripts/ch06.R
> lib/R/library/nlme/scripts/ch08.R
>+lib/R/library/nlme/scripts/runme.R
> lib/R/library/nlme/scripts/sims.rda
> lib/R/library/nnet/CITATION
> lib/R/library/nnet/DESCRIPTION

Actions: View

Attachments on bug 210513: 171733