Date: Wed, 16 Jan 2008 07:13:38 +0000 (UTC) From: Philippe Audeoud <jadawin@tuxaco.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119707: [update] net/versuch - unbreak gcc42 Message-ID: <20080116071338.EDDC9857E9@ilove.tuxaco.net> Resent-Message-ID: <200801160710.m0G7A2wF064054@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119707
>Category: ports
>Synopsis: [update] net/versuch - unbreak gcc42
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 16 07:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080116071338.EDDC9857E9>