4 files changed, 18 insertions, 40 deletions

diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index c2225b370f55..d93f14944c95 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gsoap
-PORTVERSION=	2.7.8c
-PORTREVISION=	3
+PORTVERSION=	2.7.9a
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gsoap2
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index 9c1eefaf4d4e..536836ef6a39 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gsoap_2.7.8c.tar.gz) = e49016cc01199c47ba899cf52b961346
-SHA256 (gsoap_2.7.8c.tar.gz) = 6009f38ef3657c8859299a0d55f52f902d141ee6d6646505146161c86eefed07
-SIZE (gsoap_2.7.8c.tar.gz) = 6296385
+MD5 (gsoap_2.7.9a.tar.gz) = 125d920ccf2ff2290ecc786de4c2ee75
+SHA256 (gsoap_2.7.9a.tar.gz) = c466b3023271d7e994749706967ce8b919dc36a86e2c4a5bb2399b4e77387b9b
+SIZE (gsoap_2.7.9a.tar.gz) = 3964889
diff --git a/devel/gsoap/files/patch-soapcpp2-stdsoap2.c b/devel/gsoap/files/patch-soapcpp2-stdsoap2.c
index 1eb09229ddbe..a9eac4382496 100644
--- a/devel/gsoap/files/patch-soapcpp2-stdsoap2.c
+++ b/devel/gsoap/files/patch-soapcpp2-stdsoap2.c
@@ -1,20 +1,14 @@
---- soapcpp2/stdsoap2.c.orig	Mon Jun 26 21:36:38 2006
-+++ soapcpp2/stdsoap2.c	Fri Sep 29 14:22:51 2006
-@@ -3282,7 +3282,7 @@
+--- soapcpp2/stdsoap2.c.orig	Tue Dec 19 11:28:08 2006
++++ soapcpp2/stdsoap2.c	Tue Dec 19 11:36:34 2006
+@@ -3335,7 +3335,11 @@
      soap->errnum = h_errno;
    }
  #elif defined(HAVE_GETHOSTBYNAME_R)
--  host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
++#if defined(__FreeBSD__)
 +  gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum);
++#else
+   host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
++#endif
  #elif defined(VXWORKS)
    /* If the DNS resolver library resolvLib has been configured in the vxWorks
     * image, a query for the host IP address is sent to the DNS server, if the
-@@ -7616,7 +7616,7 @@
-         break;
-     }
-     if (!tp)
--    { tp = (struct soap_attribute*)SOAP_MALLOC(soap, sizeof(struct soap_attribute) + strlen(soap->tmpbuf));
-+    { tp = (struct soap_attribute*)SOAP_MALLOC(soap, sizeof(struct soap_attribute) + strlen(soap->tmpbuf) + 1);
-       if (!tp)
-         return soap->error = SOAP_EOM;
-       strcpy(tp->name, soap->tmpbuf);
diff --git a/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp b/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp
index d1e18682bb1e..63761a5624e1 100644
--- a/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp
+++ b/devel/gsoap/files/patch-soapcpp2-stdsoap2.cpp
@@ -1,29 +1,14 @@
---- soapcpp2/stdsoap2.c.orig	Mon Jun 26 21:36:38 2006
-+++ soapcpp2/stdsoap2.cpp	Fri Sep 29 14:22:34 2006
-@@ -3282,7 +3282,7 @@
+--- soapcpp2/stdsoap2.cpp.orig	Tue Dec 19 11:28:05 2006
++++ soapcpp2/stdsoap2.cpp	Tue Dec 19 11:37:15 2006
+@@ -3335,7 +3335,11 @@
      soap->errnum = h_errno;
    }
  #elif defined(HAVE_GETHOSTBYNAME_R)
--  host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
++#if defined(__FreeBSD__)
 +  gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum);
++#else
+   host = gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &soap->errnum);
++#endif
  #elif defined(VXWORKS)
    /* If the DNS resolver library resolvLib has been configured in the vxWorks
     * image, a query for the host IP address is sent to the DNS server, if the
-@@ -3755,7 +3755,7 @@
-             X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
-             if (!meth)
-               break;
--            val = meth->i2v(meth, meth->d2i(NULL, (unsigned char**)&ext->value->data, ext->value->length), NULL);
-+            val = meth->i2v(meth, meth->d2i(NULL, (%%CONST%% unsigned char**)&ext->value->data, ext->value->length), NULL);
-             for (j = 0; j < sk_CONF_VALUE_num(val); j++)
-             { CONF_VALUE *nval = sk_CONF_VALUE_value(val, j);
-               if (nval && !strcmp(nval->name, "DNS") && !strcmp(nval->value, host))
-@@ -7616,7 +7616,7 @@
-         break;
-     }
-     if (!tp)
--    { tp = (struct soap_attribute*)SOAP_MALLOC(soap, sizeof(struct soap_attribute) + strlen(soap->tmpbuf));
-+    { tp = (struct soap_attribute*)SOAP_MALLOC(soap, sizeof(struct soap_attribute) + strlen(soap->tmpbuf) + 1);
-       if (!tp)
-         return soap->error = SOAP_EOM;
-       strcpy(tp->name, soap->tmpbuf);