From owner-freebsd-ports@FreeBSD.ORG Mon Jun 9 09:12:02 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CFD337B401 for ; Mon, 9 Jun 2003 09:12:02 -0700 (PDT) Received: from web13408.mail.yahoo.com (web13408.mail.yahoo.com [216.136.175.66]) by mx1.FreeBSD.org (Postfix) with SMTP id C7D0543F93 for ; Mon, 9 Jun 2003 09:12:01 -0700 (PDT) (envelope-from giffunip@yahoo.com) Message-ID: <20030609161201.98500.qmail@web13408.mail.yahoo.com> Received: from [200.91.194.101] by web13408.mail.yahoo.com via HTTP; Mon, 09 Jun 2003 18:12:01 CEST Date: Mon, 9 Jun 2003 18:12:01 +0200 (CEST) From: "=?iso-8859-1?q?Pedro=20F.=20Giffuni?=" To: freebsd-ports@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-608544220-1055175121=:98407" Content-Transfer-Encoding: 8bit Subject: Experimental update to Octave port [patch] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2003 16:12:02 -0000 --0-608544220-1055175121=:98407 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Content-Id: Content-Disposition: inline Hi guys; I don't have much time for this port but, for those of you interested, I updated it and made it use ATLAS (faster) and our LAPACK. I also fixed a protlint warning in the process. I think we should also add a dependency to HDF5 but as I said I don't really have time for that :(. Enjoy, Pedro. ______________________________________________________________________ Yahoo! Mail: 6MB di spazio gratuito, 30MB per i tuoi allegati, l'antivirus, il filtro Anti-spam http://it.yahoo.com/mail_it/foot/?http://it.mail.yahoo.com/ --0-608544220-1055175121=:98407 Content-Type: text/plain; name=patch-octave Content-Description: patch-octave Content-Disposition: inline; filename=patch-octave diff -ruN octave.orig/Makefile octave/Makefile --- octave.orig/Makefile Sun Jun 8 22:55:03 2003 +++ octave/Makefile Mon Jun 9 09:05:24 2003 @@ -6,7 +6,7 @@ # PORTNAME= octave -PORTVERSION= 2.1.39 +PORTVERSION= 2.1.49 CATEGORIES= math MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ @@ -14,10 +14,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= High-level interactive language for numerical computations -USE_BZIP2= yes BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw +LIB_DEPENDS= f77blas.1:${PORTSDIR}/math/blas \ + fftw.2:${PORTSDIR}/math/fftw \ + lapack.1:${PORTSDIR}/math/lapack + +USE_BZIP2= yes .include @@ -29,9 +32,12 @@ OCTAVE_VERSION= ${PORTVERSION} PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} +BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -latlas" USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-shared --with-fftw --host=${GNU_HOST} +CONFIGURE_ARGS= --with-blas=${BLAS_LIBS} \ + --with-lpack --with-fftw \ + --host=${GNU_HOST} .if ${OSVERSION} < 400004 CONFIGURE_ARGS+= --with-f2c diff -ruN octave.orig/distinfo octave/distinfo --- octave.orig/distinfo Sun Jun 8 22:55:03 2003 +++ octave/distinfo Sun Jun 8 23:05:14 2003 @@ -1 +1 @@ -MD5 (octave-2.1.39.tar.bz2) = ab7f7e4d1a0d1032d260eb85ca4c571e +MD5 (octave-2.1.49.tar.bz2) = ee54e7cdbec75e8596231ff013cd829e diff -ruN octave.orig/files/patch-af octave/files/patch-af --- octave.orig/files/patch-af Sun Jun 8 22:55:03 2003 +++ octave/files/patch-af Wed Dec 31 19:00:00 1969 @@ -1,20 +0,0 @@ ---- liboctave/lo-ieee.cc.orig Tue Dec 28 22:05:23 1999 -+++ liboctave/lo-ieee.cc Tue Dec 28 22:06:07 1999 -@@ -68,7 +68,7 @@ - #if defined (SCO) - double tmp = 1.0; - octave_Inf = 1.0 / (tmp - tmp); --#elif defined (__alpha__) && ! defined (linux) -+#elif defined (__alpha__) && ! defined (linux) && ! defined (__FreeBSD__) - extern unsigned int DINFINITY[2]; - octave_Inf = (*((double *) (DINFINITY))); - #elif defined (HAVE_INFINITY) -@@ -89,7 +89,7 @@ - - #if defined (HAVE_ISNAN) - --#if defined (__alpha__) && ! defined (linux) -+#if defined (__alpha__) && ! defined (linux) && ! defined (__FreeBSD__) - extern unsigned int DQNAN[2]; - octave_NaN = (*((double *) (DQNAN))); - #elif defined (HAVE_QUIET_NAN) --0-608544220-1055175121=:98407--