From freebsd@grem.de  Fri Sep 14 02:21:01 2012
Return-Path: <freebsd@grem.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54EAE1065672
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Sep 2012 02:21:01 +0000 (UTC)
	(envelope-from freebsd@grem.de)
Received: from mail.grem.de (outcast.grem.de [213.239.217.27])
	by mx1.freebsd.org (Postfix) with SMTP id 8A33E8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Sep 2012 02:20:59 +0000 (UTC)
Received: (qmail 26703 invoked by uid 0); 14 Sep 2012 02:20:58 -0000
Message-Id: <20120914022058.26702.qmail@mail.grem.de>
Date: 14 Sep 2012 02:20:58 -0000
From: Michael Gmelin <freebsd@grem.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sem@FreeBSD.org
Subject: [PATCH] devel/gsoap: update to 2.8.10
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171629
>Category:       ports
>Synopsis:       [PATCH] devel/gsoap: update to 2.8.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 14 02:30:07 UTC 2012
>Closed-Date:    Mon Sep 17 14:39:23 UTC 2012
>Last-Modified:  Mon Sep 17 14:40:11 UTC 2012
>Originator:     Michael Gmelin
>Release:        FreeBSD 9.1-RC1 amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD srv05 9.1-RC1 FreeBSD 9.1-RC1 #1 r240177: Fri Sep  7 14:37:21 UTC 2012
>Description:
- Update to 2.8.10

This also includes a few trivial patches to allow building gsoap cleanly
using Clang and C++11 (CXX=clang++ CXXFLAGS=-std=c++11 -stdlib=libc++).

See also:
http://sourceforge.net/tracker/?func=detail&aid=3567530&group_id=52781&atid=468021

Added file(s):
- files/patch-gsoap-stdsoap2.c
- files/patch-gsoap-stdsoap2.cpp
- files/patch-gsoap-wsdl-service.cpp
- files/patch-gsoap-wsdl-types.cpp
- files/patch-gsoap-wsdl-wsdl2h.cpp

Port maintainer (sem@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- gsoap-2.8.10.patch begins here ---
diff -ruN --exclude=CVS ../gsoap.orig/Makefile ./Makefile
--- ../gsoap.orig/Makefile	2012-05-03 20:55:48.000000000 +0200
+++ ./Makefile	2012-09-14 02:03:13.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gsoap
-PORTVERSION=	2.8.8
+PORTVERSION=	2.8.10
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP 
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff -ruN --exclude=CVS ../gsoap.orig/distinfo ./distinfo
--- ../gsoap.orig/distinfo	2012-05-03 20:55:48.000000000 +0200
+++ ./distinfo	2012-09-14 02:04:26.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (gsoap_2.8.8.zip) = 8b1ad1cbd521bd5f85ff4c038bfd5a17a2530610c1ce8bf7318725bc568465cc
-SIZE (gsoap_2.8.8.zip) = 13782549
+SHA256 (gsoap_2.8.10.zip) = fddfd59ba9b0236daa59d1ced9149cb827d446e0a24b85395ed23c10858cabfb
+SIZE (gsoap_2.8.10.zip) = 19156778
diff -ruN --exclude=CVS ../gsoap.orig/files/patch-gsoap-stdsoap2.c ./files/patch-gsoap-stdsoap2.c
--- ../gsoap.orig/files/patch-gsoap-stdsoap2.c	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-gsoap-stdsoap2.c	2012-09-14 02:55:35.000000000 +0200
@@ -0,0 +1,39 @@
+--- gsoap/stdsoap2.c.orig
++++ gsoap/stdsoap2.c
+@@ -809,7 +809,7 @@ soap_flush_raw(struct soap *soap, const char *s, size_t n)
+ #ifndef WITH_LEANER
+   if ((soap->mode & SOAP_IO) == SOAP_IO_CHUNK)
+   { char t[16];
+-    sprintf(t, "\r\n%lX\r\n" + (soap->chunksize ? 0 : 2), (unsigned long)n);
++    sprintf(t, &"\r\n%lX\r\n"[soap->chunksize ? 0 : 2], (unsigned long)n);
+     DBGMSG(SENT, t, strlen(t));
+     if ((soap->error = soap->fsend(soap, t, strlen(t))))
+       return soap->error;
+@@ -9534,7 +9534,8 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
+     }
+     for (np = soap->nlist; np; np = np->next)
+     { if (np->index == 1 && np->ns)
+-      { sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns", np->id);
++      {
++        sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns%s", *(np->id) ? np->id : "");
+         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Enabling utilized binding (level=%u) %s='%s'\n", np->level, soap->tmpbuf, np->ns));
+         soap_set_attr(soap, soap->tmpbuf, np->ns, 1);
+         np->index = 2;
+@@ -11635,7 +11636,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_LONG642s(struct soap *soap, LONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, (long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
+@@ -12453,7 +12454,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_ULONG642s(struct soap *soap, ULONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, (unsigned long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
diff -ruN --exclude=CVS ../gsoap.orig/files/patch-gsoap-stdsoap2.cpp ./files/patch-gsoap-stdsoap2.cpp
--- ../gsoap.orig/files/patch-gsoap-stdsoap2.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-gsoap-stdsoap2.cpp	2012-09-14 02:52:57.000000000 +0200
@@ -0,0 +1,39 @@
+--- gsoap/stdsoap2.cpp.orig
++++ gsoap/stdsoap2.cpp
+@@ -809,7 +809,7 @@ soap_flush_raw(struct soap *soap, const char *s, size_t n)
+ #ifndef WITH_LEANER
+   if ((soap->mode & SOAP_IO) == SOAP_IO_CHUNK)
+   { char t[16];
+-    sprintf(t, "\r\n%lX\r\n" + (soap->chunksize ? 0 : 2), (unsigned long)n);
++    sprintf(t, &"\r\n%lX\r\n"[soap->chunksize ? 0 : 2], (unsigned long)n);
+     DBGMSG(SENT, t, strlen(t));
+     if ((soap->error = soap->fsend(soap, t, strlen(t))))
+       return soap->error;
+@@ -9534,7 +9534,8 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
+     }
+     for (np = soap->nlist; np; np = np->next)
+     { if (np->index == 1 && np->ns)
+-      { sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns", np->id);
++      {
++        sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns%s", *(np->id) ? np->id : "");
+         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Enabling utilized binding (level=%u) %s='%s'\n", np->level, soap->tmpbuf, np->ns));
+         soap_set_attr(soap, soap->tmpbuf, np->ns, 1);
+         np->index = 2;
+@@ -11635,7 +11636,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_LONG642s(struct soap *soap, LONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, (long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
+@@ -12453,7 +12454,7 @@ SOAP_FMAC1
+ const char*
+ SOAP_FMAC2
+ soap_ULONG642s(struct soap *soap, ULONG64 n)
+-{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, n);
++{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, (unsigned long long) (n));
+   return soap->tmpbuf;
+ }
+ #endif
diff -ruN --exclude=CVS ../gsoap.orig/files/patch-gsoap-wsdl-service.cpp ./files/patch-gsoap-wsdl-service.cpp
--- ../gsoap.orig/files/patch-gsoap-wsdl-service.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-gsoap-wsdl-service.cpp	2012-09-14 02:53:29.000000000 +0200
@@ -0,0 +1,11 @@
+--- gsoap/wsdl/service.cpp.orig
++++ gsoap/wsdl/service.cpp
+@@ -2281,7 +2281,7 @@ static void ident()
+   char tmp[256];
+   int i;
+   strftime(tmp, 256, "%Y-%m-%d %H:%M:%S GMT", gmtime(p));
+-  fprintf(stream, "/* %s\n   Generated by wsdl2h "WSDL2H_VERSION" from ", outfile?outfile:"");
++  fprintf(stream, "/* %s\n   Generated by wsdl2h " WSDL2H_VERSION " from ", outfile?outfile:"");
+   if (infiles)
+   { for (i = 0; i < infiles; i++)
+       fprintf(stream, "%s ", infile[i]);
diff -ruN --exclude=CVS ../gsoap.orig/files/patch-gsoap-wsdl-types.cpp ./files/patch-gsoap-wsdl-types.cpp
--- ../gsoap.orig/files/patch-gsoap-wsdl-types.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-gsoap-wsdl-types.cpp	2012-09-14 02:53:50.000000000 +0200
@@ -0,0 +1,29 @@
+--- gsoap/wsdl/types.cpp.orig
++++ gsoap/wsdl/types.cpp
+@@ -1206,7 +1206,7 @@ void Types::gen(const char *URI, const char *name, const xs__simpleType& simpleT
+               && simpleType.restriction->minExclusive
+               && simpleType.restriction->minExclusive->value
+               && is_integer(simpleType.restriction->minExclusive->value))
+-          fprintf(stream, " "SOAP_LONG_FORMAT, to_integer(simpleType.restriction->minExclusive->value)+1);
++          fprintf(stream, " " SOAP_LONG_FORMAT, (long long) to_integer(simpleType.restriction->minExclusive->value)+1);
+         if (!anonymous
+          && simpleType.restriction->maxLength
+          && simpleType.restriction->maxLength->value)
+@@ -1228,7 +1228,7 @@ void Types::gen(const char *URI, const char *name, const xs__simpleType& simpleT
+               && simpleType.restriction->maxExclusive
+               && simpleType.restriction->maxExclusive->value
+               && is_integer(simpleType.restriction->maxExclusive->value))
+-          fprintf(stream, ":"SOAP_LONG_FORMAT, to_integer(simpleType.restriction->maxExclusive->value)-1);
++          fprintf(stream, ":" SOAP_LONG_FORMAT, (long long) to_integer(simpleType.restriction->maxExclusive->value)-1);
+         if (!anonymous)
+         { fprintf(stream, ";\n");
+           if (pflag && simpleType.name)
+@@ -2974,7 +2974,7 @@ static const char *utf8(char *t, const char *s)
+             if (c < 0xFC)
+               c = ((c & 0x03) << 24) | (c1 << 18) | (c2 << 12) | (c3 << 6) | c4;
+             else
+-              c = ((c & 0x01) << 30) | (c1 << 24) | (c2 << 18) | (c3 << 12) | (c4 << 6) | *++s & 0x3F;
++              c = ((c & 0x01) << 30) | (c1 << 24) | (c2 << 18) | (c3 << 12) | (c4 << 6) | (*++s & 0x3F);
+           }
+         }
+       }
diff -ruN --exclude=CVS ../gsoap.orig/files/patch-gsoap-wsdl-wsdl2h.cpp ./files/patch-gsoap-wsdl-wsdl2h.cpp
--- ../gsoap.orig/files/patch-gsoap-wsdl-wsdl2h.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-gsoap-wsdl-wsdl2h.cpp	2012-09-14 02:54:04.000000000 +0200
@@ -0,0 +1,20 @@
+--- gsoap/wsdl/wsdl2h.cpp.orig
++++ gsoap/wsdl/wsdl2h.cpp
+@@ -85,7 +85,7 @@ char *infile[MAXINFILES],
+      *proxy_host = NULL,
+      *proxy_userid = NULL,
+      *proxy_passwd = NULL;
+-extern const char
++const char
+      *mapfile = WSDL_TYPEMAP_FILE,
+      *import_path = WSDL2H_IMPORT_PATH,
+      *cwd_path = NULL,
+@@ -118,7 +118,7 @@ const char serviceformat[]             = "//gsoap %-4s service %s:\t%s %s\n";
+ const char paraformat[]                = "    %-35s%s%s%s";
+ const char anonformat[]                = "    %-35s%s_%s%s";
+ 
+-const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release "WSDL2H_VERSION"\n**  Copyright (C) 2000-2012 Robert van Engelen, Genivia Inc.\n**  All Rights Reserved. This product is provided \"as is\", without any warranty.\n**  The wsdl2h tool is released under one of the following two licenses:\n**  GPL or the commercial license by Genivia Inc. Use option -l for details.\n\n";
++const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release " WSDL2H_VERSION "\n**  Copyright (C) 2000-2012 Robert van Engelen, Genivia Inc.\n**  All Rights Reserved. This product is provided \"as is\", without any warranty.\n**  The wsdl2h tool is released under one of the following two licenses:\n**  GPL or the commercial license by Genivia Inc. Use option -l for details.\n\n";
+ 
+ const char licensenotice[]   = "\
+ --------------------------------------------------------------------------------\n\
--- gsoap-2.8.10.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 14 02:30:22 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171629 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Mon Sep 17 14:39:21 UTC 2012 
State-Changed-Why:  
Committed with pkg-plist updates. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171629 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171629: commit references a PR
Date: Mon, 17 Sep 2012 14:36:54 +0000 (UTC)

 Author: sem
 Date: Mon Sep 17 14:36:40 2012
 New Revision: 304402
 URL: http://svn.freebsd.org/changeset/ports/304402
 
 Log:
   - Update to 2.8.10
   
   PR:		ports/171629
   Submitted by:	Michael Gmelin <freebsd at grem.de>
 
 Added:
   head/devel/gsoap/files/patch-gsoap-stdsoap2.c   (contents, props changed)
   head/devel/gsoap/files/patch-gsoap-stdsoap2.cpp   (contents, props changed)
   head/devel/gsoap/files/patch-gsoap-wsdl-service.cpp   (contents, props changed)
   head/devel/gsoap/files/patch-gsoap-wsdl-types.cpp   (contents, props changed)
   head/devel/gsoap/files/patch-gsoap-wsdl-wsdl2h.cpp   (contents, props changed)
 Modified:
   head/devel/gsoap/Makefile
   head/devel/gsoap/distinfo
   head/devel/gsoap/pkg-plist
 
 Modified: head/devel/gsoap/Makefile
 ==============================================================================
 --- head/devel/gsoap/Makefile	Mon Sep 17 14:25:55 2012	(r304401)
 +++ head/devel/gsoap/Makefile	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	gsoap
 -PORTVERSION=	2.8.8
 +PORTVERSION=	2.8.10
  CATEGORIES=	devel
  MASTER_SITES=	SF/${PORTNAME}2/gSOAP 
  DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 Modified: head/devel/gsoap/distinfo
 ==============================================================================
 --- head/devel/gsoap/distinfo	Mon Sep 17 14:25:55 2012	(r304401)
 +++ head/devel/gsoap/distinfo	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -1,2 +1,2 @@
 -SHA256 (gsoap_2.8.8.zip) = 8b1ad1cbd521bd5f85ff4c038bfd5a17a2530610c1ce8bf7318725bc568465cc
 -SIZE (gsoap_2.8.8.zip) = 13782549
 +SHA256 (gsoap_2.8.10.zip) = fddfd59ba9b0236daa59d1ced9149cb827d446e0a24b85395ed23c10858cabfb
 +SIZE (gsoap_2.8.10.zip) = 19156778
 
 Added: head/devel/gsoap/files/patch-gsoap-stdsoap2.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/gsoap/files/patch-gsoap-stdsoap2.c	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -0,0 +1,39 @@
 +--- gsoap/stdsoap2.c.orig
 ++++ gsoap/stdsoap2.c
 +@@ -809,7 +809,7 @@ soap_flush_raw(struct soap *soap, const char *s, size_t n)
 + #ifndef WITH_LEANER
 +   if ((soap->mode & SOAP_IO) == SOAP_IO_CHUNK)
 +   { char t[16];
 +-    sprintf(t, "\r\n%lX\r\n" + (soap->chunksize ? 0 : 2), (unsigned long)n);
 ++    sprintf(t, &"\r\n%lX\r\n"[soap->chunksize ? 0 : 2], (unsigned long)n);
 +     DBGMSG(SENT, t, strlen(t));
 +     if ((soap->error = soap->fsend(soap, t, strlen(t))))
 +       return soap->error;
 +@@ -9534,7 +9534,8 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
 +     }
 +     for (np = soap->nlist; np; np = np->next)
 +     { if (np->index == 1 && np->ns)
 +-      { sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns", np->id);
 ++      {
 ++        sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns%s", *(np->id) ? np->id : "");
 +         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Enabling utilized binding (level=%u) %s='%s'\n", np->level, soap->tmpbuf, np->ns));
 +         soap_set_attr(soap, soap->tmpbuf, np->ns, 1);
 +         np->index = 2;
 +@@ -11635,7 +11636,7 @@ SOAP_FMAC1
 + const char*
 + SOAP_FMAC2
 + soap_LONG642s(struct soap *soap, LONG64 n)
 +-{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, n);
 ++{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, (long long) (n));
 +   return soap->tmpbuf;
 + }
 + #endif
 +@@ -12453,7 +12454,7 @@ SOAP_FMAC1
 + const char*
 + SOAP_FMAC2
 + soap_ULONG642s(struct soap *soap, ULONG64 n)
 +-{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, n);
 ++{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, (unsigned long long) (n));
 +   return soap->tmpbuf;
 + }
 + #endif
 
 Added: head/devel/gsoap/files/patch-gsoap-stdsoap2.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/gsoap/files/patch-gsoap-stdsoap2.cpp	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -0,0 +1,39 @@
 +--- gsoap/stdsoap2.cpp.orig
 ++++ gsoap/stdsoap2.cpp
 +@@ -809,7 +809,7 @@ soap_flush_raw(struct soap *soap, const char *s, size_t n)
 + #ifndef WITH_LEANER
 +   if ((soap->mode & SOAP_IO) == SOAP_IO_CHUNK)
 +   { char t[16];
 +-    sprintf(t, "\r\n%lX\r\n" + (soap->chunksize ? 0 : 2), (unsigned long)n);
 ++    sprintf(t, &"\r\n%lX\r\n"[soap->chunksize ? 0 : 2], (unsigned long)n);
 +     DBGMSG(SENT, t, strlen(t));
 +     if ((soap->error = soap->fsend(soap, t, strlen(t))))
 +       return soap->error;
 +@@ -9534,7 +9534,8 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
 +     }
 +     for (np = soap->nlist; np; np = np->next)
 +     { if (np->index == 1 && np->ns)
 +-      { sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns", np->id);
 ++      {
 ++        sprintf(soap->tmpbuf, *(np->id) ? "xmlns:%s" : "xmlns%s", *(np->id) ? np->id : "");
 +         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Enabling utilized binding (level=%u) %s='%s'\n", np->level, soap->tmpbuf, np->ns));
 +         soap_set_attr(soap, soap->tmpbuf, np->ns, 1);
 +         np->index = 2;
 +@@ -11635,7 +11636,7 @@ SOAP_FMAC1
 + const char*
 + SOAP_FMAC2
 + soap_LONG642s(struct soap *soap, LONG64 n)
 +-{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, n);
 ++{ sprintf(soap->tmpbuf, SOAP_LONG_FORMAT, (long long) (n));
 +   return soap->tmpbuf;
 + }
 + #endif
 +@@ -12453,7 +12454,7 @@ SOAP_FMAC1
 + const char*
 + SOAP_FMAC2
 + soap_ULONG642s(struct soap *soap, ULONG64 n)
 +-{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, n);
 ++{ sprintf(soap->tmpbuf, SOAP_ULONG_FORMAT, (unsigned long long) (n));
 +   return soap->tmpbuf;
 + }
 + #endif
 
 Added: head/devel/gsoap/files/patch-gsoap-wsdl-service.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/gsoap/files/patch-gsoap-wsdl-service.cpp	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -0,0 +1,11 @@
 +--- gsoap/wsdl/service.cpp.orig
 ++++ gsoap/wsdl/service.cpp
 +@@ -2281,7 +2281,7 @@ static void ident()
 +   char tmp[256];
 +   int i;
 +   strftime(tmp, 256, "%Y-%m-%d %H:%M:%S GMT", gmtime(p));
 +-  fprintf(stream, "/* %s\n   Generated by wsdl2h "WSDL2H_VERSION" from ", outfile?outfile:"");
 ++  fprintf(stream, "/* %s\n   Generated by wsdl2h " WSDL2H_VERSION " from ", outfile?outfile:"");
 +   if (infiles)
 +   { for (i = 0; i < infiles; i++)
 +       fprintf(stream, "%s ", infile[i]);
 
 Added: head/devel/gsoap/files/patch-gsoap-wsdl-types.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/gsoap/files/patch-gsoap-wsdl-types.cpp	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -0,0 +1,29 @@
 +--- gsoap/wsdl/types.cpp.orig
 ++++ gsoap/wsdl/types.cpp
 +@@ -1206,7 +1206,7 @@ void Types::gen(const char *URI, const char *name, const xs__simpleType& simpleT
 +               && simpleType.restriction->minExclusive
 +               && simpleType.restriction->minExclusive->value
 +               && is_integer(simpleType.restriction->minExclusive->value))
 +-          fprintf(stream, " "SOAP_LONG_FORMAT, to_integer(simpleType.restriction->minExclusive->value)+1);
 ++          fprintf(stream, " " SOAP_LONG_FORMAT, (long long) to_integer(simpleType.restriction->minExclusive->value)+1);
 +         if (!anonymous
 +          && simpleType.restriction->maxLength
 +          && simpleType.restriction->maxLength->value)
 +@@ -1228,7 +1228,7 @@ void Types::gen(const char *URI, const char *name, const xs__simpleType& simpleT
 +               && simpleType.restriction->maxExclusive
 +               && simpleType.restriction->maxExclusive->value
 +               && is_integer(simpleType.restriction->maxExclusive->value))
 +-          fprintf(stream, ":"SOAP_LONG_FORMAT, to_integer(simpleType.restriction->maxExclusive->value)-1);
 ++          fprintf(stream, ":" SOAP_LONG_FORMAT, (long long) to_integer(simpleType.restriction->maxExclusive->value)-1);
 +         if (!anonymous)
 +         { fprintf(stream, ";\n");
 +           if (pflag && simpleType.name)
 +@@ -2974,7 +2974,7 @@ static const char *utf8(char *t, const char *s)
 +             if (c < 0xFC)
 +               c = ((c & 0x03) << 24) | (c1 << 18) | (c2 << 12) | (c3 << 6) | c4;
 +             else
 +-              c = ((c & 0x01) << 30) | (c1 << 24) | (c2 << 18) | (c3 << 12) | (c4 << 6) | *++s & 0x3F;
 ++              c = ((c & 0x01) << 30) | (c1 << 24) | (c2 << 18) | (c3 << 12) | (c4 << 6) | (*++s & 0x3F);
 +           }
 +         }
 +       }
 
 Added: head/devel/gsoap/files/patch-gsoap-wsdl-wsdl2h.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/gsoap/files/patch-gsoap-wsdl-wsdl2h.cpp	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -0,0 +1,20 @@
 +--- gsoap/wsdl/wsdl2h.cpp.orig
 ++++ gsoap/wsdl/wsdl2h.cpp
 +@@ -85,7 +85,7 @@ char *infile[MAXINFILES],
 +      *proxy_host = NULL,
 +      *proxy_userid = NULL,
 +      *proxy_passwd = NULL;
 +-extern const char
 ++const char
 +      *mapfile = WSDL_TYPEMAP_FILE,
 +      *import_path = WSDL2H_IMPORT_PATH,
 +      *cwd_path = NULL,
 +@@ -118,7 +118,7 @@ const char serviceformat[]             = "//gsoap %-4s service %s:\t%s %s\n";
 + const char paraformat[]                = "    %-35s%s%s%s";
 + const char anonformat[]                = "    %-35s%s_%s%s";
 + 
 +-const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release "WSDL2H_VERSION"\n**  Copyright (C) 2000-2012 Robert van Engelen, Genivia Inc.\n**  All Rights Reserved. This product is provided \"as is\", without any warranty.\n**  The wsdl2h tool is released under one of the following two licenses:\n**  GPL or the commercial license by Genivia Inc. Use option -l for details.\n\n";
 ++const char copyrightnotice[] = "\n**  The gSOAP WSDL/Schema processor for C and C++, wsdl2h release " WSDL2H_VERSION "\n**  Copyright (C) 2000-2012 Robert van Engelen, Genivia Inc.\n**  All Rights Reserved. This product is provided \"as is\", without any warranty.\n**  The wsdl2h tool is released under one of the following two licenses:\n**  GPL or the commercial license by Genivia Inc. Use option -l for details.\n\n";
 + 
 + const char licensenotice[]   = "\
 + --------------------------------------------------------------------------------\n\
 
 Modified: head/devel/gsoap/pkg-plist
 ==============================================================================
 --- head/devel/gsoap/pkg-plist	Mon Sep 17 14:25:55 2012	(r304401)
 +++ head/devel/gsoap/pkg-plist	Mon Sep 17 14:36:40 2012	(r304402)
 @@ -27,7 +27,10 @@ libdata/pkgconfig/gsoapssl.pc
  %%DATADIR%%/WS/WS-ReliableMessaging.wsdl
  %%DATADIR%%/WS/WS-ReliableMessaging.xsd
  %%DATADIR%%/WS/WS-Routing.xsd
 +%%DATADIR%%/WS/WS-SecureConversation.xsd
  %%DATADIR%%/WS/WS-SecurityPolicy.xsd
 +%%DATADIR%%/WS/WS-Trust.wsdl
 +%%DATADIR%%/WS/WS-Trust.xsd
  %%DATADIR%%/WS/WS-typemap.dat
  %%DATADIR%%/WS/discovery.xsd
  %%DATADIR%%/WS/ds.xsd
 @@ -64,6 +67,7 @@ libdata/pkgconfig/gsoapssl.pc
  %%DATADIR%%/import/ds.h
  %%DATADIR%%/import/ds2.h
  %%DATADIR%%/import/ref.h
 +%%DATADIR%%/import/ser.h
  %%DATADIR%%/import/soap12.h
  %%DATADIR%%/import/stdstring.h
  %%DATADIR%%/import/stl.h
 @@ -75,17 +79,22 @@ libdata/pkgconfig/gsoapssl.pc
  %%DATADIR%%/import/wsa3.h
  %%DATADIR%%/import/wsa4.h
  %%DATADIR%%/import/wsa5.h
 +%%DATADIR%%/import/wsc.h
  %%DATADIR%%/import/wsdd.h
  %%DATADIR%%/import/wsdd10.h
  %%DATADIR%%/import/wsdx.h
  %%DATADIR%%/import/wsp.h
  %%DATADIR%%/import/wsrm.h
  %%DATADIR%%/import/wsrm4.h
 +%%DATADIR%%/import/wsrm5.h
  %%DATADIR%%/import/wsrp.h
  %%DATADIR%%/import/wsrx.h
 +%%DATADIR%%/import/wsrx5.h
  %%DATADIR%%/import/wsse.h
  %%DATADIR%%/import/wsse11.h
  %%DATADIR%%/import/wsse2.h
 +%%DATADIR%%/import/wst.h
 +%%DATADIR%%/import/wstx.h
  %%DATADIR%%/import/wsu.h
  %%DATADIR%%/import/xenc.h
  %%DATADIR%%/import/xlink.h
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
