Attachment #32554 for bug #53747

View | Details | Raw Unified | Return to bug 53747
Collapse All | Expand All




#

PORTNAME=	easysoap
PORTVERSION=	0.6
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

USE_OPENSSL=	yes
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB=	yes

.include <bsd.port.pre.mk>

pre-configure:
	@echo "CPPFLAGS=${CPPFLAGS} CXXFLAGS=${CXXFLAGS}"
.endif

pre-patch:
	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
		${WRKSRC}/src/abyss/src/data.c

.include <bsd.port.post.mk>

Line 1 Link Here

(-)easysoap/distinfo (-1 / +1 lines)
1	MD5 (EasySoap++-0.5.tar.gz) = 473e08f8a0a0b0ea598f0fe024611fe9	1	MD5 (EasySoap++-0.6.tar.gz) = 9b75efcaf71f615266281ff993ae04b6




--- include/easysoap/SOAPDispatchHandler.h.orig	Thu Jun 26 10:06:51 2003
+++ include/easysoap/SOAPDispatchHandler.h	Thu Jun 26 10:07:35 2003
@@ -56,7 +56,7 @@
 	bool ExecuteMethod(const SOAPEnvelope& request, SOAPMethod& response)
 	{
 		const SOAPMethod& method = request.GetBody().GetMethod();
-		DispatchMap::Iterator i = m_dispatchMap.Find(method.GetName());
+		typename DispatchMap::Iterator i = m_dispatchMap.Find(method.GetName());
 		if (i)
 		{
 			T *target= GetTarget(request);
@@ -100,7 +100,7 @@
 
 	bool HandleHeader(const SOAPParameter& header, SOAPEnvelope& request, SOAPEnvelope& response)
 	{
-		DispatchMap::Iterator i = m_dispatchMap.Find(header.GetName());
+		typename DispatchMap::Iterator i = m_dispatchMap.Find(header.GetName());
 
 		if (i)
 		{




--- include/easysoap/SOAPHashMap.h.orig	Thu Jun 26 09:58:31 2003
+++ include/easysoap/SOAPHashMap.h	Thu Jun 26 10:05:23 2003
@@ -117,13 +117,13 @@
 	{
 	private:
 		const SOAPHashMap		*m_map;
-		Elements::Iterator		m_index;
+		typename Elements::Iterator		m_index;
 		HashElement				*m_he;
 		
 		friend class SOAPHashMap<K,I,H,E>;
 
 		// private constuctor that can only be called by SOAPHashMap
-		ForwardHashMapIterator(const SOAPHashMap *map, Elements::Iterator index)
+		ForwardHashMapIterator(const SOAPHashMap *map, typename Elements::Iterator index)
 			: m_map(map), m_index(index), m_he(0)
 		{
 			if (m_map)
@@ -134,7 +134,7 @@
 			}
 		}
 
-		ForwardHashMapIterator(const SOAPHashMap *map, Elements::Iterator index, HashElement *he)
+		ForwardHashMapIterator(const SOAPHashMap *map, typename Elements::Iterator index, HashElement *he)
 			: m_map(map), m_index(index), m_he(he)
 		{
 		}
@@ -366,8 +366,8 @@
 		{
 			Clear();
 			Resize(r.GetNumBuckets());
-			SOAPHashMap<A,B,C,D>::Iterator e = r.End();
-			for (SOAPHashMap<A,B,C,D>::Iterator it = r.Begin(); it != e; ++it)
+			typename SOAPHashMap<A,B,C,D>::Iterator e = r.End();
+			for (typename SOAPHashMap<A,B,C,D>::Iterator it = r.Begin(); it != e; ++it)
 				Add(it.Key(), it.Item());
 		}
 		return *this;
@@ -397,7 +397,7 @@
 	 */
 	Iterator Begin() const
 	{
-		return Iterator(this, (Elements::Iterator)m_elements.Begin());
+		return Iterator(this, (typename Elements::Iterator)m_elements.Begin());
 	}
 
 	/**
@@ -407,7 +407,7 @@
 	 */
 	Iterator End() const
 	{
-		return Iterator(this, (Elements::Iterator)m_elements.End());
+		return Iterator(this, (typename Elements::Iterator)m_elements.End());
 	}
 
 
@@ -491,7 +491,7 @@
 	 */
 	void Clear()
 	{
-		for (Elements::Iterator i = m_elements.Begin(); i != m_elements.End(); ++i)
+		for (typename Elements::Iterator i = m_elements.Begin(); i != m_elements.End(); ++i)
 		{
 			HashElement *he = *i;
 			while (he)
@@ -512,7 +512,7 @@
 	 */
 	void Empty()
 	{
-		Elements::Iterator i;
+		typename Elements::Iterator i;
 		for (i = m_elements.Begin(); i != m_elements.End(); ++i)
 		{
 			HashElement *he = *i;
@@ -588,7 +588,7 @@
 			while (he)
 			{
 				if (he->m_hash == hash && equals(he->m_key, key))
-					return Iterator(this, (Elements::Iterator)m_elements.Begin() + index, he);
+					return Iterator(this, (typename Elements::Iterator)m_elements.Begin() + index, he);
 				he = he->m_next;
 			}
 		}
@@ -603,7 +603,7 @@
 
 		Elements newelements;
 		newelements.Resize(newsize);
-		Elements::Iterator i;
+		typename Elements::Iterator i;
 
 		for (i = newelements.Begin(); i != newelements.End(); ++i)
 			*i = 0;

Line 0 Link Here

(-)easysoap/files/patch-include::SOAPParameter.h (+11 lines)
	1	--- SOAPParameter.h.orig Thu Jun 26 09:18:02 2003
	2	+++ include/easysoap/SOAPParameter.h Thu Jun 26 09:18:19 2003
	3	@@ -165,7 +165,7 @@
	4	Data(const Data&);
	5	};
	6
	7	- friend Data;
	8	+ friend class Data;
	9
	10	Pool m_pool;
	11	SOAPParameter *m_parent;




include/easysoap/SOAPBase64.h
include/easysoap/SOAPBody.h
include/easysoap/SOAPCGIServer.h
include/easysoap/SOAPCGITransport.h
include/easysoap/SOAPDebugger.h
include/easysoap/SOAPDispatchHandler.h
include/easysoap/SOAPEnvelope.h
include/easysoap/SOAPException.h
include/easysoap/SOAPFault.h
include/easysoap/SOAPHTTPServer.h
include/easysoap/SOAPHashMap.h
include/easysoap/SOAPHeader.h
include/easysoap/SOAPMethod.h
include/easysoap/SOAPNamespaces.h
include/easysoap/SOAPPacketWriter.h
include/easysoap/SOAPParameter.h
include/easysoap/SOAPParse.h
include/easysoap/SOAPParseEventHandler.h

include/easysoap/SOAPProxy.h
include/easysoap/SOAPQName.h
include/easysoap/SOAPResponse.h
include/easysoap/SOAPSSLContext.h
include/easysoap/SOAPSTL.h
include/easysoap/SOAPServer.h
include/easysoap/SOAPServerDispatch.h

include/easysoap/SOAPUrl.h
include/easysoap/SOAPUtil.h
include/easysoap/SOAPonHTTP.h
include/easysoap/XMLComposer.h
include/easysoap/XMLParser.h
include/easysoap/es_borl.h
include/easysoap/es_comp.h
include/easysoap/es_conf.h
include/easysoap/es_config.h
include/easysoap/es_msvc.h
include/easysoap/es_mwerks.h
lib/libeasysoap.a

Return to bug 53747

Lines 6-13 Link Here

(-)easysoap/Makefile (-11 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= easysoap	8	PORTNAME= easysoap
9	PORTVERSION= 0.5	9	PORTVERSION= 0.6
10	PORTREVISION= 2
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 21-38 Link Here
21	USE_OPENSSL= yes	20	USE_OPENSSL= yes
22	USE_REINPLACE= yes	21	USE_REINPLACE= yes
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	CONFIGURE_ENV= CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \	23	CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
25	LIBS="-L${LOCALBASE}/lib -lexpat"	24	LIBS="-L${LOCALBASE}/lib"
26	INSTALLS_SHLIB= yes	25	INSTALLS_SHLIB= yes
27		26
28	.include <bsd.port.pre.mk>	27	.include <bsd.port.pre.mk>
29		28
30	.if ${OSVERSION} >= 500035	29	pre-configure:
31	BROKEN= "Does not compile on 5.0"	30	@echo "CPPFLAGS=${CPPFLAGS} CXXFLAGS=${CXXFLAGS}"
32	.endif
33
34	pre-patch:
35	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
36	${WRKSRC}/src/abyss/src/data.c
37		31
38	.include <bsd.port.post.mk>	32	.include <bsd.port.post.mk>

Line 0 Link Here

(-)easysoap/files/patch-include::SOAPDispatchHandler.h (+20 lines)
	1	--- include/easysoap/SOAPDispatchHandler.h.orig Thu Jun 26 10:06:51 2003
	2	+++ include/easysoap/SOAPDispatchHandler.h Thu Jun 26 10:07:35 2003
	3	@@ -56,7 +56,7 @@
	4	bool ExecuteMethod(const SOAPEnvelope& request, SOAPMethod& response)
	5	{
	6	const SOAPMethod& method = request.GetBody().GetMethod();
	7	- DispatchMap::Iterator i = m_dispatchMap.Find(method.GetName());
	8	+ typename DispatchMap::Iterator i = m_dispatchMap.Find(method.GetName());
	9	if (i)
	10	{
	11	T *target= GetTarget(request);
	12	@@ -100,7 +100,7 @@
	13
	14	bool HandleHeader(const SOAPParameter& header, SOAPEnvelope& request, SOAPEnvelope& response)
	15	{
	16	- DispatchMap::Iterator i = m_dispatchMap.Find(header.GetName());
	17	+ typename DispatchMap::Iterator i = m_dispatchMap.Find(header.GetName());
	18
	19	if (i)
	20	{

Line 0 Link Here

(-)easysoap/files/patch-include::SOAPHashMap.h (+92 lines)
		1	--- include/easysoap/SOAPHashMap.h.orig Thu Jun 26 09:58:31 2003
		2	+++ include/easysoap/SOAPHashMap.h Thu Jun 26 10:05:23 2003
		3	@@ -117,13 +117,13 @@
		4	{
		5	private:
		6	const SOAPHashMap *m_map;
		7	- Elements::Iterator m_index;
		8	+ typename Elements::Iterator m_index;
		9	HashElement *m_he;
		10
		11	friend class SOAPHashMap<K,I,H,E>;
		12
		13	// private constuctor that can only be called by SOAPHashMap
		14	- ForwardHashMapIterator(const SOAPHashMap *map, Elements::Iterator index)
		15	+ ForwardHashMapIterator(const SOAPHashMap *map, typename Elements::Iterator index)
		16	: m_map(map), m_index(index), m_he(0)
		17	{
		18	if (m_map)
		19	@@ -134,7 +134,7 @@
		20	}
		21	}
		22
		23	- ForwardHashMapIterator(const SOAPHashMap map, Elements::Iterator index, HashElement he)
		24	+ ForwardHashMapIterator(const SOAPHashMap map, typename Elements::Iterator index, HashElement he)
		25	: m_map(map), m_index(index), m_he(he)
		26	{
		27	}
		28	@@ -366,8 +366,8 @@
		29	{
		30	Clear();
		31	Resize(r.GetNumBuckets());
		32	- SOAPHashMap<A,B,C,D>::Iterator e = r.End();
		33	- for (SOAPHashMap<A,B,C,D>::Iterator it = r.Begin(); it != e; ++it)
		34	+ typename SOAPHashMap<A,B,C,D>::Iterator e = r.End();
		35	+ for (typename SOAPHashMap<A,B,C,D>::Iterator it = r.Begin(); it != e; ++it)
		36	Add(it.Key(), it.Item());
		37	}
		38	return *this;
		39	@@ -397,7 +397,7 @@
		40	*/
		41	Iterator Begin() const
		42	{
		43	- return Iterator(this, (Elements::Iterator)m_elements.Begin());
		44	+ return Iterator(this, (typename Elements::Iterator)m_elements.Begin());
		45	}
		46
		47	/**
		48	@@ -407,7 +407,7 @@
		49	*/
		50	Iterator End() const
		51	{
		52	- return Iterator(this, (Elements::Iterator)m_elements.End());
		53	+ return Iterator(this, (typename Elements::Iterator)m_elements.End());
		54	}
		55
		56
		57	@@ -491,7 +491,7 @@
		58	*/
		59	void Clear()
		60	{
		61	- for (Elements::Iterator i = m_elements.Begin(); i != m_elements.End(); ++i)
		62	+ for (typename Elements::Iterator i = m_elements.Begin(); i != m_elements.End(); ++i)
		63	{
		64	HashElement he = i;
65	while (he)
66	@@ -512,7 +512,7 @@
67	*/
68	void Empty()
69	{
70	- Elements::Iterator i;
71	+ typename Elements::Iterator i;
72	for (i = m_elements.Begin(); i != m_elements.End(); ++i)
73	{
74	HashElement he = i;
75	@@ -588,7 +588,7 @@
76	while (he)
77	{
78	if (he->m_hash == hash && equals(he->m_key, key))
79	- return Iterator(this, (Elements::Iterator)m_elements.Begin() + index, he);
80	+ return Iterator(this, (typename Elements::Iterator)m_elements.Begin() + index, he);
81	he = he->m_next;
82	}
83	}
84	@@ -603,7 +603,7 @@
85
86	Elements newelements;
87	newelements.Resize(newsize);
88	- Elements::Iterator i;
89	+ typename Elements::Iterator i;
90
91	for (i = newelements.Begin(); i != newelements.End(); ++i)
92	*i = 0;

Lines 3-19 Link Here

(-)easysoap/pkg-plist (-2 / +5 lines)
3	include/easysoap/SOAPBase64.h	3	include/easysoap/SOAPBase64.h
4	include/easysoap/SOAPBody.h	4	include/easysoap/SOAPBody.h
5	include/easysoap/SOAPCGIServer.h	5	include/easysoap/SOAPCGIServer.h
		6	include/easysoap/SOAPCGITransport.h
6	include/easysoap/SOAPDebugger.h	7	include/easysoap/SOAPDebugger.h
7	include/easysoap/SOAPDispatchHandler.h	8	include/easysoap/SOAPDispatchHandler.h
8	include/easysoap/SOAPEnvelope.h	9	include/easysoap/SOAPEnvelope.h
9	include/easysoap/SOAPException.h	10	include/easysoap/SOAPException.h
10	include/easysoap/SOAPFault.h	11	include/easysoap/SOAPFault.h
11	include/easysoap/SOAPHTTPServer.h
12	include/easysoap/SOAPHashMap.h	12	include/easysoap/SOAPHashMap.h
13	include/easysoap/SOAPHeader.h	13	include/easysoap/SOAPHeader.h
14	include/easysoap/SOAPMethod.h	14	include/easysoap/SOAPMethod.h
15	include/easysoap/SOAPNamespaces.h	15	include/easysoap/SOAPNamespaces.h
16	include/easysoap/SOAPPacketWriter.h
17	include/easysoap/SOAPParameter.h	16	include/easysoap/SOAPParameter.h
18	include/easysoap/SOAPParse.h	17	include/easysoap/SOAPParse.h
19	include/easysoap/SOAPParseEventHandler.h	18	include/easysoap/SOAPParseEventHandler.h
Lines 21-26 Link Here
21	include/easysoap/SOAPProxy.h	20	include/easysoap/SOAPProxy.h
22	include/easysoap/SOAPQName.h	21	include/easysoap/SOAPQName.h
23	include/easysoap/SOAPResponse.h	22	include/easysoap/SOAPResponse.h
		23	include/easysoap/SOAPSSLContext.h
24	include/easysoap/SOAPSTL.h	24	include/easysoap/SOAPSTL.h
25	include/easysoap/SOAPServer.h	25	include/easysoap/SOAPServer.h
26	include/easysoap/SOAPServerDispatch.h	26	include/easysoap/SOAPServerDispatch.h
Lines 32-40 Link Here
32	include/easysoap/SOAPUrl.h	32	include/easysoap/SOAPUrl.h
33	include/easysoap/SOAPUtil.h	33	include/easysoap/SOAPUtil.h
34	include/easysoap/SOAPonHTTP.h	34	include/easysoap/SOAPonHTTP.h
		35	include/easysoap/XMLComposer.h
35	include/easysoap/XMLParser.h	36	include/easysoap/XMLParser.h
		37	include/easysoap/es_borl.h
36	include/easysoap/es_comp.h	38	include/easysoap/es_comp.h
37	include/easysoap/es_conf.h	39	include/easysoap/es_conf.h
		40	include/easysoap/es_config.h
38	include/easysoap/es_msvc.h	41	include/easysoap/es_msvc.h
39	include/easysoap/es_mwerks.h	42	include/easysoap/es_mwerks.h
40	lib/libeasysoap.a	43	lib/libeasysoap.a