Attachment 139523 Details for Bug 185783 – file.diff

[patch] file.diff

file.diff (text/plain), 3.64 KB, created by Fernando Apesteguía on 2014-01-14 22:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2014-01-14 22:10:01 UTC

Size: 3.64 KB

patch

obsolete

>diff -ruN /usr/ports/math/dynare/Makefile math/dynare/Makefile
>--- /usr/ports/math/dynare/Makefile	2013-10-26 02:52:33.000000000 +0200
>+++ math/dynare/Makefile	2014-01-13 19:11:41.000000000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: math/dynare/Makefile 331644 2013-10-26 00:52:33Z gerald $
> 
> PORTNAME=	dynare
>-PORTVERSION=	4.3.3
>+PORTVERSION=	4.4.0
> PORTREVISION=	1
> CATEGORIES=	math
> MASTER_SITES=	http://www.dynare.org/release/source/
>@@ -11,6 +11,8 @@
> COMMENT=	Software platform for handling a wide class of economic models
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/unordered_set.hpp:${PORTSDIR}/devel/boost-libs
>+BUILD_DEPENDS+=	${LOCALBASE}/lib/libumfpack.so:${PORTSDIR}/math/suitesparse
>+BUILD_DEPENDS+=	${LOCALBASE}/include/matio.h:${PORTSDIR}/math/matio
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}
> GNU_CONFIGURE=	yes
>@@ -25,7 +27,6 @@
> MATLAB_DESC=	Enable compilation of MEX files for MATLAB
> OPTIONS_DEFAULT=	OCTAVE
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if empty(PORT_OPTIONS:MMATLAB)
>diff -ruN /usr/ports/math/dynare/distinfo math/dynare/distinfo
>--- /usr/ports/math/dynare/distinfo	2013-04-18 21:56:30.000000000 +0200
>+++ math/dynare/distinfo	2013-12-16 18:40:59.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (dynare-4.3.3.tar.xz) = 76c9ca44ed95d63f2b3a565dd8e91f5e6c51265dd1c75a5d80125eaac812f1d0
>-SIZE (dynare-4.3.3.tar.xz) = 12430124
>+SHA256 (dynare-4.4.0.tar.xz) = b6cd4ad5204d53ccfce4e463c3138a2059803fbae8670f44d79740616caa92fe
>+SIZE (dynare-4.4.0.tar.xz) = 14897624
>diff -ruN /usr/ports/math/dynare/files/patch-configure math/dynare/files/patch-configure
>--- /usr/ports/math/dynare/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ math/dynare/files/patch-configure	2014-01-10 20:34:51.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- mex/build/octave/configure.orig	2014-01-10 20:33:42.000000000 +0100
>++++ mex/build/octave/configure	2014-01-10 20:34:24.000000000 +0100
>+@@ -6769,7 +6769,7 @@
>+   $as_echo_n "(cached) " >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+-LIBS="-lumfpack  $LIBS"
>++LIBS="-lumfpack -llapack -lblas -lsuitesparseconfig -lcholmod -lcolamd -lamd $LIBS"
>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+ /* end confdefs.h.  */
>+ 
>diff -ruN /usr/ports/math/dynare/files/patch-configure.ac math/dynare/files/patch-configure.ac
>--- /usr/ports/math/dynare/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>+++ math/dynare/files/patch-configure.ac	2014-01-10 20:59:48.000000000 +0100
>@@ -0,0 +1,27 @@
>+--- mex/build/octave/configure.ac.orig	2013-12-06 14:52:59.682612000 +0100
>++++ mex/build/octave/configure.ac	2014-01-10 20:59:19.000000000 +0100
>+@@ -36,6 +36,7 @@
>+ CFLAGS="$CFLAGS -Wall -Wno-parentheses"
>+ FFLAGS="$FFLAGS -Wall"
>+ CXXFLAGS="$CXXFLAGS -Wall -Wno-parentheses"
>++LIBS="-lumfpack -llapack -lblas -lsuitesparseconfig -lcholmod -lcolamd -lamd"
>+ 
>+ AC_PROG_F77([gfortran g77 f77])
>+ AC_PROG_CC
>+@@ -61,14 +62,10 @@
>+ AM_CONDITIONAL([HAVE_SLICOT], [test "x$has_slicot" = "xyes"])
>+ 
>+ # Check for UMFPACK, needed by bytecode
>+-AC_CHECK_LIB([umfpack], [umfpack_dl_defaults], [LIBADD_UMFPACK="-lumfpack"], [AC_MSG_ERROR([Can't find UMFPACK])])
>++AC_CHECK_LIB([umfpack], [umfpack_dl_defaults], [LIBADD_UMFPACK="-lumfpack -llapack -lblas -lsuitesparseconfig -lcholmod -lcolamd -lamd"], [AC_MSG_ERROR([Can't find UMFPACK])])
>+ # For OS X, explicitly add libraries that libumfpack depends on as Homebrew
>+ # doesn't support the creation of shared libraries for suite-sparse 3.7.0
>+-case ${host_os} in
>+-  darwin*)
>+-    LIBADD_UMFPACK="-lumfpack -lcholmod -lcolamd -lamd"
>+-    ;;
>+-esac
>++LIBADD_UMFPACK="-lumfpack -llapack -lblas -lsuitesparseconfig -lcholmod -lcolamd -lamd"
>+ AC_SUBST([LIBADD_UMFPACK])
>+ 
>+ AM_CONDITIONAL([DO_SOMETHING], [test "x$MKOCTFILE" != "x"])

Actions: View | Diff

Attachments on bug 185783: 139523