3 files changed, 31 insertions, 41 deletions

diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index 019f1a78038b..e68b6da371ec 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dynare
-PORTVERSION=	4.5.1
-PORTREVISION=	3
+DISTVERSION=	4.5.3
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 
@@ -19,30 +18,29 @@ LIB_DEPENDS=	libumfpack.so:math/suitesparse \
 		libmatio.so:math/matio \
 		libhdf5.so:science/hdf5 \
 		libopenblas.so:math/openblas \
-		libopenblasp.so:math/openblas \
 		libfftw3_threads.so:math/fftw3 \
-		libfftw3.so:math/fftw3 \
 		libfftw3f_threads.so:math/fftw3-float \
-		libfftw3f.so:math/fftw3-float
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
-USES=		fortran gmake pkgconfig tar:xz shebangfix
+USES=		fortran gmake localbase pkgconfig shebangfix tar:xz
 SHEBANG_FILES=	matlab/modules/reporting/success.sh
 
-INFO=		dynare
+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_DEFAULT=	OCTAVE
+OPTIONS_SUB=		yes
 
 MATLAB_CONFIGURE_ENABLE=	matlab
 OCTAVE_CONFIGURE_ENABLE=	octave
 OCTAVE_BUILD_DEPENDS=		octave:math/octave
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+ONLY_FOR_ARCH=	i386 amd64
+ARCH_amd64=	64
+ARCH_i386=	32
+PLIST_SUB=	ARCH=${ARCH_${ARCH}}
 
 post-configure:
 	@${ECHO_MSG} ""
@@ -54,11 +52,4 @@ post-configure:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
 
-.include <bsd.port.pre.mk>
-
-post-install:
-.if ${ARCH} == "amd64"
-	${REINPLACE_CMD} -e 's|preprocessor32|preprocessor64|g' ${TMPPLIST}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/dynare/distinfo b/math/dynare/distinfo
index 4c4cc80602cc..033177fbe8b0 100644
--- a/math/dynare/distinfo
+++ b/math/dynare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500906695
-SHA256 (dynare-4.5.1.tar.xz) = ae6a7e9cc62fb25b18db3d4b5c34c27c7af17a46cb73586d051a049b7108db1f
-SIZE (dynare-4.5.1.tar.xz) = 16068492
+TIMESTAMP = 1509553396
+SHA256 (dynare-4.5.3.tar.xz) = 01434f6d3ceaff1891dc771f6a5b39caee787b2ffa1875e5a4e8c673e32ff3d7
+SIZE (dynare-4.5.3.tar.xz) = 16070908
diff --git a/math/dynare/pkg-plist b/math/dynare/pkg-plist
index 0ff4bed70c2a..0c2a41059b74 100644
--- a/math/dynare/pkg-plist
+++ b/math/dynare/pkg-plist
@@ -1,5 +1,4 @@
 bin/dynare++
-info/dir
 lib/dynare/contrib/ms-sbvar/TZcode/MatlabFiles/a0asfun.m
 lib/dynare/contrib/ms-sbvar/TZcode/MatlabFiles/a0asgrad.m
 lib/dynare/contrib/ms-sbvar/TZcode/MatlabFiles/a0freefun.m
@@ -557,7 +556,7 @@ lib/dynare/matlab/internals.m
 lib/dynare/matlab/interpret_resol_info.m
 lib/dynare/matlab/irf.m
 lib/dynare/matlab/isbayes.m
-lib/dynare/matlab/isoctave.m
+%%OCTAVE%%lib/dynare/matlab/isoctave.m
 lib/dynare/matlab/isolder.m
 lib/dynare/matlab/jacob_element.m
 lib/dynare/matlab/k_order_pert.m
@@ -623,6 +622,7 @@ lib/dynare/matlab/missing/corrcoef/flag_implicit_skip_nan.m
 lib/dynare/matlab/missing/corrcoef/sumskipnan.m
 lib/dynare/matlab/missing/corrcoef/tcdf.m
 lib/dynare/matlab/missing/ilu/ilu.m
+%%OCTAVE%%lib/dynare/matlab/missing/isfile/isfile.m
 lib/dynare/matlab/missing/issquare/issquare.m
 lib/dynare/matlab/missing/nanmean/nanmean.m
 lib/dynare/matlab/missing/ordeig/ordeig.m
@@ -800,7 +800,7 @@ lib/dynare/matlab/modules/dseries/src/utilities/missing/demean/demean.m
 lib/dynare/matlab/modules/dseries/src/utilities/missing/get_cells_id/get_cells_id.m
 lib/dynare/matlab/modules/dseries/src/utilities/missing/ndim/ndim.m
 lib/dynare/matlab/modules/dseries/src/utilities/missing/sample_hp_filter/sample_hp_filter.m
-lib/dynare/matlab/modules/dseries/src/utilities/missing/user_has_octave_forge_package/user_has_octave_forge_package.m
+%%OCTAVE%%lib/dynare/matlab/modules/dseries/src/utilities/missing/user_has_octave_forge_package/user_has_octave_forge_package.m
 lib/dynare/matlab/modules/dseries/src/utilities/str/common_strings_in_cell_arrays.m
 lib/dynare/matlab/modules/dseries/src/utilities/str/get_random_string.m
 lib/dynare/matlab/modules/dseries/src/utilities/str/name2tex.m
@@ -957,7 +957,7 @@ lib/dynare/matlab/myboxplot.m
 lib/dynare/matlab/mydelete.m
 lib/dynare/matlab/name2index.m
 lib/dynare/matlab/non_linear_dsge_likelihood.m
-lib/dynare/matlab/octave_ver_less_than.m
+%%OCTAVE%%lib/dynare/matlab/octave_ver_less_than.m
 lib/dynare/matlab/one_sided_hp_filter.m
 lib/dynare/matlab/optimization/apprgrdn.m
 lib/dynare/matlab/optimization/bfgsi1.m
@@ -1088,7 +1088,7 @@ lib/dynare/matlab/posterior_sampler.m
 lib/dynare/matlab/posterior_sampler_core.m
 lib/dynare/matlab/posterior_sampler_initialization.m
 lib/dynare/matlab/posterior_sampler_iteration.m
-lib/dynare/matlab/preprocessor32/dynare_m
+%%OCTAVE%%lib/dynare/matlab/preprocessor%%ARCH%%/dynare_m
 lib/dynare/matlab/print_bytecode_dynamic_model.m
 lib/dynare/matlab/print_bytecode_static_model.m
 lib/dynare/matlab/print_info.m
@@ -1171,7 +1171,7 @@ lib/dynare/matlab/stoch_simul.m
 lib/dynare/matlab/stochastic_solvers.m
 lib/dynare/matlab/store_smoother_results.m
 lib/dynare/matlab/subset.m
-lib/dynare/matlab/supported_octave_version.m
+%%OCTAVE%%lib/dynare/matlab/supported_octave_version.m
 lib/dynare/matlab/symmetric_matrix_index.m
 lib/dynare/matlab/test_for_deep_parameters_calibration.m
 lib/dynare/matlab/th_autocovariances.m
@@ -1181,7 +1181,7 @@ lib/dynare/matlab/trust_region.m
 lib/dynare/matlab/uniform_specification.m
 lib/dynare/matlab/update_last_mh_history_file.m
 lib/dynare/matlab/user_has_matlab_license.m
-lib/dynare/matlab/user_has_octave_forge_package.m
+%%OCTAVE%%lib/dynare/matlab/user_has_octave_forge_package.m
 lib/dynare/matlab/utilities/dataset/describe_missing_data.m
 lib/dynare/matlab/utilities/dataset/descriptive_statistics.m
 lib/dynare/matlab/utilities/dataset/initialize_dataset.m
@@ -1208,7 +1208,6 @@ lib/dynare/matlab/utilities/general/isconst.m
 lib/dynare/matlab/utilities/general/isdiagonal.m
 lib/dynare/matlab/utilities/general/isestimation.m
 lib/dynare/matlab/utilities/general/iseven.m
-lib/dynare/matlab/utilities/general/isfile.m
 lib/dynare/matlab/utilities/general/isinestimationobjective.m
 lib/dynare/matlab/utilities/general/isint.m
 lib/dynare/matlab/utilities/general/isodd.m
@@ -1233,7 +1232,7 @@ lib/dynare/matlab/utilities/tests/src/dtest.m
 lib/dynare/matlab/utilities/tests/src/get_directory_description.m
 lib/dynare/matlab/utilities/tests/src/initialize_unit_tests_toolbox.m
 lib/dynare/matlab/utilities/tests/src/is_unitary_test_available.m
-lib/dynare/matlab/utilities/tests/src/missing/isoctave/isoctave.m
+%%OCTAVE%%lib/dynare/matlab/utilities/tests/src/missing/isoctave/isoctave.m
 lib/dynare/matlab/utilities/tests/src/missing/skipline/skipline.m
 lib/dynare/matlab/utilities/tests/src/mtest.m
 lib/dynare/matlab/utilities/tests/src/run_unitary_tests.m
@@ -1254,14 +1253,14 @@ lib/dynare/matlab/writecellofchar.m
 lib/dynare/matlab/writedata.m
 lib/dynare/matlab/writedata_text.m
 lib/dynare/matlab/writematrixofchar.m
-lib/dynare/mex/octave/A_times_B_kronecker_C.mex
-lib/dynare/mex/octave/block_kalman_filter.mex
-lib/dynare/mex/octave/bytecode.mex
-lib/dynare/mex/octave/dynare_simul_.mex
-lib/dynare/mex/octave/gensylv.mex
-lib/dynare/mex/octave/k_order_perturbation.mex
-lib/dynare/mex/octave/local_state_space_iteration_2.mex
-lib/dynare/mex/octave/mjdgges.mex
-lib/dynare/mex/octave/qmc_sequence.mex
-lib/dynare/mex/octave/qzcomplex.oct
-lib/dynare/mex/octave/sparse_hessian_times_B_kronecker_C.mex
+%%OCTAVE%%lib/dynare/mex/octave/A_times_B_kronecker_C.mex
+%%OCTAVE%%lib/dynare/mex/octave/block_kalman_filter.mex
+%%OCTAVE%%lib/dynare/mex/octave/bytecode.mex
+%%OCTAVE%%lib/dynare/mex/octave/dynare_simul_.mex
+%%OCTAVE%%lib/dynare/mex/octave/gensylv.mex
+%%OCTAVE%%lib/dynare/mex/octave/k_order_perturbation.mex
+%%OCTAVE%%lib/dynare/mex/octave/local_state_space_iteration_2.mex
+%%OCTAVE%%lib/dynare/mex/octave/mjdgges.mex
+%%OCTAVE%%lib/dynare/mex/octave/qmc_sequence.mex
+%%OCTAVE%%lib/dynare/mex/octave/qzcomplex.oct
+%%OCTAVE%%lib/dynare/mex/octave/sparse_hessian_times_B_kronecker_C.mex