From owner-svn-ports-all@FreeBSD.ORG Sat Apr 5 10:30:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84173532; Sat, 5 Apr 2014 10:30:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 649E3AA8; Sat, 5 Apr 2014 10:30:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35AUM7V023872; Sat, 5 Apr 2014 10:30:22 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35AULO4023869; Sat, 5 Apr 2014 10:30:21 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404051030.s35AULO4023869@svn.freebsd.org> From: Antoine Brodin Date: Sat, 5 Apr 2014 10:30:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350209 - in head/math: R libRmath X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 10:30:22 -0000 Author: antoine Date: Sat Apr 5 10:30:21 2014 New Revision: 350209 URL: http://svnweb.freebsd.org/changeset/ports/350209 QAT: https://qat.redports.org/buildarchive/r350209/ Log: Stage support With hat: portmgr Modified: head/math/R/Makefile head/math/R/pkg-plist head/math/libRmath/Makefile Modified: head/math/R/Makefile ============================================================================== --- head/math/R/Makefile Sat Apr 5 10:26:51 2014 (r350208) +++ head/math/R/Makefile Sat Apr 5 10:30:21 2014 (r350209) @@ -75,8 +75,6 @@ USE_LDCONFIG= ${PREFIX}/lib/R/lib USES+= perl5 USE_PERL5= build -MAN1= R.1 Rscript.1 - OPTIONS_DEFINE+= GHOSTSCRIPT INFO_MANUALS JPEG LETTER_PAPER LIBR \ PANGOCAIRO PDF_MANUALS PNG TCLTK TIFF X11 @@ -370,25 +368,24 @@ check-all: build post-install: .for L in R Rblas Rlapack - @(cd ${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \ + @(cd ${STAGEDIR}${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \ ${LN} -sf lib${L}.so lib${L}.so.${${L:U}_SOVERSION} ; fi) .endfor .if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC}/doc/manual; \ for infofile in ${INFO}; do \ - ${INSTALL_DATA} $${infofile}.info* ${PREFIX}/${INFO_PATH}/; \ + ${INSTALL_DATA} $${infofile}.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}/; \ done) .endif .endif # LIBR_SLAVEPORT .else # !LIBRMATH_SLAVEPORT do-install: - @${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${PREFIX}/include - @${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${PREFIX}/lib - @${STRIP_CMD} ${BUILD_WRKSRC}/libRmath.so - @${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.so \ - ${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION} - @(cd ${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} 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) check regression-test test: build @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \ Modified: head/math/R/pkg-plist ============================================================================== --- head/math/R/pkg-plist Sat Apr 5 10:26:51 2014 (r350208) +++ head/math/R/pkg-plist Sat Apr 5 10:30:21 2014 (r350209) @@ -1438,6 +1438,8 @@ lib/R/share/texmf/tex/latex/omscmtt.fd lib/R/share/texmf/tex/latex/ts1aer.fd lib/R/share/texmf/tex/latex/ts1aett.fd %%LIBR%%libdata/pkgconfig/libR.pc +man/man1/R.1.gz +man/man1/Rscript.1.gz %%DOCSDIR%%/html/NEWS.2.html %%DOCSDIR%%/manual/R-FAQ.html %%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-FAQ.pdf Modified: head/math/libRmath/Makefile ============================================================================== --- head/math/libRmath/Makefile Sat Apr 5 10:26:51 2014 (r350208) +++ head/math/libRmath/Makefile Sat Apr 5 10:30:21 2014 (r350209) @@ -10,5 +10,4 @@ LIBRMATH_SLAVEPORT= yes MASTERDIR= ${.CURDIR}/../R PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile"