From owner-svn-ports-all@FreeBSD.ORG Fri Mar 28 20:44:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B574229; Fri, 28 Mar 2014 20:44:57 +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 6842DFF5; Fri, 28 Mar 2014 20:44:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2SKivGM068242; Fri, 28 Mar 2014 20:44:57 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2SKivgT068241; Fri, 28 Mar 2014 20:44:57 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201403282044.s2SKivgT068241@svn.freebsd.org> From: Max Brazhnikov Date: Fri, 28 Mar 2014 20:44:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349461 - head/math/scilab 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: Fri, 28 Mar 2014 20:44:57 -0000 Author: makc Date: Fri Mar 28 20:44:56 2014 New Revision: 349461 URL: http://svnweb.freebsd.org/changeset/ports/349461 QAT: https://qat.redports.org/buildarchive/r349461/ Log: math/scilab: - Add stage support - Prevent from writing to $HOME/.Scilab during build Modified: head/math/scilab/Makefile Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Fri Mar 28 20:41:23 2014 (r349460) +++ head/math/scilab/Makefile Fri Mar 28 20:44:56 2014 (r349461) @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Scientific software package for numerical computations EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -NO_STAGE= yes # A partial dependencies list can be found at: # http://wiki.scilab.org/Dependencies_of_Scilab_5.X LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 \ @@ -31,6 +30,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gfortran CONFIGURE_ENV= ac_cv_search_pthread_join="${PTHREAD_LIBS}" \ BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}" +# prevert from creating $HOME/.Scilab during build +MAKE_ENV= HOME=/dev/null OPTIONS_DEFINE= ATLAS FFTW GUI HELP NLS MATIO OCAML PVM TK UMFPACK OPTIONS_DEFAULT= FFTW GUI HELP @@ -246,36 +247,37 @@ post-patch: .endif pre-install: - @${MKDIR} ${DATADIR}/.atoms + @${MKDIR} ${STAGEDIR}${DATADIR}/.atoms + @${TOUCH} ${STAGEDIR}${DATADIR}/.atoms/.keep_me .if ${PORT_OPTIONS:MGUI} - @${MKDIR} ${DATADIR}/modules && ${INSTALL_DATA} ${DISTDIR}/${JGRAPHX_JAR} ${DATADIR}/modules/jgraphx.jar + @${MKDIR} ${STAGEDIR}${DATADIR}/modules && ${INSTALL_DATA} ${DISTDIR}/${JGRAPHX_JAR} ${STAGEDIR}${DATADIR}/modules/jgraphx.jar @${REINPLACE_CMD} -e 's|${WRKSRC}/thirdparty/jgraphx.jar|${DATADIR}/modules/jgraphx.jar|g' ${WRKSRC}/etc/classpath.xml .endif post-install: @# Remove empty dirs in DATADIR/modules - they will be removed by the @# toolbox uninstaller otherwise if 3rd party toolboxes are used - @${FIND} ${DATADIR}/modules -type d -empty -delete + @${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete @# plist for include/scilab - @${FIND} -s ${PREFIX}/include/scilab -not -type d | ${SORT} | \ - ${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST} - @${FIND} ${PREFIX}/include/scilab -type d | ${SORT} -r | \ - ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + @${FIND} -s ${STAGEDIR}${PREFIX}/include/scilab -not -type d | ${SORT} | \ + ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${PREFIX}/include/scilab -type d | ${SORT} -r | \ + ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @# plist for lib/scilab - @${FIND} -s ${PREFIX}/lib/scilab -not -type d | ${SORT} | \ - ${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST} - @${FIND} ${PREFIX}/lib/scilab -type d | ${SORT} -r | \ - ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + @${FIND} -s ${STAGEDIR}${PREFIX}/lib/scilab -not -type d | ${SORT} | \ + ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${PREFIX}/lib/scilab -type d | ${SORT} -r | \ + ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @# plist for share/scilab EXCEPT: @# contrib and .atoms (3rd party toolboxes) - @${FIND} -s ${DATADIR} -not -type d -not -path ${DATADIR}/contrib\* | \ - ${SORT} | ${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST} - @${FIND} ${DATADIR} -type d -not -path ${DATADIR}/contrib\* \ - -not -path ${DATADIR}/.atoms\* -not -path ${DATADIR} | \ - ${SORT} -r | ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + @${FIND} -s ${STAGEDIR}${DATADIR} -not -type d -not -path ${STAGEDIR}${DATADIR}/contrib\* | \ + ${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${DATADIR} -type d -not -path ${STAGEDIR}${DATADIR}/contrib\* \ + -not -path ${STAGEDIR}${DATADIR}/.atoms\* -not -path ${STAGEDIR}${DATADIR} | \ + ${SORT} -r | ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/share/scilab 2>/dev/null || true" >> ${TMPPLIST} .if ! ${PORT_OPTIONS:MGUI} - @${TOUCH} ${DATADIR}/contrib/xcos_toolbox_skeleton/images/h5/.keep_me + @${TOUCH} ${STAGEDIR}${DATADIR}/contrib/xcos_toolbox_skeleton/images/h5/.keep_me .endif check test regression-test: build