diff options
| author | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2011-06-30 20:52:08 +0000 |
|---|---|---|
| committer | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2011-06-30 20:52:08 +0000 |
| commit | e6620d74bac0477e16325d99a94a7a3f046a5c5a (patch) | |
| tree | e7c2a8c1c1589b59025182705e7cfd80b7a70e2b /Mk/bsd.octave.mk | |
| parent | disclose my location (diff) | |
- Update math/octave-forge-base to 1.1. Now includes the script
load-octave-pkg to link the octave packaging system to the FreeBSD ports.
- Update Mk/bsd.octave.mk so that octave-forge-* ports use this script.
Approved by: gabor (mentor)
Notes
Notes:
svn path=/head/; revision=276747
Diffstat (limited to 'Mk/bsd.octave.mk')
| -rw-r--r-- | Mk/bsd.octave.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.octave.mk b/Mk/bsd.octave.mk index 92a2243dd633..f97e02aae772 100644 --- a/Mk/bsd.octave.mk +++ b/Mk/bsd.octave.mk @@ -18,11 +18,10 @@ bsd_octave_mk_MAINTAINER= stephen@FreeBSD.org BUILD_DEPENDS+= octave:${PORTSDIR}/math/octave RUN_DEPENDS+= octave:${PORTSDIR}/math/octave \ - gmake:${PORTSDIR}/devel/gmake -RUN_DEPENDS+= ${LOCALBASE}/share/octave/tarballs:${PORTSDIR}/math/octave-forge-base + ${LOCALBASE}/libexec/octave/load-octave-pkg:${PORTSDIR}/math/octave-forge-base LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre -USE_FORTRAN= yes +USE_FORTRAN= yes USE_GMAKE= yes DIST_SUBDIR= octave-forge @@ -31,16 +30,17 @@ TARBALLS_DIR= ${LOCALBASE}/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}/. - ${RM} -f ${TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz - PATH=${PREFIX}/bin:/usr/bin:/bin octave -H -q --no-site-file --eval "pkg('install','${TARBALLS_DIR}/${DISTNAME}.tar.gz')" ${LN} -s ${DISTNAME}.tar.gz ${TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz + ${LOAD_OCTAVE_PKG_CMD} post-install: @${ECHO_CMD} "share/octave/tarballs/${DISTNAME}.tar.gz" >> ${TMPPLIST} - @${ECHO_CMD} "@exec octave -H -q --no-site-file --eval \"pkg('install','${LOCALBASE}/share/octave/tarballs/${DISTNAME}.tar.gz')\" > /dev/null" >> ${TMPPLIST} @${ECHO_CMD} "share/octave/tarballs/${OCTAVE_PKGNAME}.tar.gz" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec octave -H -q --no-site-file --eval \"pkg('uninstall','${OCTAVE_PKGNAME}')\" > /dev/null" >> ${TMPPLIST} + @${ECHO_CMD} "@exec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST} @if [ -e ${.CURDIR}/pkg-message ]; then ${CAT} ${.CURDIR}/pkg-message; fi |