[132214] trunk/dports/math/octave-linear-algebra

[michaelld at macports.org]

Revision: 132214
          https://trac.macports.org/changeset/132214
Author:   michaelld at macports.org
Date:     2015-01-26 09:26:12 -0800 (Mon, 26 Jan 2015)
Log Message:
-----------
octave-linear-algebra: update to  2.2.1, making sure to use MacPorts' 'mkoctfile'.

Modified Paths:
--------------
    trunk/dports/math/octave-linear-algebra/Portfile
    trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff

Modified: trunk/dports/math/octave-linear-algebra/Portfile
===================================================================
--- trunk/dports/math/octave-linear-algebra/Portfile	2015-01-26 16:23:04 UTC (rev 132213)
+++ trunk/dports/math/octave-linear-algebra/Portfile	2015-01-26 17:26:12 UTC (rev 132214)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        linear-algebra 2.2.0
+octave.setup        linear-algebra 2.2.1
 platforms           darwin
 license             GPL-3+ LGPL-3+ FreeBSD
 maintainers         nomaintainer
@@ -12,9 +12,11 @@
                     general SVD and matrix functions.
 long_description    ${description}
 
-checksums           rmd160 19f098c03ceace1e92cfc1cd3aceb56b4d684f46 \
-                    sha256 a62c88a0591d325fd9e80b05a18565aa4fa923f2aad709a92d9519adb4731a20
+checksums           rmd160 57ae599284f7c2574dbe792905d316c655dcd426 \
+                    sha256 ccebaf6e63f25e2257ff4c0aac1591f095d9074997b6c5d5cb2ed5fa4468ee8a
 
 depends_lib-append  port:octave-general
 
 patchfiles-append   patch-src_Makefile.diff
+
+configure.env-append "PREFIX_BIN=${prefix}/bin"

Modified: trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff	2015-01-26 16:23:04 UTC (rev 132213)
+++ trunk/dports/math/octave-linear-algebra/files/patch-src_Makefile.diff	2015-01-26 17:26:12 UTC (rev 132214)
@@ -1,14 +1,16 @@
---- src/Makefile.orig	2013-11-25 20:40:57.000000000 -0500
-+++ src/Makefile	2013-11-25 20:40:46.000000000 -0500
-@@ -5,6 +5,7 @@
- endif
+--- src/Makefile.orig	2015-01-26 12:18:46.000000000 -0500
++++ src/Makefile	2015-01-26 12:21:27.000000000 -0500
+@@ -1,8 +1,6 @@
+ sinclude Makeconf
  
- LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-+BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
+-ifndef OCTAVE_FORGE
+-MKOCTFILE = mkoctfile
+-endif
++MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
  
- DEFINES = -DHAVE_CONFIG_H -Wall
- GSVD_OBJECTS = gsvd.o dbleGSVD.o CmplxGSVD.o 
-@@ -25,7 +26,7 @@
+ ifndef LAPACK_LIBS
+ LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+@@ -32,7 +30,7 @@
  all : $(TARGETS) pgmres.oct
  
  $(GSVD_TARGET) : $(GSVD_DEPENDS) $(GSVD_OBJECTS)
@@ -17,12 +19,12 @@
  
  $(GSVD_TEST) : $(GSVD_TARGET)
  
-@@ -46,7 +47,7 @@
+@@ -53,7 +51,7 @@
  	$(MKOCTFILE) $(DEFINES) $< -o $@
  
  %.oct: %.cc
 -	mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS}
-+	mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS} ${BLAS_LIBS}
++	$(MKOCTFILE) $(DEFINES) $< -o $@ ${LAPACK_LIBS} ${BLAS_LIBS}
  
  .phony: test
  test: $(GSVD_TEST)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150126/9e208345/attachment.html>