From owner-svn-ports-head@FreeBSD.ORG Wed Oct 17 05:37:35 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 804952F6; Wed, 17 Oct 2012 05:37:35 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F2948FC14; Wed, 17 Oct 2012 05:37:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9H5bZZm003269; Wed, 17 Oct 2012 05:37:35 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9H5bZC8003267; Wed, 17 Oct 2012 05:37:35 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201210170537.q9H5bZC8003267@svn.freebsd.org> From: Jason Helfman Date: Wed, 17 Oct 2012 05:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305999 - head/math/dynare X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Oct 2012 05:37:35 -0000 Author: jgh Date: Wed Oct 17 05:37:34 2012 New Revision: 305999 URL: http://svn.freebsd.org/changeset/ports/305999 Log: - fix fetch - while here adopt optionsNG PR: 172738 Submitted by: maintainer, fernando.apesteguia@gmail.com Feature safe: yes Modified: head/math/dynare/Makefile Modified: head/math/dynare/Makefile ============================================================================== --- head/math/dynare/Makefile Wed Oct 17 02:17:42 2012 (r305998) +++ head/math/dynare/Makefile Wed Oct 17 05:37:34 2012 (r305999) @@ -1,13 +1,11 @@ -# New ports collection makefile for: dynare -# Date created: Aug 17 2011 -# Whom: Fernando Apesteguia +# Created by: Fernando Apesteguia # # $FreeBSD$ PORTNAME= dynare PORTVERSION= 4.3.0 CATEGORIES= math -MASTER_SITES= http://www.dynare.org/download/dynare-4.3/source/${DISTNAME}${EXTRACT_SUFX}/at_download/file +MASTER_SITES= http://www.dynare.org/release/source/ MAINTAINER= fernando.apesteguia@gmail.com COMMENT= Software platform for handling a wide class of economic models @@ -22,22 +20,26 @@ USE_XZ= yes INFO= dynare -OPTIONS+= OCTAVE "Enable compilation of MEX files for Octave" on -OPTIONS+= MATLAB "Enable compilation of MEX files for MATLAB" off +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 -.if defined(WITHOUT_MATLAB) +.include + +.if empty(PORT_OPTIONS:MMATLAB) CONFIGURE_ARGS+= --disable-matlab .endif -.if defined(WITHOUT_OCTAVE) -CONFIGURE_ARGS+= --disable-octave -.else +.if ${PORT_OPTIONS:MOCTAVE} BUILD_DEPENDS+= octave:${PORTSDIR}/math/octave +.else +CONFIGURE_ARGS+= --disable-octave .endif do-fetch: if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${FETCH_BINARY} -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} http://www.dynare.org/download/dynare-4.3/source/${DISTNAME}${EXTRACT_SUFX}/at_download/file ;\ + ${FETCH_BINARY} -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} http://www.dynare.org/release/source/dynare-${PORTVERSION}.tar.xz;\ fi post-configure: