Date: Thu, 14 Nov 2002 10:47:19 +0100 (CET) From: Volker Stolz <vs@foldr.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org Subject: ports/45286: [patch] Unbreak net/xmlrpc-c on -current Message-ID: <200211140947.gAE9lJnx008167@monster.ikea.net>
next in thread | raw e-mail | index | archive | help
>Number: 45286
>Category: ports
>Synopsis: [patch] Unbreak net/xmlrpc-c on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 14 01:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD monster.ikea.net 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Wed Nov 13 19:42:10 CET 2002 root@monster.ikea.net:/usr/src/sys/i386/compile/MONSTER i386
>Description:
bento noticed that xmlrpc-c doesn't build on -current because
of generic c++ breakage.
- correct use of '#include <string>' and 'use namespace'
- PERL->REINPLACE while I'm here
- notify upstream of c++ changes as requested in sourcefile
Patch tested on: -CURRENT, -STABLE
>How-To-Repeat:
>Fix:
New file:
- files/patch-src-XmlRpcCpp.h
diff -urN xmlrpc-c.orig/Makefile xmlrpc-c/Makefile
--- xmlrpc-c.orig/Makefile Thu Nov 14 10:21:19 2002
+++ xmlrpc-c/Makefile Thu Nov 14 10:35:27 2002
@@ -17,6 +17,7 @@
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
+USE_REINPLACE= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
@@ -26,10 +27,9 @@
MAN7= xmlrpc-c.7
pre-patch:
- @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
${WRKSRC}/lib/abyss/src/data.c \
- ${WRKSRC}/tools/turbocharger/mod_gzip.c \
- ${WRKSRC}/tools/turbocharger/mod_gzip.c
+ ${WRKSRC}/tools/turbocharger/mod_gzip.c
post-install:
@${RM} -f ${PREFIX}/lib/*.la
diff -urN xmlrpc-c.orig/files/patch-src-XmlRpcCpp.h xmlrpc-c/files/patch-src-XmlRpcCpp.h
--- xmlrpc-c.orig/files/patch-src-XmlRpcCpp.h Thu Jan 1 01:00:00 1970
+++ xmlrpc-c/files/patch-src-XmlRpcCpp.h Thu Nov 14 09:18:47 2002
@@ -0,0 +1,12 @@
+--- src/XmlRpcCpp.h.orig Thu Nov 14 09:17:52 2002
++++ src/XmlRpcCpp.h Thu Nov 14 09:18:17 2002
+@@ -45,8 +45,8 @@
+ // work with our version of g++). So this header name is technically wrong.
+ // Tell me what your compiler does; I can provide some autoconf magic to the
+ // Right Thing on most platforms.
++using namespace std;
+ #include <string>
+-// using namespace std;
+
+ #include <xmlrpc.h>
+ #include <xmlrpc_client.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211140947.gAE9lJnx008167>