From owner-svn-ports-head@FreeBSD.ORG  Sun Jan 12 22:39:23 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 9EAFF91A;
 Sun, 12 Jan 2014 22:39:23 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B282178E;
 Sun, 12 Jan 2014 22:39:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CMdNHS047679;
 Sun, 12 Jan 2014 22:39:23 GMT (envelope-from stephen@svn.freebsd.org)
Received: (from stephen@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CMdNNb047678;
 Sun, 12 Jan 2014 22:39:23 GMT (envelope-from stephen@svn.freebsd.org)
Message-Id: <201401122239.s0CMdNNb047678@svn.freebsd.org>
From: Stephen Montgomery-Smith <stephen@FreeBSD.org>
Date: Sun, 12 Jan 2014 22:39:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339555 - head/Mk
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jan 2014 22:39:23 -0000

Author: stephen
Date: Sun Jan 12 22:39:23 2014
New Revision: 339555
URL: http://svnweb.freebsd.org/changeset/ports/339555

Log:
  - Fix errors created when staging was implemented.

Modified:
  head/Mk/bsd.octave.mk

Modified: head/Mk/bsd.octave.mk
==============================================================================
--- head/Mk/bsd.octave.mk	Sun Jan 12 22:08:54 2014	(r339554)
+++ head/Mk/bsd.octave.mk	Sun Jan 12 22:39:23 2014	(r339555)
@@ -26,19 +26,20 @@ USES+=		gmake
 
 DIST_SUBDIR=	octave-forge
 OCTAVE_PKGNAME=	${PORTNAME:S/octave-forge-//}
-TARBALLS_DIR=	${STAGEDIR}${PREFIX}/share/octave/tarballs
+TARBALLS_DIR=	${LOCALBASE}/share/octave/tarballs
+INSTALL_TARBALLS_DIR=	${STAGEDIR}${PREFIX}/share/octave/tarballs
 
 MAKE_ENV+=	PACKAGE=${WRKDIR}/${DISTNAME}.tar.gz
 
 LOAD_OCTAVE_PKG_CMD=	${LOCALBASE}/libexec/octave/load-octave-pkg
 
 do-install:
-	${MKDIR} ${TARBALLS_DIR}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.tar.gz ${TARBALLS_DIR}/.
-	${LN} -s -f ${DISTNAME}.tar.gz ${TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz
+	${MKDIR} ${INSTALL_TARBALLS_DIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.tar.gz ${INSTALL_TARBALLS_DIR}/.
+	${LN} -s -f ${DISTNAME}.tar.gz ${INSTALL_TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz
 
 post-install:
-	@${ECHO_CMD} "@unexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
 	@${ECHO_CMD} "share/octave/tarballs/${DISTNAME}.tar.gz" >> ${TMPPLIST}
 	@${ECHO_CMD} "share/octave/tarballs/${OCTAVE_PKGNAME}.tar.gz" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}