From jadawin@tuxaco.net  Wed Jan 16 07:09:06 2008
Return-Path: <jadawin@tuxaco.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 129E016A417
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 Jan 2008 07:09:06 +0000 (UTC)
	(envelope-from jadawin@tuxaco.net)
Received: from huppa.tuxaco.net (huppa.tuxaco.net [91.121.19.193])
	by mx1.freebsd.org (Postfix) with ESMTP id C004513C45A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 Jan 2008 07:09:05 +0000 (UTC)
	(envelope-from jadawin@tuxaco.net)
Received: from localhost (unknown [127.0.0.1])
	by huppa.tuxaco.net (Postfix) with ESMTP id 95E56147BE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 Jan 2008 08:14:12 +0100 (CET)
Received: from huppa.tuxaco.net ([127.0.0.1])
	by localhost (huppa.tuxaco.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id WehsXm2sL8xB for <FreeBSD-gnats-submit@freebsd.org>;
	Wed, 16 Jan 2008 08:14:10 +0100 (CET)
Received: from ilove.tuxaco.net (ilove.tuxaco.net [82.236.143.160])
	(Authenticated sender: jadawin@tuxaco.net)
	by huppa.tuxaco.net (Postfix) with ESMTP id 1DAC5AD9D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 Jan 2008 08:14:10 +0100 (CET)
Received: by ilove.tuxaco.net (Postfix, from userid 1001)
	id EDDC9857E9; Wed, 16 Jan 2008 07:13:38 +0000 (UTC)
Message-Id: <20080116071338.EDDC9857E9@ilove.tuxaco.net>
Date: Wed, 16 Jan 2008 07:13:38 +0000 (UTC)
From: Philippe Audeoud <jadawin@tuxaco.net>
Reply-To: Philippe Audeoud <jadawin@tuxaco.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [update] net/versuch - unbreak gcc42
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         119707
>Category:       ports
>Synopsis:       [update] net/versuch - unbreak gcc42
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 16 07:10:01 UTC 2008
>Closed-Date:    Mon Jan 21 11:42:05 UTC 2008
>Last-Modified:  Mon Jan 21 11:50:01 UTC 2008
>Originator:     Philippe Audeoud
>Release:        FreeBSD 7.0-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD athines 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #1: Mon Jan 7 21:29:03 CET 2008 root@glenrothes:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	- add patches to fix gcc42 break
>How-To-Repeat:
	
>Fix:

	

--- patch-versuch.1 begins here ---
diff -ruN net/versuch.orig/Makefile net/versuch/Makefile
--- net/versuch.orig/Makefile	2008-01-15 13:55:20.000000000 +0000
+++ net/versuch/Makefile	2008-01-16 07:10:15.000000000 +0000
@@ -19,7 +19,7 @@
 
 LIB_DEPENDS=	pt_r.1:${PORTSDIR}/devel/pwlib \
 		h323_r.1:${PORTSDIR}/net/openh323 \
-		pcre++.0:${PORTSDIR}/devel/pcre++
+		pcre\\+\\+.0:${PORTSDIR}/devel/pcre++
 
 WRKSRC=		${WRKDIR}/versuch
 
@@ -27,10 +27,4 @@
 USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN net/versuch.orig/files/patch-aaa.h net/versuch/files/patch-aaa.h
--- net/versuch.orig/files/patch-aaa.h	1970-01-01 00:00:00.000000000 +0000
+++ net/versuch/files/patch-aaa.h	2008-01-15 13:58:05.000000000 +0000
@@ -0,0 +1,11 @@
+--- Aaa.h.orig	2008-01-15 13:56:51.000000000 +0000
++++ Aaa.h	2008-01-15 13:57:41.000000000 +0000
+@@ -95,7 +95,7 @@
+ class TCDR
+ {
+ public:
+- TCDR::TCDR() { DisconnectCause = 0; StartTime = 0; StopTime = 0; };
++ TCDR() { DisconnectCause = 0; StartTime = 0; StopTime = 0; };
+  unsigned int CallRef;
+  unsigned int StartTime, StopTime, IncOctets, OutOctets, RouteRetries;
+  int FastStart, Tunneling;
diff -ruN net/versuch.orig/files/patch-utils.cxx net/versuch/files/patch-utils.cxx
--- net/versuch.orig/files/patch-utils.cxx	1970-01-01 00:00:00.000000000 +0000
+++ net/versuch/files/patch-utils.cxx	2008-01-15 16:02:27.000000000 +0000
@@ -0,0 +1,12 @@
+--- Utils.cxx.orig	2008-01-15 16:01:46.000000000 +0000
++++ Utils.cxx	2008-01-15 16:02:07.000000000 +0000
+@@ -10,7 +10,8 @@
+ #include "Utils.h"
+ 
+ #include <fstream>
+-
++#include <assert.h>
++
+ void wtrim(string& str) {
+  const char* sp_chars = " \t\r\n";
+  unsigned int fst_notsp = str.find_first_not_of(sp_chars);
--- patch-versuch.1 ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Jan 16 11:07:29 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119707 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jan 21 11:42:03 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/119707: commit references a PR
Date: Mon, 21 Jan 2008 11:42:12 +0000 (UTC)

 miwi        2008-01-21 11:41:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/versuch          Makefile 
   Added files:
     net/versuch/files    patch-aaa.h patch-utils.cxx 
   Log:
   - Fix build with gcc4.2
   
   PR:             119707
   Submitted by:   Philippe Audeoud <jadawin@tuxaco.net>
   
   Revision  Changes    Path
   1.7       +2 -8      ports/net/versuch/Makefile
   1.1       +11 -0     ports/net/versuch/files/patch-aaa.h (new)
   1.1       +12 -0     ports/net/versuch/files/patch-utils.cxx (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
