From owner-freebsd-ports Thu Nov 14 1:50: 5 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9DDD37B401 for ; Thu, 14 Nov 2002 01:50:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F295843E77 for ; Thu, 14 Nov 2002 01:50:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAE9o1x3034856 for ; Thu, 14 Nov 2002 01:50:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAE9o19D034855; Thu, 14 Nov 2002 01:50:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61F9737B401; Thu, 14 Nov 2002 01:48:00 -0800 (PST) Received: from lambda.foldr.org (lambda.foldr.org [198.78.66.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D34743E42; Thu, 14 Nov 2002 01:47:59 -0800 (PST) (envelope-from vs@foldr.org) Received: from theater.dyndns.org (pD95099C0.dip.t-dialin.net [217.80.153.192]) by lambda.foldr.org (8.12.3/8.11.6) with ESMTP id gAE9lXjN013622 (using TLSv1/SSLv3 with cipher EDH-RSA-DES-CBC3-SHA (168 bits) verified OK); Thu, 14 Nov 2002 10:47:36 +0100 (CET) (envelope-from vs@foldr.org) Received: from monster.ikea.net (monster.ikea.net [IPv6:3ffe:b80:2de:3:2e0:29ff:fe98:abca]) by theater.dyndns.org (8.12.5/8.12.5) with ESMTP id gAE9lYBO053496 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK); Thu, 14 Nov 2002 10:47:35 +0100 (CET) (envelope-from vs@monster.ikea.net) Received: (from vs@localhost) by monster.ikea.net (8.12.6/8.12.6/Submit) id gAE9lJnx008167; Thu, 14 Nov 2002 10:47:19 +0100 (CET) (envelope-from vs) Message-Id: <200211140947.gAE9lJnx008167@monster.ikea.net> Date: Thu, 14 Nov 2002 10:47:19 +0100 (CET) From: Volker Stolz Reply-To: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45286: [patch] Unbreak net/xmlrpc-c on -current Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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 ' 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,,,' \ + @${REINPLACE_CMD} -e 's,,,' \ ${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 +-// using namespace std; + + #include + #include >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message