- Update to 3.0.0.

8 files changed, 30 insertions, 55 deletions

diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index fdd639d102db..a73e26396696 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	octave-forge-parallel
-PORTVERSION=	2.2.1
+PORTVERSION=	3.0.0
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
@@ -17,8 +17,6 @@ OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	HOME=${WRKSRC}
-MAKE_JOBS_UNSAFE=	yes
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
diff --git a/math/octave-forge-parallel/distinfo b/math/octave-forge-parallel/distinfo
index 300c06def9aa..2c1c6703e2bf 100644
--- a/math/octave-forge-parallel/distinfo
+++ b/math/octave-forge-parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (octave-forge/parallel-2.2.1.tar.gz) = 1faf36a7c1750c364ec8089c78cdecbcdbf47c40410c2463e8f3e44dc4d92f33
-SIZE (octave-forge/parallel-2.2.1.tar.gz) = 85110
+SHA256 (octave-forge/parallel-3.0.0.tar.gz) = 7ba3105da8e0fab71554bfd50a0b34832d5f12aca3760f7395115083499cb7e1
+SIZE (octave-forge/parallel-3.0.0.tar.gz) = 113702
diff --git a/math/octave-forge-parallel/files/patch-configure b/math/octave-forge-parallel/files/patch-configure
deleted file mode 100644
index 250603edd594..000000000000
--- a/math/octave-forge-parallel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure-orig	2012-03-30 23:58:04.000000000 +0000
-+++ configure	2012-03-30 23:58:24.000000000 +0000
-@@ -4208,7 +4208,7 @@
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--$as_echo "#define OCTAVE_LE_3_2_4 1" >>confdefs.h
-+$as_echo "#undef OCTAVE_LE_3_2_4" >>confdefs.h
- 
- fi
- 
diff --git a/math/octave-forge-parallel/files/patch-connect.cc b/math/octave-forge-parallel/files/patch-connect.cc
deleted file mode 100644
index f315a1180a6b..000000000000
--- a/math/octave-forge-parallel/files/patch-connect.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- connect.cc.orig	2013-11-16 22:26:59.000000000 +0100
-+++ connect.cc	2013-11-16 22:27:54.000000000 +0100
-@@ -25,7 +25,9 @@
- #include <octave/oct.h>
- #include <oct-env.h>
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <netdb.h>
- #include <netinet/in.h> // reported necessary for FreeBSD-8
diff --git a/math/octave-forge-parallel/files/patch-parallel-gnutls.h b/math/octave-forge-parallel/files/patch-parallel-gnutls.h
new file mode 100644
index 000000000000..a9981f2f8e28
--- /dev/null
+++ b/math/octave-forge-parallel/files/patch-parallel-gnutls.h
@@ -0,0 +1,11 @@
+--- parallel-gnutls.h.orig	2015-07-12 11:10:04 UTC
++++ parallel-gnutls.h
+@@ -41,7 +41,7 @@ along with this program; If not, see <ht
+ 
+ #include <stdio.h>
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ /*
+ not necessary with current Octave
diff --git a/math/octave-forge-parallel/files/patch-pserver.cc b/math/octave-forge-parallel/files/patch-pserver.cc
index 6edcb666cc0f..5bd612a60d48 100644
--- a/math/octave-forge-parallel/files/patch-pserver.cc
+++ b/math/octave-forge-parallel/files/patch-pserver.cc
@@ -1,19 +1,19 @@
---- pserver.cc.orig	2013-11-16 22:30:37.000000000 +0100
-+++ pserver.cc	2013-11-16 22:31:47.000000000 +0100
-@@ -27,6 +27,7 @@
+--- pserver.cc.orig	2015-07-12 11:10:04 UTC
++++ pserver.cc
+@@ -32,6 +32,7 @@ along with this program; If not, see <ht
  #include <cmd-edit.h>
  #include <toplev.h>
  
 +#include <sys/types.h>
  #include <sys/socket.h>
- #include <iostream>
- #include <sys/stat.h>
-@@ -34,6 +35,8 @@
- #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -42,6 +43,8 @@ along with this program; If not, see <ht
  #include <netdb.h>
+ #include <sys/utsname.h>
  #include <netinet/in.h> // reported necessary for FreeBSD-8
 +#include <unistd.h>
 +#include <stdlib.h>
  
- #include "sock-stream.h"
- 
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/math/octave-forge-parallel/files/patch-send.cc b/math/octave-forge-parallel/files/patch-send.cc
index b4d97e3a850b..0bffe80263bc 100644
--- a/math/octave-forge-parallel/files/patch-send.cc
+++ b/math/octave-forge-parallel/files/patch-send.cc
@@ -1,8 +1,8 @@
---- send.cc.orig	2013-11-16 22:35:29.000000000 +0100
-+++ send.cc	2013-11-16 22:35:56.000000000 +0100
-@@ -21,10 +21,12 @@
- #include <octave/ls-oct-binary.h>
- #include <octave/oct-stream.h>
+--- send.cc.orig	2015-07-12 11:10:04 UTC
++++ send.cc
+@@ -25,10 +25,12 @@
+ 
+ #include "parallel-gnutls.h"
  
 +#include <sys/types.h>
  #include <sys/socket.h>
@@ -11,5 +11,5 @@
  #include <netdb.h>
 +#include <unistd.h>
  
- 
- DEFUN_DLD (send, args, , "send (X, sockets)\n\
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/math/octave-forge-parallel/files/patch-sock-stream.h b/math/octave-forge-parallel/files/patch-sock-stream.h
deleted file mode 100644
index cdf782840c08..000000000000
--- a/math/octave-forge-parallel/files/patch-sock-stream.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- sock-stream.h-orig	2010-08-25 20:47:40.000000000 -0500
-+++ sock-stream.h	2010-08-25 20:48:19.000000000 -0500
-@@ -25,6 +25,8 @@
- 
- int socket_to_oct_iostream (int sd);
- 
-+#include <netinet/in.h>
-+
- #endif
- 
- /*