6 files changed, 11 insertions, 150 deletions

diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index 351fcc637b7b..99ef6dcccfeb 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -6,16 +6,22 @@
 #
 
 PORTNAME=	octave-forge-communications
-PORTVERSION=	1.0.10
-PORTREVISION=	5
+PORTVERSION=	1.1.0
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${OCTAVE_PKGNAME}/src
+MAKE_ENV+=	MKOCTFILE=mkoctfile
+
 RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal
+RUN_DEPENDS+=	${TARBALLS_DIR}/image.tar.gz:${PORTSDIR}/math/octave-forge-image
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.octave.mk"
+post-build:
+	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME}
+
 .include <bsd.port.post.mk>
diff --git a/math/octave-forge-communications/distinfo b/math/octave-forge-communications/distinfo
index 4e301d9c8709..60a817078094 100644
--- a/math/octave-forge-communications/distinfo
+++ b/math/octave-forge-communications/distinfo
@@ -1,2 +1,2 @@
-SHA256 (octave-forge/communications-1.0.10.tar.gz) = f8f85662fbf90968e164165a8a4613bbfc845b124e555b8acbb57ab0ed5b5138
-SIZE (octave-forge/communications-1.0.10.tar.gz) = 850130
+SHA256 (octave-forge/communications-1.1.0.tar.gz) = af6bacc2c2ce2958ea2aedf05370a06f78dc1100443d75fb35dc292c6213584e
+SIZE (octave-forge/communications-1.1.0.tar.gz) = 473780
diff --git a/math/octave-forge-communications/files/patch-galois.cc b/math/octave-forge-communications/files/patch-galois.cc
deleted file mode 100644
index d8facb18373b..000000000000
--- a/math/octave-forge-communications/files/patch-galois.cc
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/galois.cc-orig	2011-07-22 23:34:28.000000000 +0000
-+++ src/galois.cc	2011-07-22 23:40:32.000000000 +0000
-@@ -89,7 +89,7 @@
-   field = stored_galois_fields.create_galois_field(_m, _primpoly);
- }
- 
--galois::galois (int nr, int nc, const int& val, const int& _m, const int& _primpoly) : MArray2<int> (nr, nc, val), field (NULL) {
-+galois::galois (int nr, int nc, const int& val, const int& _m, const int& _primpoly) : MArray<int> (dim_vector(nr, nc), val), field (NULL) {
-   int _n = (1<<_m) - 1;
- 
-   // Check the validity of the data in the matrix
-@@ -101,7 +101,7 @@
-   field = stored_galois_fields.create_galois_field(_m, _primpoly);
- }
- 
--galois::galois (int nr, int nc, double val, const int& _m, const int& _primpoly) : MArray2<int> (nr, nc, (int)val), field (NULL) {
-+galois::galois (int nr, int nc, double val, const int& _m, const int& _primpoly) : MArray<int> (dim_vector(nr, nc), (int)val), field (NULL) {
-   int _n = (1<<_m) - 1;
- 
-   // Check the validity of the data in the matrix
-@@ -711,13 +711,13 @@
- boolMatrix
- galois::all (int dim) const
- {
--  return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_all);
-+  return do_mx_red_op<bool> (*this, dim, mx_inline_all);
- }
- 
- boolMatrix
- galois::any (int dim) const
- {
--  return do_mx_red_op<boolMatrix> (*this, dim, mx_inline_any);
-+  return do_mx_red_op<bool> (*this, dim, mx_inline_any);
- }
- 
- galois
diff --git a/math/octave-forge-communications/files/patch-gf.cc b/math/octave-forge-communications/files/patch-gf.cc
deleted file mode 100644
index 8a2c47213ecb..000000000000
--- a/math/octave-forge-communications/files/patch-gf.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gf.cc-orig	2011-07-22 23:41:54.000000000 +0000
-+++ src/gf.cc	2011-07-22 23:42:13.000000000 +0000
-@@ -49,6 +49,7 @@
- #include "ov-galois.h"
- #include <octave/utils.h>
- #include <octave/variables.h>
-+#include <octave/Array2.h>
- 
- static bool galois_type_loaded = false;
- 
diff --git a/math/octave-forge-communications/files/patch-ov-galois.cc b/math/octave-forge-communications/files/patch-ov-galois.cc
deleted file mode 100644
index fe4e4112b3b4..000000000000
--- a/math/octave-forge-communications/files/patch-ov-galois.cc
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/ov-galois.cc-orig	2011-07-22 23:43:09.000000000 +0000
-+++ src/ov-galois.cc	2011-07-22 23:52:23.000000000 +0000
-@@ -205,10 +205,6 @@
- void
- octave_galois::print_raw (std::ostream& os, bool) const
- {
--  unwind_protect::begin_frame ("octave_galois_print");
--
--  unwind_protect_int (Vstruct_levels_to_print);
--
-   bool first = true;
-   int m = gval.m();
-   int primpoly = gval.primpoly();
-@@ -256,8 +252,6 @@
- 
-   octave_print_internal (os, data, false, current_print_indent_level ());
-   newline (os);
--
--  unwind_protect::run_frame ("octave_galois_print");
- }
- 
- bool
-@@ -554,7 +548,7 @@
- {
-   Matrix mval = matrix_value ();
-   hid_t group_hid = -1;
--  group_hid = H5Gcreate (loc_id, name, 0);
-+  group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-   if (group_hid < 0 ) return false;
- 
-   dim_vector d = dims ();
-@@ -572,7 +566,7 @@
-     }
- 
-   data_hid = H5Dcreate (group_hid, "m", H5T_NATIVE_UCHAR, space_hid, 
--			H5P_DEFAULT);
-+			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-   if (data_hid < 0) 
-     {
-       H5Sclose (space_hid);
-@@ -592,7 +586,7 @@
-     }    
- 
-   data_hid = H5Dcreate (group_hid, "prim", H5T_NATIVE_UINT, space_hid, 
--			H5P_DEFAULT);
-+			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-   if (data_hid < 0) 
-     {
-       H5Sclose (space_hid);
-@@ -644,7 +638,7 @@
-     }
- 
-   data_hid = H5Dcreate (group_hid, "val", save_type_hid, space_hid, 
--			H5P_DEFAULT);
-+			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-   if (data_hid < 0)
-     {
-       H5Sclose (space_hid);
-@@ -671,10 +665,10 @@
-   hid_t group_hid, data_hid, space_id;
-   hsize_t rank;
- 
--  group_hid = H5Gopen (loc_id, name);
-+  group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
-   if (group_hid < 0 ) return false;
- 
--  data_hid = H5Dopen (group_hid, "m");
-+  data_hid = H5Dopen (group_hid, "m", H5P_DEFAULT);
-   space_id = H5Dget_space (data_hid);
-   rank = H5Sget_simple_extent_ndims (space_id);
- 
-@@ -694,7 +688,7 @@
-     }
- 
-   H5Dclose (data_hid);
--  data_hid = H5Dopen (group_hid, "prim");
-+  data_hid = H5Dopen (group_hid, "prim", H5P_DEFAULT);
-   space_id = H5Dget_space (data_hid);
-   rank = H5Sget_simple_extent_ndims (space_id);
- 
-@@ -714,7 +708,7 @@
-     }
- 
-   H5Dclose (data_hid);
--  data_hid = H5Dopen (group_hid, "val");
-+  data_hid = H5Dopen (group_hid, "val", H5P_DEFAULT);
-   space_id = H5Dget_space (data_hid);
-   rank = H5Sget_simple_extent_ndims (space_id);
- 
diff --git a/math/octave-forge-communications/files/patch-syndtable.cc b/math/octave-forge-communications/files/patch-syndtable.cc
deleted file mode 100644
index df8b32d9c225..000000000000
--- a/math/octave-forge-communications/files/patch-syndtable.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/syndtable.cc-orig	2011-07-22 23:25:35.000000000 +0000
-+++ src/syndtable.cc	2011-07-22 23:26:01.000000000 +0000
-@@ -27,6 +27,7 @@
- #include <sstream>
- #include <octave/oct.h>
- #include <octave/pager.h>
-+#include <octave/Array2.h>
- 
- #define COL_MAJ(N) (N / (SIZEOF_INT << 3))
- #define COL_MIN(N) (N % (SIZEOF_INT << 3))