diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/glpk/Makefile | 27 | ||||
| -rw-r--r-- | math/glpk/distinfo | 4 | ||||
| -rw-r--r-- | math/glpk/pkg-plist | 2 | ||||
| -rw-r--r-- | math/octave-devel/Makefile | 10 | ||||
| -rw-r--r-- | math/octave/Makefile | 10 |
5 files changed, 21 insertions, 32 deletions
diff --git a/math/glpk/Makefile b/math/glpk/Makefile index 0dfbb2220f77..f45125b9b354 100644 --- a/math/glpk/Makefile +++ b/math/glpk/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: GLPK -# Date created: 16 December 2000 -# Whom: Dmitry Sivachenko <demon@FreeBSD.org> -# +# Created by: Dmitry Sivachenko <demon@FreeBSD.org> # $FreeBSD$ -# PORTNAME= glpk -PORTVERSION= 4.47 +PORTVERSION= 4.48 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= glpk @@ -18,8 +14,9 @@ LICENSE= GPLv3 LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp -OPTIONS= IODBC "Enable MathProg iodbc support" Off \ - MYSQL "Enable MathProg mysql support" Off +OPTIONS_DEFINE= IODBC MYSQL +IODBC_DESC= MathProg iodbc support +MYSQL_DESC= MathProg mysql support GNU_CONFIGURE= yes USE_GMAKE= yes @@ -30,22 +27,22 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-gmp CONFLICTS= goblin-[0-9]* -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.ifdef(WITH_IODBC || WITH_MYSQL) +.if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --enable-dl=dlfcn .else CONFIGURE_ARGS+= --disable-dl .endif -.ifdef(WITH_IODBC) +.if ${PORT_OPTIONS:MIODBC} CONFIGURE_ARGS+= --enable-odbc -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc .else CONFIGURE_ARGS+= --disable-odbc .endif -.ifdef(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --enable-mysql USE_MYSQL= yes .else @@ -56,7 +53,7 @@ post-patch: @${REINPLACE_CMD} -e "s;\/usr\/include\/mysql;${LOCALBASE}\/include\/mysql;g" \ ${WRKSRC}/configure -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} DOCS1= cnfsat.pdf glpk.pdf glpk_faq.txt gmpl.pdf graphs.pdf miplib2.txt \ miplib3.txt netlib.txt DOCS2= dfeas.pdf gomory.pdf keller.pdf scaling.pdf updating.pdf @@ -72,4 +69,4 @@ post-install: check regression-test test: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} check) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/glpk/distinfo b/math/glpk/distinfo index 9988499b6ffc..da6bb2e84ce8 100644 --- a/math/glpk/distinfo +++ b/math/glpk/distinfo @@ -1,2 +1,2 @@ -SHA256 (glpk-4.47.tar.gz) = c35438e3ba74a8d85236810e6b84879272c87cfa7473b4075201e2967839f48d -SIZE (glpk-4.47.tar.gz) = 3124974 +SHA256 (glpk-4.48.tar.gz) = abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1 +SIZE (glpk-4.48.tar.gz) = 3488482 diff --git a/math/glpk/pkg-plist b/math/glpk/pkg-plist index 98de242d115e..91a964290633 100644 --- a/math/glpk/pkg-plist +++ b/math/glpk/pkg-plist @@ -3,4 +3,4 @@ include/glpk.h lib/libglpk.a lib/libglpk.la lib/libglpk.so -lib/libglpk.so.32 +lib/libglpk.so.33 diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile index 7a5fcac49382..01304ad6c3e1 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: octave -# Date created: 8 September 1998 -# Whom: chuckr@freebsd.org -# +# Created by: chuckr@freebsd.org # $FreeBSD$ -# PORTNAME= octave PORTVERSION= 3.3.50 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/\ @@ -24,7 +20,7 @@ BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot \ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ - glpk.32:${PORTSDIR}/math/glpk \ + glpk:${PORTSDIR}/math/glpk \ hdf5:${PORTSDIR}/science/hdf5 \ umfpack.1:${PORTSDIR}/math/suitesparse \ qhull.5:${PORTSDIR}/math/qhull5 diff --git a/math/octave/Makefile b/math/octave/Makefile index cba739bb8c97..1e773f1a71ab 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: octave -# Date created: 8 September 1998 -# Whom: chuckr@freebsd.org -# +# Created by: chuckr@freebsd.org # $FreeBSD$ -# PORTNAME= octave PORTVERSION= 3.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= ftp://ftp.gnu.org/gnu/octave/ \ ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ @@ -35,7 +31,7 @@ LIB_DEPENDS= GraphicsMagick:${PORTSDIR}/graphics/GraphicsMagick \ qhull.5:${PORTSDIR}/math/qhull5 \ qrupdate:${PORTSDIR}/math/qrupdate \ umfpack.1:${PORTSDIR}/math/suitesparse \ - glpk.32:${PORTSDIR}/math/glpk + glpk:${PORTSDIR}/math/glpk USE_BZIP2= yes USE_PERL5_BUILD=yes |