Attachment #64614 for bug #96008

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




#

PORTNAME=	ulxmlrpcpp
PORTVERSION=	1.5.0
PORTREVISION=	1
CATEGORIES=	net devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

MAINTAINER=	ports@FreeBSD.org
COMMENT=	An ultra lightweight xml-rpc library written in C++

LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

USE_BZIP2=	yes
USE_GNOME=	gnomehack gnometarget
USE_ICONV=	yes
USE_OPENSSL=	yes
USE_AUTOTOOLS=	libtool:15
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--disable-doxygen
INSTALLS_SHLIB=	yes

CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

post-patch:
	@${REINPLACE_CMD} -e \
		'/^SUBDIRS/s| docs | |g' ${WRKSRC}/ulxmlrpcpp/Makefile.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net/ulxmlrpcpp/distinfo (-3 / +3 lines)
1	MD5 (ulxmlrpcpp-1.4.6.tar.bz2) = 3d47450cd984d83b62f8ea3822d81e3e	1	MD5 (ulxmlrpcpp-1.5.0-src.tar.bz2) = 8393c7db5b9209f0ee8de2709661579b
2	SHA256 (ulxmlrpcpp-1.4.6.tar.bz2) = 42c1c2eb9956835966a7719e6a919c6d66107e3fc8ea101d98fbe5c9c70b22b4	2	SHA256 (ulxmlrpcpp-1.5.0-src.tar.bz2) = 542875a7304e2b016f84c075cbb140f5a1cc5d7692db5310b49c7acf89cd5521
3	SIZE (ulxmlrpcpp-1.4.6.tar.bz2) = 345696	3	SIZE (ulxmlrpcpp-1.5.0-src.tar.bz2) = 545704




--- config/ltmain.sh.orig	Sun Dec  8 16:53:29 2002
+++ config/ltmain.sh	Wed Dec 10 11:43:13 2003
@@ -4232,10 +4232,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false ; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-11 Link Here

(-)net/ulxmlrpcpp/files/patch-ulxmlrpcpp:ulxmlrpcpp.cpp (-11 lines)
1	--- ulxmlrpcpp/ulxmlrpcpp.cpp.orig Thu Nov 27 02:44:22 2003
2	+++ ulxmlrpcpp/ulxmlrpcpp.cpp Wed Dec 10 11:34:49 2003
3	@@ -742,7 +742,7 @@
4	{
5	size_t outbytes = sizeof(buffer);
6	char *outbuf = buffer;
7	- char inbuf = const_cast<char>(val.data())+in_offset;
8	+ const char inbuf = const_cast<char>(val.data())+in_offset;
9	size_t inbytes = val.length()-in_offset;
10	#if defined(__SUN__) \|\| defined(__CYGWIN__)
11	if ((int)iconv(con, &(const char*)inbuf, &inbytes, &outbuf, &outbytes) < 0)

Lines 1-11 Link Here

(-)net/ulxmlrpcpp/files/patch-ulxmlrpcpp:ulxr_dispatcher.h (-11 lines)
1	--- ulxmlrpcpp/ulxr_dispatcher.h.orig Fri Sep 3 17:06:46 2004
2	+++ ulxmlrpcpp/ulxr_dispatcher.h Fri Sep 3 17:06:57 2004
3	@@ -108,8 +108,6 @@
4
5	typedef hidden::MethodWrapperBase* DynamicMethodCall_t; // call Wrappers call();
6
7	- struct MethodCallDescriptor;
8	-
9	enum CallType { CallNone,
10	CallSystem,
11	CallStatic,




--- ulxmlrpcpp/ulxr_http_protocol.cpp.orig	Sat Mar  4 03:40:46 2006
+++ ulxmlrpcpp/ulxr_http_protocol.cpp	Mon Apr 17 02:00:48 2006
@@ -153,7 +153,7 @@
     pimpl->userTempFields.clear();
     pimpl->bAcceptcookies = false;
     pimpl->bChunkedEncoding = false;
-    pimpl->chunk_data.clear();
+    pimpl->chunk_data.erase();
     pimpl->chunk_size = 0;
     pimpl->chunk_body_skip = 0;
     setChunkedTransfer(false);
@@ -168,7 +168,7 @@
     pimpl->headerprops.clear();
     pimpl->cookies.clear();
     pimpl->bChunkedEncoding = false;
-    pimpl->chunk_data.clear();
+    pimpl->chunk_data.erase();
     pimpl->chunk_size = 0;
     pimpl->chunk_body_skip = 0;
     pimpl->chunk_terminated = false;
@@ -444,7 +444,7 @@
           len--;
           if (--pimpl->chunk_body_skip <= 0)
           {
-            pimpl->chunk_data.clear();
+            pimpl->chunk_data.erase();
             setConnectionState(State(ConnChunkHeader));
           }
         break;
@@ -523,7 +523,7 @@
               ULXR_TRACE(ULXR_PCHAR("have chunked transfer encoding"));
               pimpl->bChunkedEncoding = true;
               pimpl->chunk_size = 0;
-              pimpl->chunk_data.clear();
+              pimpl->chunk_data.erase();
           }
       }
 

Line 0 Link Here

(-)net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_tcpip_connection.cpp (+11 lines)
	1	--- ulxmlrpcpp/ulxr_tcpip_connection.cpp.orig Sun Apr 16 04:15:21 2006
	2	+++ ulxmlrpcpp/ulxr_tcpip_connection.cpp Mon Apr 17 01:39:52 2006
	3	@@ -45,6 +45,8 @@
	4	#endif
	5
	6	#ifdef __unix__
	7	+#include <sys/time.h>
	8	+#include <sys/types.h>
	9	#include <sys/socket.h>
	10	#include <netinet/tcp.h>
	11	#endif




bin/introspect
bin/meerkat_client
include/ulxmlrpcpp/contrib/mprocess_rpc_server.h
include/ulxmlrpcpp/contrib/ssl_connection.h
include/ulxmlrpcpp/ulxmlrpcpp.h
include/ulxmlrpcpp/ulxr_cached_resource.h
include/ulxmlrpcpp/ulxr_call.h
include/ulxmlrpcpp/ulxr_callparse.h
include/ulxmlrpcpp/ulxr_callparse_base.h
include/ulxmlrpcpp/ulxr_callparse_wb.h
include/ulxmlrpcpp/ulxr_config.h
include/ulxmlrpcpp/ulxr_connection.h
include/ulxmlrpcpp/ulxr_dispatcher.h
include/ulxmlrpcpp/ulxr_except.h
include/ulxmlrpcpp/ulxr_expatwrap.h
include/ulxmlrpcpp/ulxr_file_resource.h
include/ulxmlrpcpp/ulxr_htmlform_handler.h
include/ulxmlrpcpp/ulxr_http_client.h
include/ulxmlrpcpp/ulxr_http_protocol.h
include/ulxmlrpcpp/ulxr_http_server.h
include/ulxmlrpcpp/ulxr_mtrpc_server.h
include/ulxmlrpcpp/ulxr_mutex.h
include/ulxmlrpcpp/ulxr_protocol.h
include/ulxmlrpcpp/ulxr_requester.h
include/ulxmlrpcpp/ulxr_response.h
include/ulxmlrpcpp/ulxr_responseparse.h
include/ulxmlrpcpp/ulxr_responseparse_base.h
include/ulxmlrpcpp/ulxr_responseparse_wb.h
include/ulxmlrpcpp/ulxr_signature.h
include/ulxmlrpcpp/ulxr_ssl_connection.h
include/ulxmlrpcpp/ulxr_tcpip_connection.h
include/ulxmlrpcpp/ulxr_value.h
include/ulxmlrpcpp/ulxr_valueparse.h
include/ulxmlrpcpp/ulxr_valueparse_base.h
include/ulxmlrpcpp/ulxr_valueparse_wb.h
include/ulxmlrpcpp/ulxr_virtual_resource.h
include/ulxmlrpcpp/ulxr_wbxmlparse.h
include/ulxmlrpcpp/ulxr_xmlparse.h
include/ulxmlrpcpp/ulxr_xmlparse_base.h
include/ulxr_xmlparse.h
include/ulxr_xmlparse_base.h
@dirrm include/ulxmlrpcpp
lib/libulxmlrpcpp.a
lib/libulxmlrpcpp.la
lib/libulxmlrpcpp.so
lib/libulxmlrpcpp.so.13
lib/libulxmlrpcpp_contrib.a
lib/libulxmlrpcpp_contrib.la
lib/libulxmlrpcpp_contrib.so
lib/libulxmlrpcpp_contrib.so.13
%%DATADIR%%/httpd/index.html
%%DATADIR%%/httpd/logo-ulxmlrpcpp.png
@dirrm %%DATADIR%%/httpd
@dirrm %%DATADIR%%
@dirrm include/ulxmlrpcpp/contrib
@dirrm include/ulxmlrpcpp

Return to bug 96008

Lines 7-34 Link Here

(-)net/ulxmlrpcpp/Makefile (-10 / +14 lines)
7	#	7	#
8		8
9	PORTNAME= ulxmlrpcpp	9	PORTNAME= ulxmlrpcpp
10	PORTVERSION= 1.4.6	10	PORTVERSION= 1.5.0
11	PORTREVISION= 1
12	CATEGORIES= net devel	11	CATEGORIES= net devel
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
15	#DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E:S/b/beta/}	14	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
16		15
17	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
18	COMMENT= A ultra lightweight xml-rpc library written in C++	17	COMMENT= An ultra lightweight xml-rpc library written in C++
19		18
20	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2	19	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
21		20
		21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		22
22	USE_BZIP2= yes	23	USE_BZIP2= yes
		24	USE_GNOME= gnomehack gnometarget
23	USE_ICONV= yes	25	USE_ICONV= yes
24	USE_REINPLACE= yes	26	USE_OPENSSL= yes
25	GNU_CONFIGURE= yes	27	USE_AUTOTOOLS= libtool:15
26	CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \	28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
27	LDFLAGS="-L${LOCALBASE}/lib"
28	CONFIGURE_ARGS= --disable-doxygen
29	INSTALLS_SHLIB= yes	29	INSTALLS_SHLIB= yes
30		30
		31	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		32	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
		33
31	post-patch:	34	post-patch:
32	@${REINPLACE_CMD} -e "s\|-pthread\|${PTHREAD_LIBS}\|g" ${WRKSRC}/configure	35	@${REINPLACE_CMD} -e \
		36	'/^SUBDIRS/s\| docs \| \|g' ${WRKSRC}/ulxmlrpcpp/Makefile.in
33		37
34	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)net/ulxmlrpcpp/files/patch-config:ltmain.sh (-15 lines)
1	--- config/ltmain.sh.orig Sun Dec 8 16:53:29 2002
2	+++ config/ltmain.sh Wed Dec 10 11:43:13 2003
3	@@ -4232,10 +4232,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false ; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Line 0 Link Here

(-)net/ulxmlrpcpp/files/patch-ulxmlrpcpp__ulxr_http_protorol.cpp (+38 lines)
	1	--- ulxmlrpcpp/ulxr_http_protocol.cpp.orig Sat Mar 4 03:40:46 2006
	2	+++ ulxmlrpcpp/ulxr_http_protocol.cpp Mon Apr 17 02:00:48 2006
	3	@@ -153,7 +153,7 @@
	4	pimpl->userTempFields.clear();
	5	pimpl->bAcceptcookies = false;
	6	pimpl->bChunkedEncoding = false;
	7	- pimpl->chunk_data.clear();
	8	+ pimpl->chunk_data.erase();
	9	pimpl->chunk_size = 0;
	10	pimpl->chunk_body_skip = 0;
	11	setChunkedTransfer(false);
	12	@@ -168,7 +168,7 @@
	13	pimpl->headerprops.clear();
	14	pimpl->cookies.clear();
	15	pimpl->bChunkedEncoding = false;
	16	- pimpl->chunk_data.clear();
	17	+ pimpl->chunk_data.erase();
	18	pimpl->chunk_size = 0;
	19	pimpl->chunk_body_skip = 0;
	20	pimpl->chunk_terminated = false;
	21	@@ -444,7 +444,7 @@
	22	len--;
	23	if (--pimpl->chunk_body_skip <= 0)
	24	{
	25	- pimpl->chunk_data.clear();
	26	+ pimpl->chunk_data.erase();
	27	setConnectionState(State(ConnChunkHeader));
	28	}
	29	break;
	30	@@ -523,7 +523,7 @@
	31	ULXR_TRACE(ULXR_PCHAR("have chunked transfer encoding"));
	32	pimpl->bChunkedEncoding = true;
	33	pimpl->chunk_size = 0;
	34	- pimpl->chunk_data.clear();
	35	+ pimpl->chunk_data.erase();
	36	}
	37	}
	38

Lines 1-44 Link Here

(-)net/ulxmlrpcpp/pkg-plist (-35 / +44 lines)
1	bin/introspect	1	bin/introspect
2	bin/meerkat_client	2	bin/meerkat_client
3	bin/sum_server	3	include/ulxmlrpcpp/contrib/mprocess_rpc_server.h
4	bin/ulxrstubber	4	include/ulxmlrpcpp/contrib/ssl_connection.h
5	include/ulxmlrpcpp.h	5	include/ulxmlrpcpp/ulxmlrpcpp.h
		6	include/ulxmlrpcpp/ulxr_cached_resource.h
		7	include/ulxmlrpcpp/ulxr_call.h
		8	include/ulxmlrpcpp/ulxr_callparse.h
		9	include/ulxmlrpcpp/ulxr_callparse_base.h
		10	include/ulxmlrpcpp/ulxr_callparse_wb.h
6	include/ulxmlrpcpp/ulxr_config.h	11	include/ulxmlrpcpp/ulxr_config.h
7	include/ulxr_call.h	12	include/ulxmlrpcpp/ulxr_connection.h
8	include/ulxr_callparse.h	13	include/ulxmlrpcpp/ulxr_dispatcher.h
9	include/ulxr_callparse_base.h	14	include/ulxmlrpcpp/ulxr_except.h
10	include/ulxr_callparse_wb.h	15	include/ulxmlrpcpp/ulxr_expatwrap.h
11	include/ulxr_connection.h	16	include/ulxmlrpcpp/ulxr_file_resource.h
12	include/ulxr_dispatcher.h	17	include/ulxmlrpcpp/ulxr_htmlform_handler.h
13	include/ulxr_except.h	18	include/ulxmlrpcpp/ulxr_http_client.h
14	include/ulxr_expatwrap.h	19	include/ulxmlrpcpp/ulxr_http_protocol.h
15	include/ulxr_htmlform_handler.h	20	include/ulxmlrpcpp/ulxr_http_server.h
16	include/ulxr_http_client.h	21	include/ulxmlrpcpp/ulxr_mtrpc_server.h
17	include/ulxr_http_protocol.h	22	include/ulxmlrpcpp/ulxr_mutex.h
18	include/ulxr_http_server.h	23	include/ulxmlrpcpp/ulxr_protocol.h
19	include/ulxr_mtrpc_server.h	24	include/ulxmlrpcpp/ulxr_requester.h
20	include/ulxr_mutex.h	25	include/ulxmlrpcpp/ulxr_response.h
21	include/ulxr_protocol.h	26	include/ulxmlrpcpp/ulxr_responseparse.h
22	include/ulxr_requester.h	27	include/ulxmlrpcpp/ulxr_responseparse_base.h
23	include/ulxr_response.h	28	include/ulxmlrpcpp/ulxr_responseparse_wb.h
24	include/ulxr_responseparse.h	29	include/ulxmlrpcpp/ulxr_signature.h
25	include/ulxr_responseparse_base.h	30	include/ulxmlrpcpp/ulxr_ssl_connection.h
26	include/ulxr_responseparse_wb.h	31	include/ulxmlrpcpp/ulxr_tcpip_connection.h
27	include/ulxr_signature.h	32	include/ulxmlrpcpp/ulxr_value.h
28	include/ulxr_ssl_connection.h	33	include/ulxmlrpcpp/ulxr_valueparse.h
29	include/ulxr_tcpip_connection.h	34	include/ulxmlrpcpp/ulxr_valueparse_base.h
30	include/ulxr_value.h	35	include/ulxmlrpcpp/ulxr_valueparse_wb.h
31	include/ulxr_valueparse.h	36	include/ulxmlrpcpp/ulxr_virtual_resource.h
32	include/ulxr_valueparse_base.h	37	include/ulxmlrpcpp/ulxr_wbxmlparse.h
33	include/ulxr_valueparse_wb.h	38	include/ulxmlrpcpp/ulxr_xmlparse.h
34	include/ulxr_wbxmlparse.h	39	include/ulxmlrpcpp/ulxr_xmlparse_base.h
35	include/ulxr_xmlparse.h
36	include/ulxr_xmlparse_base.h
37	@dirrm include/ulxmlrpcpp
38	lib/libulxmlrpcpp.a	40	lib/libulxmlrpcpp.a
		41	lib/libulxmlrpcpp.la
39	lib/libulxmlrpcpp.so	42	lib/libulxmlrpcpp.so
40	lib/libulxmlrpcpp.so.10	43	lib/libulxmlrpcpp.so.13
		44	lib/libulxmlrpcpp_contrib.a
		45	lib/libulxmlrpcpp_contrib.la
		46	lib/libulxmlrpcpp_contrib.so
		47	lib/libulxmlrpcpp_contrib.so.13
41	%%DATADIR%%/httpd/index.html	48	%%DATADIR%%/httpd/index.html
42	%%DATADIR%%/httpd/logo-ulxmlrpcpp.png	49	%%DATADIR%%/httpd/logo-ulxmlrpcpp.png
43	@dirrm %%DATADIR%%/httpd	50	@dirrm %%DATADIR%%/httpd
44	@dirrm %%DATADIR%%	51	@dirrm %%DATADIR%%
		52	@dirrm include/ulxmlrpcpp/contrib
		53	@dirrm include/ulxmlrpcpp