Description: Allow compilation with Octave 4.0
Author: Rafael Laboissiere <rafael@labosisiere.net>
Origin: https://savannah.gnu.org/bugs/?44803
Forwarded: not-needed
Last-Update: 2015-05-02

--- octave-secs2d-0.0.8.orig/src/Makefile
+++ octave-secs2d-0.0.8/src/Makefile
@@ -3,19 +3,21 @@ ccfiles  := $(wildcard *.cc)
 octfiles := $(patsubst %.cc, %.oct, $(ccfiles) )
 objfiles := $(patsubst %.cc, %.o,   $(ccfiles) )
 
+MKOCTFILE ?= mkoctfile
+
 all: $(octfiles)
 
 $(objectfile): Makefile
 
 %.o: %.cc
-	mkoctfile -c $(patsubst %.o, %.cc, $@ ) -o $@
+	$(MKOCTFILE) -c $(patsubst %.o, %.cc, $@ ) -o $@
 
 Uscharfettergummel.oct: Uscharfettergummel.o Ubern.o
-	mkoctfile -s $< Ubern.o -o $@
+	$(MKOCTFILE) -s $< Ubern.o -o $@
 	$(RM) Uscharfettergummel.o
 
 %.oct:  %.o  
-	mkoctfile -s $< -o $@
+	$(MKOCTFILE) -s $< -o $@
 	#strip -x $@
 
 clean:
--- octave-secs2d-0.0.8.orig/src/Ucompconst.cc
+++ octave-secs2d-0.0.8/src/Ucompconst.cc
@@ -34,7 +34,7 @@
 ////////////////////////////////////////////
 
 
-int Ucompconst(const Octave_map &mesh, 
+int Ucompconst(const octave_map &mesh, 
                        const ColumnVector &acoeff,
                        const ColumnVector &bcoeff,
                        ColumnVector &SG )
@@ -99,7 +99,7 @@ octave_value_list retval;
 
 ColumnVector acoeff=ColumnVector(args(1).vector_value());
 ColumnVector bcoeff=ColumnVector(args(2).vector_value());
-Octave_map mesh = args(0).map_value();
+octave_map mesh = args(0).map_value();
 
 ColumnVector SG;
                 
--- octave-secs2d-0.0.8.orig/src/Ucomplap.cc
+++ octave-secs2d-0.0.8/src/Ucomplap.cc
@@ -34,7 +34,7 @@
 ////////////////////////////////////////////
 
 
-int Ucomplap(const Octave_map &mesh, 
+int Ucomplap(const octave_map &mesh, 
                        const ColumnVector &acoeff, 
                        SparseMatrix &SG )
 {
@@ -125,7 +125,7 @@ octave_value_list retval;
 ColumnVector acoeff=ColumnVector(args(1).vector_value());
 
 
-Octave_map mesh = args(0).map_value();
+octave_map mesh = args(0).map_value();
 
 SparseMatrix SG;
                 
--- octave-secs2d-0.0.8.orig/src/Uscharfettergummel.cc
+++ octave-secs2d-0.0.8/src/Uscharfettergummel.cc
@@ -36,7 +36,7 @@
 
 
 
-int Uscharfettergummel(const Octave_map &mesh, 
+int Uscharfettergummel(const octave_map &mesh, 
                        const ColumnVector &v, 
                        const ColumnVector &acoeff, 
                        SparseMatrix &SG )
@@ -173,7 +173,7 @@ and u is the unknown\n \
     acoeff=ColumnVector(args(2).vector_value());
 
 
-  Octave_map mesh = args(0).map_value();
+  octave_map mesh = args(0).map_value();
 
   SparseMatrix SG;