4 files changed, 21 insertions, 24 deletions

diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index a70c9163ebf6..473233e297be 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gsoap
-PORTVERSION=	2.8.29
+PORTVERSION=	2.8.30
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -29,10 +29,10 @@ GNUTLS_LDFLAGS=		-L${LOCALBASE}/lib
 OPENSSL_CONFIGURE_ENABLE=	ssl
 
 post-patch:
-	@${REINPLACE_CMD} -e 's| sys/timeb.h | |' \
+	@${REINPLACE_CMD} -e 's|sys/timeb.h | |' \
 	    -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \
 	    -e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \
-	    ${WRKSRC}/${CONFIGURE_SCRIPT}
+	    ${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|$$(libdir)|$$(libdir)data|' \
 	    ${WRKSRC}/Makefile.am
 
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index d37b32381429..ab8f24418595 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gsoap_2.8.29.zip) = a9dacc4f862892df6cf9119d1c5d627af3a864c17f17b6542c560e72070b1381
-SIZE (gsoap_2.8.29.zip) = 24006374
+SHA256 (gsoap_2.8.30.zip) = edd20799656471d330033d6d945e684f988b4e79e009fab6c258c83c07ce2b42
+SIZE (gsoap_2.8.30.zip) = 24060216
diff --git a/devel/gsoap/files/patch-gsoap_stdsoap2.c b/devel/gsoap/files/patch-gsoap_stdsoap2.c
index cd5d143803c2..71c6f62076b2 100644
--- a/devel/gsoap/files/patch-gsoap_stdsoap2.c
+++ b/devel/gsoap/files/patch-gsoap_stdsoap2.c
@@ -1,14 +1,12 @@
---- gsoap/stdsoap2.c.orig	2015-12-07 03:15:27 UTC
+--- gsoap/stdsoap2.c.orig	2016-04-03 01:33:31 UTC
 +++ gsoap/stdsoap2.c
-@@ -5194,6 +5194,11 @@ soap_bind(struct soap *soap, const char 
+@@ -5396,6 +5396,9 @@ soap_bind(struct soap *soap, const char 
    }
  #endif
  #ifdef TCP_FASTOPEN
-+
-+	#ifndef SOL_TCP
-+  	#define SOL_TCP IPPROTO_TCP
-+  	#endif
-+
-   if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, SOL_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int)))
-   { soap->errnum = soap_socket_errno(soap->master);
-     soap_set_receiver_error(soap, tcp_error(soap), "setsockopt TCP_FASTOPEN failed in soap_bind()", SOAP_TCP_ERROR);
++       #ifndef SOL_TCP
++       #define SOL_TCP IPPROTO_TCP
++       #endif
+   if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int)))
+   { /* silently ignore */
+     DBGLOG(TEST, SOAP_MESSAGE(fdebug, "setsockopt TCP_FASTOPEN failed in soap_bind()\n"));
diff --git a/devel/gsoap/files/patch-gsoap_stdsoap2.cpp b/devel/gsoap/files/patch-gsoap_stdsoap2.cpp
index 8d953b992391..c1b015bd5588 100644
--- a/devel/gsoap/files/patch-gsoap_stdsoap2.cpp
+++ b/devel/gsoap/files/patch-gsoap_stdsoap2.cpp
@@ -1,13 +1,12 @@
---- gsoap/stdsoap2.cpp.orig	2016-01-01 16:24:55 UTC
+--- gsoap/stdsoap2.cpp.orig	2016-04-03 01:33:31 UTC
 +++ gsoap/stdsoap2.cpp
-@@ -5194,6 +5194,10 @@ soap_bind(struct soap *soap, const char 
+@@ -5396,6 +5396,9 @@ soap_bind(struct soap *soap, const char 
    }
  #endif
  #ifdef TCP_FASTOPEN
-+  	#ifndef SOL_TCP
-+  	#define SOL_TCP IPPROTO_TCP
-+  	#endif
-+
-   if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, SOL_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int)))
-   { soap->errnum = soap_socket_errno(soap->master);
-     soap_set_receiver_error(soap, tcp_error(soap), "setsockopt TCP_FASTOPEN failed in soap_bind()", SOAP_TCP_ERROR);
++       #ifndef SOL_TCP
++       #define SOL_TCP IPPROTO_TCP
++       #endif
+   if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int)))
+   { /* silently ignore */
+     DBGLOG(TEST, SOAP_MESSAGE(fdebug, "setsockopt TCP_FASTOPEN failed in soap_bind()\n"));