From owner-svn-ports-head@FreeBSD.ORG Fri Sep 5 03:17:37 2014 Return-Path: Delivered-To: svn-ports-head@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 0DF4AE73; Fri, 5 Sep 2014 03:17:37 +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 D49401DF0; Fri, 5 Sep 2014 03:17:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s853Ha8e031195; Fri, 5 Sep 2014 03:17:36 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s853HaHw031194; Fri, 5 Sep 2014 03:17:36 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201409050317.s853HaHw031194@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Fri, 5 Sep 2014 03:17:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367322 - head/math/sage 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.18-1 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, 05 Sep 2014 03:17:37 -0000 Author: stephen Date: Fri Sep 5 03:17:36 2014 New Revision: 367322 URL: http://svnweb.freebsd.org/changeset/ports/367322 QAT: https://qat.redports.org/buildarchive/r367322/ Log: - Correct where SAGE_ROOT was incorrectly prefixed by STAGEDIR in ${PREFIX}/bin/sage. - Bump portrevision. Pointed out by: Robert.Burmeister@UToledo.edu Modified: head/math/sage/Makefile Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Fri Sep 5 02:20:05 2014 (r367321) +++ head/math/sage/Makefile Fri Sep 5 03:17:36 2014 (r367322) @@ -3,7 +3,7 @@ PORTNAME= sage PORTVERSION= 6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \ http://mirrors.xmission.com/sage/src/ \ @@ -108,24 +108,25 @@ check regression-test test: build cd ${WRKSRC} && ${SETENV} DOT_SAGE=${WRKSRC}/tmp/.sage ./sage -testall ${RM} -f ${WRKSRC}/python*.core -INSTALL_SAGE_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME}-${PORTVERSION} +INSTALL_SAGE_DIR= ${PREFIX}/${PORTNAME}-${PORTVERSION} +STAGED_SAGE_DIR= ${STAGEDIR}${INSTALL_SAGE_DIR} do-install: cd ${WRKDIR} && ${FIND} -s ${WRKSRC} | \ ${GREP} -v '^${WRKSRC}/upstream/' | \ ${GREP} -v '^${WRKSRC}/tmp' | \ ${SED} -e 's#${WRKDIR}/##' | \ ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX} - ${ECHO_CMD} | ${SETENV} DOT_SAGE=${INSTALL_SAGE_DIR}/tmp/.sage ${INSTALL_SAGE_DIR}/sage - ${RM} -rf ${INSTALL_SAGE_DIR}/tmp/.sage + ${ECHO_CMD} | ${SETENV} DOT_SAGE=${STAGED_SAGE_DIR}/tmp/.sage ${STAGED_SAGE_DIR}/sage + ${RM} -rf ${STAGED_SAGE_DIR}/tmp/.sage ${SED} -e "s+#SAGE_ROOT.*+SAGE_ROOT=${INSTALL_SAGE_DIR}+" ${WRKSRC}/sage > ${STAGEDIR}${PREFIX}/bin/sage ${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/sage post-install: - @${FIND} -s ${INSTALL_SAGE_DIR} -not -type d | \ + @${FIND} -s ${STAGED_SAGE_DIR} -not -type d | \ ${SED} -e 's#${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} - @${FIND} -s ${INSTALL_SAGE_DIR} -type d -empty | \ + @${FIND} -s ${STAGED_SAGE_DIR} -type d -empty | \ ${SED} -e 's#${STAGEDIR}${PREFIX}/#@exec ${MKDIR} %D/#' >> ${TMPPLIST} - @${FIND} -s ${INSTALL_SAGE_DIR} -type d -depth | \ + @${FIND} -s ${STAGED_SAGE_DIR} -type d -depth | \ ${SED} -e 's#${STAGEDIR}${PREFIX}/#@dirrm #' >> ${TMPPLIST} .include