ports/116820: [PATCH] irc/dircproxy: Fix build with gcc 4.2

[Martin Wilke]

>Number:         116820
>Category:       ports
>Synopsis:       [PATCH] irc/dircproxy: Fix build with gcc 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 02 11:50:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Wilke
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD miwi.homeunix.com 7.0-CURRENT FreeBSD 7.0-CURRENT #305: Fri Sep 28 12:07:59 CEST 2007
>Description:

Fix build with gcc 4.2

tested on tb:
i386
http://head.miwibox.org/tb/index.php?action=describe_port&id=2156
amd64
http://amd64.miwibox.org/tb/index.php?action=describe_port&id=1597
Added file(s):
- files/patch-src_dcc_net.c
- files/patch-src_irc_server.c
- files/patch-src_net.c

Port maintainer (lesterm at mazpe.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- dircproxy-1.0.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/dircproxy/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- Makefile	2 Oct 2007 01:45:06 -0000	1.11
+++ Makefile	2 Oct 2007 11:26:12 -0000
@@ -21,10 +21,4 @@
 post-install:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
 
-.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>
Index: files/patch-src_dcc_net.c
===================================================================
RCS file: files/patch-src_dcc_net.c
diff -N files/patch-src_dcc_net.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src_dcc_net.c	2 Oct 2007 11:32:20 -0000
@@ -0,0 +1,11 @@
+--- src/dcc_net.c.orig	2007-10-02 13:31:06.000000000 +0200
++++ src/dcc_net.c	2007-10-02 13:31:27.000000000 +0200
+@@ -364,7 +364,7 @@
+       n = p->next;
+       _dccnet_free(p);
+ 
+-      p = (l ? l->next : proxies) = n;
++      p = *(l ? &(l->next) : &(proxies)) = n;
+     } else {
+       l = p;
+       p = p->next;
Index: files/patch-src_irc_server.c
===================================================================
RCS file: files/patch-src_irc_server.c
diff -N files/patch-src_irc_server.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src_irc_server.c	2 Oct 2007 11:29:55 -0000
@@ -0,0 +1,20 @@
+--- src/irc_server.c.orig	2007-10-02 13:27:29.000000000 +0200
++++ src/irc_server.c	2007-10-02 13:28:07.000000000 +0200
+@@ -700,7 +700,7 @@
+               free(s);
+ 
+               /* Was in the squelch list, so remove it and stop looking */
+-              s = (l ? l->next : p->squelch_modes) = n;
++              s = *(l ? &(l->next) : &(p->squelch_modes)) = n;
+               squelch = 1;
+               break;
+             } else {
+@@ -741,7 +741,7 @@
+               free(s);
+ 
+               /* Was in the squelch list, so remove it and stop looking */
+-              s = (l ? l->next : p->squelch_modes) = n;
++              s = *(l ? &(l->next) : &(p->squelch_modes)) = n;
+               squelch = 1;
+               break;
+             } else {
Index: files/patch-src_net.c
===================================================================
RCS file: files/patch-src_net.c
diff -N files/patch-src_net.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src_net.c	2 Oct 2007 11:34:01 -0000
@@ -0,0 +1,11 @@
+--- src/net.c.orig	2007-10-02 13:33:00.000000000 +0200
++++ src/net.c	2007-10-02 13:33:28.000000000 +0200
+@@ -459,7 +459,7 @@
+     return 0;
+   }
+   
+-  l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last);
++  l = (buff == SB_IN ? &(s->in_buff_last) : &(s->out_buff_last));
+ 
+   /* Check whether we can just add to the existing buffer */
+   if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) {
--- dircproxy-1.0.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: