Changeset 140284 for trunk/dports/math


Ignore:
Timestamp:
Sep 16, 2015, 3:03:55 PM (4 years ago)
Author:
michaelld@…
Message:

octave-tsa: update to 4.3.2.

Location:
trunk/dports/math/octave-tsa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-tsa/Portfile

    r133313 r140284  
    55PortGroup           octave 1.0
    66
    7 octave.setup        tsa 4.2.9
     7octave.setup        tsa 4.3.2
    88platforms           darwin
    99license             GPL-3+
     
    1313long_description    ${description}
    1414
    15 checksums           rmd160  b9293345970b866887a406113ff2e9b8708e3588 \
    16                     sha256  922f99ad49dc60a0888f5707f10aff1f43e52b47b6b444c90a3eb936cb1c4409
     15checksums           rmd160 221568bba94f96dcdbea66c32666899617a41393 \
     16                    sha256 a8a2eedb9f1880a5c847442e33893996e2cf2face529be89463de2ff2c9ae930
    1717
    1818patchfiles          patch-src_Makefile.diff
  • trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff

    r133313 r140284  
    11--- src/Makefile.orig   2015-01-25 17:26:10.000000000 -0500
    22+++ src/Makefile        2015-01-25 17:30:51.000000000 -0500
    3 @@ -4,125 +4,21 @@
     3@@ -4,123 +4,22 @@
    44 # http://pub.ist.ac.at/~schloegl/matlab/tsa/
    55 ####################################################
     
    4040-W64_LIBS += $(LDLIBS_W64)libblas.a
    4141-
    42 -CC     = gcc
    43 -CXX    = g++
    44 -CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
    45 -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
    46 +CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
     42-CC     ?= gcc
     43-CXX    ?= g++
     44 CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
     45-OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
    4746+MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
    4847+OCTMEX = $(MKOCTFILE) --mex
     
    5857-
    5958-PROGS = covm_mex.mex sumskipnan_mex.mex #
    60 +PROGS = covm_mex.mex sumskipnan_mex.mex
    61  
    62  ### per default only the mex-files for octave are built
     59-
     60-### per default only the mex-files for octave are built
    6361-mex4o octave: $(PROGS)
    6462-
    6563-
    6664-### Matlab configuration - search for a matlab directory if not defined above
    67 -ifndef MATLABDIR
     65-ifeq (,$(MATLABDIR))
    6866-  ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
    6967-    # use oldest, typically mex-files a compatible with newer Matlab versions
    70 -    MATLABDIR=/usr/local/MATLAB/$(shell ls -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
    71 -    # alternatively, use latest matlab version
    72 -    #MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |head -1)
     68-    MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R*" |head -1)
    7369-  endif
    7470-endif
    7571-
    76 -### if the MATLABDIR has been found or defined
    77 -ifneq (,MATLABDIR)
     72-### if MATLABDIR has been found or defined
     73-ifneq (,$(MATLABDIR))
    7874-  ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
    7975-    MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
     
    8682-mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    8783-all:    octave win32 win64 mex4m
    88 -
    89 -clean:
    90 -       -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
     84+PROGS = covm_mex.mex sumskipnan_mex.mex
     85+
    9186+octave: $(PROGS)
    92  
     87+
    9388+all:    octave
    9489 
     90 clean:
     91        -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
     92 
     93-
    9594 #########################################################
    9695-
     
    9998-%.oct: %.cc
    10099-       mkoctfile$(OCTAVE_VERSION) "$<"
    101  
     100-
    102101 %.mex: %.cpp
    103102        $(OCTMEX) "$<" -llapack -lblas
Note: See TracChangeset for help on using the changeset viewer.