Date: Sun, 19 Jan 2014 12:29:38 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340272 - in head/math/dynare: . files Message-ID: <201401191229.s0JCTcQa095598@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Sun Jan 19 12:29:37 2014 New Revision: 340272 URL: http://svnweb.freebsd.org/changeset/ports/340272 QAT: https://qat.redports.org/buildarchive/r340272/ Log: - Update from 4.3.3 to 4.4.0 - Add stage support while here - Convert USE_GMAKE to USES - Use options helpers PR: ports/185783 Submitted by: Fernando <fernando.apesteguia@gmail.com> (maintainer) Added: head/math/dynare/files/patch-configure (contents, props changed) head/math/dynare/files/patch-configure.ac (contents, props changed) Modified: head/math/dynare/Makefile head/math/dynare/distinfo Modified: head/math/dynare/Makefile ============================================================================== --- head/math/dynare/Makefile Sun Jan 19 12:19:25 2014 (r340271) +++ head/math/dynare/Makefile Sun Jan 19 12:29:37 2014 (r340272) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dynare -PORTVERSION= 4.3.3 -PORTREVISION= 1 +PORTVERSION= 4.4.0 CATEGORIES= math MASTER_SITES= http://www.dynare.org/release/source/ @@ -11,32 +10,25 @@ MAINTAINER= fernando.apesteguia@gmail.co 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 -USE_GMAKE= yes +USES= gmake USE_FORTRAN= yes USE_XZ= yes INFO= dynare -OPTIONS_DEFINE= OCTAVE MATLAB -OCTAVE_DESC=Enable compilation of MEX files for Octave -MATLAB_DESC= Enable compilation of MEX files for MATLAB +OPTIONS_DEFINE= OCTAVE MATLAB +OCTAVE_DESC= Enable compilation of MEX files for Octave +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) -CONFIGURE_ARGS+= --disable-matlab -.endif - -.if ${PORT_OPTIONS:MOCTAVE} -BUILD_DEPENDS+= octave:${PORTSDIR}/math/octave -.else -CONFIGURE_ARGS+= --disable-octave -.endif +MATLAB_CONFIGURE_ENABLE= matlab +OCTAVE_CONFIGURE_ENABLE= octave +OCTAVE_BUILD_DEPENDS= octave:${PORTSDIR}/math/octave post-configure: @${ECHO_MSG} "" Modified: head/math/dynare/distinfo ============================================================================== --- head/math/dynare/distinfo Sun Jan 19 12:19:25 2014 (r340271) +++ head/math/dynare/distinfo Sun Jan 19 12:29:37 2014 (r340272) @@ -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 Added: head/math/dynare/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/dynare/files/patch-configure Sun Jan 19 12:29:37 2014 (r340272) @@ -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. */ + Added: head/math/dynare/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/dynare/files/patch-configure.ac Sun Jan 19 12:29:37 2014 (r340272) @@ -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"])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401191229.s0JCTcQa095598>