From owner-svn-ports-head@freebsd.org Fri Jul 1 08:29:33 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1ACDEB875D1; Fri, 1 Jul 2016 08:29:33 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA2062D10; Fri, 1 Jul 2016 08:29:32 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u618TWlJ082049; Fri, 1 Jul 2016 08:29:32 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u618TVNk082045; Fri, 1 Jul 2016 08:29:31 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201607010829.u618TVNk082045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Fri, 1 Jul 2016 08:29:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417864 - head/math/R X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jul 2016 08:29:33 -0000 Author: wen Date: Fri Jul 1 08:29:31 2016 New Revision: 417864 URL: https://svnweb.freebsd.org/changeset/ports/417864 Log: - Update to 3.3.1 - Remove PCRE_PORT option - Really strip the .so file - Minor cleanup PR: 210513 Submitted by: wen@(myself) Modified: head/math/R/Makefile head/math/R/distinfo head/math/R/pkg-plist Modified: head/math/R/Makefile ============================================================================== --- head/math/R/Makefile Fri Jul 1 05:50:17 2016 (r417863) +++ head/math/R/Makefile Fri Jul 1 08:29:31 2016 (r417864) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= R -PORTVERSION= 3.3.0 -PORTREVISION= 2 +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 +27,8 @@ LICENSE= GPLv2 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" \ @@ -74,15 +74,13 @@ CONFIGURE_ARGS= --enable-memory-profili --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+= ICU PCRE_PORT THREADS +OPTIONS_DEFINE+= ICU THREADS 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 @@ -179,13 +177,6 @@ CONFIGURE_ARGS+= --disable-nls 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 @@ -390,6 +381,8 @@ post-install: done) .endif + ${FIND} ${STAGEDIR}${PREFIX}/lib/ -name "*.so" | ${XARGS} ${STRIP_CMD} + .endif # LIBR_SLAVEPORT .else # !LIBRMATH_SLAVEPORT do-install: Modified: head/math/R/distinfo ============================================================================== --- head/math/R/distinfo Fri Jul 1 05:50:17 2016 (r417863) +++ head/math/R/distinfo Fri Jul 1 08:29:31 2016 (r417864) @@ -1,2 +1,3 @@ -SHA256 (R-3.3.0.tar.gz) = 9256b154b1a5993d844bee7b1955cd49c99ad72cef03cce3cd1bdca1310311e4 -SIZE (R-3.3.0.tar.gz) = 29820067 +TIMESTAMP = 1467276607 +SHA256 (R-3.3.1.tar.gz) = 3dc59ae5831f5380f83c169bac2103ad052efe0ecec4ffa74bde4d85a0fda9e2 +SIZE (R-3.3.1.tar.gz) = 29848329 Modified: head/math/R/pkg-plist ============================================================================== --- head/math/R/pkg-plist Fri Jul 1 05:50:17 2016 (r417863) +++ head/math/R/pkg-plist Fri Jul 1 08:29:31 2016 (r417864) @@ -772,6 +772,7 @@ lib/R/library/mgcv/libs/mgcv.so 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/ch04.R 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