diff options
| -rw-r--r-- | math/octave-devel/Makefile | 5 | ||||
| -rw-r--r-- | math/octave-devel/distinfo | 2 | ||||
| -rw-r--r-- | math/octave-devel/files/patch-glob.h | 14 | ||||
| -rw-r--r-- | math/octave/Makefile | 5 | ||||
| -rw-r--r-- | math/octave/distinfo | 2 | ||||
| -rw-r--r-- | math/octave/files/patch-glob.h | 14 |
6 files changed, 36 insertions, 6 deletions
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile index 1bfff00e8843..236df6c49382 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= octave -PORTVERSION= 2.1.30 +PORTVERSION= 2.1.39 CATEGORIES= math MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ @@ -16,6 +16,7 @@ MAINTAINER= chuckr@FreeBSD.org USE_BZIP2= yes BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot +LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw .include <bsd.port.pre.mk> @@ -29,7 +30,7 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-shared --host=${GNU_HOST} +CONFIGURE_ARGS= --disable-shared --with-fftw --host=${GNU_HOST} .if ${OSVERSION} < 400004 CONFIGURE_ARGS+= --with-f2c diff --git a/math/octave-devel/distinfo b/math/octave-devel/distinfo index 2f778e2769bb..ba86dfaf1301 100644 --- a/math/octave-devel/distinfo +++ b/math/octave-devel/distinfo @@ -1 +1 @@ -MD5 (octave-2.1.30.tar.bz2) = a4b60bb9942947b9a22795bef61cfb2b +MD5 (octave-2.1.39.tar.bz2) = ab7f7e4d1a0d1032d260eb85ca4c571e diff --git a/math/octave-devel/files/patch-glob.h b/math/octave-devel/files/patch-glob.h new file mode 100644 index 000000000000..c622411bdb47 --- /dev/null +++ b/math/octave-devel/files/patch-glob.h @@ -0,0 +1,14 @@ +--- glob/glob.h.orig Sun Nov 10 15:32:00 2002 ++++ glob/glob.h Sun Nov 10 15:32:49 2002 +@@ -48,7 +48,11 @@ + /* We need `size_t' for the following definitions. */ + #ifndef __size_t + # if defined __GNUC__ && __GNUC__ >= 2 ++#ifndef __FreeBSD__ + typedef __SIZE_TYPE__ __size_t; ++#else ++#include <sys/types.h> ++#endif + # else + /* This is a guess. */ + /*hb diff --git a/math/octave/Makefile b/math/octave/Makefile index 1bfff00e8843..236df6c49382 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -6,7 +6,7 @@ # PORTNAME= octave -PORTVERSION= 2.1.30 +PORTVERSION= 2.1.39 CATEGORIES= math MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ @@ -16,6 +16,7 @@ MAINTAINER= chuckr@FreeBSD.org USE_BZIP2= yes BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot +LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw .include <bsd.port.pre.mk> @@ -29,7 +30,7 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-shared --host=${GNU_HOST} +CONFIGURE_ARGS= --disable-shared --with-fftw --host=${GNU_HOST} .if ${OSVERSION} < 400004 CONFIGURE_ARGS+= --with-f2c diff --git a/math/octave/distinfo b/math/octave/distinfo index 2f778e2769bb..ba86dfaf1301 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1 +1 @@ -MD5 (octave-2.1.30.tar.bz2) = a4b60bb9942947b9a22795bef61cfb2b +MD5 (octave-2.1.39.tar.bz2) = ab7f7e4d1a0d1032d260eb85ca4c571e diff --git a/math/octave/files/patch-glob.h b/math/octave/files/patch-glob.h new file mode 100644 index 000000000000..c622411bdb47 --- /dev/null +++ b/math/octave/files/patch-glob.h @@ -0,0 +1,14 @@ +--- glob/glob.h.orig Sun Nov 10 15:32:00 2002 ++++ glob/glob.h Sun Nov 10 15:32:49 2002 +@@ -48,7 +48,11 @@ + /* We need `size_t' for the following definitions. */ + #ifndef __size_t + # if defined __GNUC__ && __GNUC__ >= 2 ++#ifndef __FreeBSD__ + typedef __SIZE_TYPE__ __size_t; ++#else ++#include <sys/types.h> ++#endif + # else + /* This is a guess. */ + /*hb |