Date: Sun, 12 Jan 2014 22:39:23 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339555 - head/Mk Message-ID: <201401122239.s0CMdNNb047678@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401122239.s0CMdNNb047678>