Attachment 36566 Details for Bug 58555 – file.diff

[patch] file.diff

file.diff (text/plain), 1.90 KB, created by shuhei on 2003-10-26 08:30:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shuhei

Created: 2003-10-26 08:30:20 UTC

Size: 1.90 KB

patch

obsolete

>diff -uNr /usr/ports/math/octave/Makefile octave/Makefile
>--- /usr/ports/math/octave/Makefile	Sat Aug  2 10:58:38 2003
>+++ octave/Makefile	Sat Oct 25 14:15:04 2003
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	octave
> PORTVERSION=	2.1.50
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math
> MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
> 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
>@@ -18,8 +18,7 @@
> BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
> RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
> LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
>-		f77blas.1:${PORTSDIR}/math/atlas \
>-		lapack.3:${PORTSDIR}/math/lapack
>+		f77blas.1:${PORTSDIR}/math/atlas
> 
> USE_BZIP2=	yes
> 
>@@ -33,17 +32,18 @@
> OCTAVE_VERSION=	${PORTVERSION}
> PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
> 
>-BLAS_LIBS=	"-L${LOCALBASE}/lib -lf77blas -latlas"
>+BLAS_LIBS=	"-L${LOCALBASE}/lib -lf77blas -lcblas -latlas"
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_REINPLACE=	yes
> 
> CONFIGURE_ARGS=	--host=${GNU_HOST} \
>-		--with-fftw --with-blas=${BLAS_LIBS} --with-lpack \
>+		--with-fftw --with-blas=${BLAS_LIBS} --with-lapack=-lalapack \
> 		--enable-shared
> CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
> 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
>-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
>+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
>+		FFLAGS="${FFLAGS}"
> 
> .if ${OSVERSION} < 400004
> CONFIGURE_ARGS+=	--with-f2c
>diff -uNr /usr/ports/math/octave/files/patch-mkoctfile.in octave/files/patch-mkoctfile.in
>--- /usr/ports/math/octave/files/patch-mkoctfile.in	Thu Jan  1 01:00:00 1970
>+++ octave/files/patch-mkoctfile.in	Wed Oct 22 10:04:38 2003
>@@ -0,0 +1,11 @@
>+--- mkoctfile.in.orig	Thu Jan  2 22:55:47 2003
>++++ mkoctfile.in	Wed Oct 22 10:04:01 2003
>+@@ -182,7 +182,7 @@
>+     -D*)
>+       defs="$defs $1"
>+     ;;
>+-    -[lL]*)
>++    -[lL]* | -pthread)
>+       ldflags="$ldflags $1"
>+     ;;
>+     -M | --depend)

Actions: View | Diff

Attachments on bug 58555: 36566