diff options
author | maho <maho@FreeBSD.org> | 2011-06-23 15:28:50 +0800 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2011-06-23 15:28:50 +0800 |
commit | c39c3e505e1b6942925029ccc8c624c052862ef6 (patch) | |
tree | e785e3815adf9648718f63073495573b74f69385 | |
parent | 29ec92b181c654a7a34363fa0777465672bbbf06 (diff) | |
download | freebsd-ports-gnome-c39c3e505e1b6942925029ccc8c624c052862ef6.tar.gz freebsd-ports-gnome-c39c3e505e1b6942925029ccc8c624c052862ef6.tar.zst freebsd-ports-gnome-c39c3e505e1b6942925029ccc8c624c052862ef6.zip |
Update to 3.4.1.
Add a make target called "check"
you can now check octave port by
$ make check
. [1]
Note: 10 tests failed on FreeBSD 8.1/RELEASE amd64.
Discussion with @tmacchant via twitter
-rw-r--r-- | math/octave/Makefile | 28 | ||||
-rw-r--r-- | math/octave/distinfo | 4 | ||||
-rw-r--r-- | math/octave/files/patch-mkoctfile.in | 11 | ||||
-rw-r--r-- | math/octave/pkg-plist | 2 |
4 files changed, 18 insertions, 27 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index c289f53fcd42..5e87d643b921 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -6,8 +6,7 @@ # PORTNAME= octave -PORTVERSION= 3.4.0 -PORTREVISION= 2 +PORTVERSION= 3.4.1 CATEGORIES= math MASTER_SITES= ftp://ftp.gnu.org/gnu/octave/ \ ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ @@ -23,18 +22,19 @@ BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot \ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ gsed:${PORTSDIR}/textproc/gsed \ ${PREFIX}/bin/makeinfo:${PORTSDIR}/print/texinfo -LIB_DEPENDS= glpk.30:${PORTSDIR}/math/glpk \ - umfpack.1:${PORTSDIR}/math/suitesparse \ - qhull:${PORTSDIR}/math/qhull \ +LIB_DEPENDS= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \ arpack:${PORTSDIR}/math/arpack \ - qrupdate:${PORTSDIR}/math/qrupdate \ - fftw3f:${PORTSDIR}/math/fftw3-float \ + curl:${PORTSDIR}/ftp/curl \ fftw3:${PORTSDIR}/math/fftw3 \ - ftgl:${PORTSDIR}/graphics/ftgl \ + fftw3f:${PORTSDIR}/math/fftw3-float \ fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \ - curl:${PORTSDIR}/ftp/curl \ - hdf5:${PORTSDIR}/science/hdf5-18 + ftgl:${PORTSDIR}/graphics/ftgl \ + hdf5:${PORTSDIR}/science/hdf5-18 \ + pcre.0:${PORTSDIR}/devel/pcre \ + qhull:${PORTSDIR}/math/qhull \ + qrupdate:${PORTSDIR}/math/qrupdate \ + umfpack.1:${PORTSDIR}/math/suitesparse \ + glpk.30:${PORTSDIR}/math/glpk USE_BZIP2= yes USE_PERL5_BUILD=yes @@ -116,7 +116,7 @@ post-install: .endfor .endif ${RM} -f ${WRKDIR}/PLIST -.for d in ${PREFIX}/include/octave-${OCTAVE_VERSION} ${PREFIX}/share/octave ${PREFIX}/libexec/octave ${PREFIX}/lib/octave-${OCTAVE_VERSION} +.for d in ${PREFIX}/include/octave-${OCTAVE_VERSION} ${PREFIX}/share/octave ${PREFIX}/lib/octave/${OCTAVE_VERSION} ${PREFIX}/libexec/octave ${PREFIX}/lib/octave/site @${FIND} -s $d -not -type d | \ ${SED} -e 's#^${PREFIX}/##' >> ${WRKDIR}/PLIST @${FIND} -s $d -type d -empty | \ @@ -127,4 +127,8 @@ post-install: .endfor cd ${WRKDIR} ; ${SED} -i -e "/PLIST/ r PLIST" ${TMPPLIST} + +check: + (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} check) + .include <bsd.port.post.mk> diff --git a/math/octave/distinfo b/math/octave/distinfo index aadaa07dfb44..0470b25261dc 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,2 +1,2 @@ -SHA256 (octave-3.4.0.tar.bz2) = 0fb4f78f43320eec82477c1bbde42877e0e490a9f4903966b1682a9600ffcc2b -SIZE (octave-3.4.0.tar.bz2) = 14619487 +SHA256 (octave-3.4.1.tar.bz2) = 009589d72bcd38b69a1b3c99286048d11c55491cf756791bc08460be83fc5f14 +SIZE (octave-3.4.1.tar.bz2) = 14869120 diff --git a/math/octave/files/patch-mkoctfile.in b/math/octave/files/patch-mkoctfile.in deleted file mode 100644 index 2fec1d78cc2a..000000000000 --- a/math/octave/files/patch-mkoctfile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- mkoctfile.in-orig 2008-08-27 17:46:53.000000000 -0500 -+++ mkoctfile.in 2008-08-27 17:47:45.000000000 -0500 -@@ -278,7 +278,7 @@ - -D*) - defs="$defs $1" - ;; -- -[lLR]* | -Wl,*) -+ -[lLR]* | -pthread | -Wl,*) - ldflags="$ldflags $1" - ;; - -M | --depend) diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist index febe145e88aa..027b33e1ccc5 100644 --- a/math/octave/pkg-plist +++ b/math/octave/pkg-plist @@ -1,9 +1,7 @@ bin/mkoctfile -bin/mkoctfile-%%OCTAVE_VERSION%% bin/octave bin/octave-%%OCTAVE_VERSION%% bin/octave-config -bin/octave-config-%%OCTAVE_VERSION%% share/applications/www.octave.org-octave.desktop %%PORTDOCS%%%%DOCSDIR%%/OctaveFAQ.ps %%PORTDOCS%%%%DOCSDIR%%/liboctave.ps |