Subject: pkg/22861: GCC3 fixes for chat/epic4
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <jonathan@perkin.org.uk>
List: netbsd-bugs
Date: 09/19/2003 16:40:46
>Number:         22861
>Category:       pkg
>Synopsis:       GCC3 fixes for chat/epic4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 19 16:41:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        N/A
>Organization:
British Broadcasting Corporation
>Environment:
SunOS build1 5.9 Generic_112233-01 sun4u sparc SUNW,UltraSPARC-IIi-cEngine
>Description:
Multi-line string concatenation and preprocessing paste fixes.
>How-To-Repeat:
gcc -O -I/home/jonp/bulk/pkg/include -I/usr/local/ssl/include  -I./../include -I../include -c server.c
server.c:2175:22: missing terminating " character
server.c: In function `set_server_userhost':
server.c:2176: error: parse error before "contain"
server.c:2176: error: syntax error at '@' token
server.c:2176:45: missing terminating " character
*** Error code 1

===> Building for epic4-1.1.6
sh info.c.sh
gcc -O -I/home/jonp/bulk/pkg/include -I/usr/local/ssl/include -I./../include -I../include -c info.c
info.c:23:103: pasting ""Compiled by "" and "USER" does not give a valid preprocessing token
info.c:23:103: pasting "USER" and ""@build1 on Fri Sep 19 2003 at 17:32:20 BST"" does not give a valid preprocessing token
*** Error code 1
>Fix:
http://www.perkin.org.uk/projects/netbsd/epic4.diff

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/epic4/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	2002/09/01 16:34:42	1.4
+++ distinfo	2003/09/19 16:37:35
@@ -2,3 +2,5 @@
 
 SHA1 (epic4-1.1.6.tar.bz2) = d6b0ad47b6ca8132795c3ae3c59bb6e2e1c70a91
 Size (epic4-1.1.6.tar.bz2) = 549889 bytes
+SHA1 (patch-aa) = be34a4e77d0160511f028a0cc4efd67d40d9d00b
+SHA1 (patch-ab) = 5df03003f55b717077c41f3a1747ef6a1b02d6ee
--- /dev/null	Fri Sep 19 17:29:36 2003
+++ patches/patch-aa	Fri Sep 19 17:36:59 2003
@@ -1,0 +1,15 @@
+$NetBSD$
+
+--- source/server.c.orig	Fri Aug  9 16:10:16 2002
++++ source/server.c	Fri Sep 19 17:28:02 2003
+@@ -2172,8 +2172,8 @@
+ 
+ 	if (!(host = strchr(userhost, '@')))
+ 	{
+-		yell("Cannot set your userhost to [%s] because it does not
+-		      contain a @ character!", userhost);
++		yell("Cannot set your userhost to [%s] because it does not "
++		     "contain a @ character!", userhost);
+ 		return;
+ 	}
+ 
--- /dev/null	Fri Sep 19 17:29:36 2003
+++ patches/patch-ab	Fri Sep 19 17:37:03 2003
@@ -1,0 +1,16 @@
+$NetBSD$
+
+--- source/info.c.sh.in.orig	Fri Sep 19 17:34:41 2003
++++ source/info.c.sh.in	Fri Sep 19 17:35:10 2003
+@@ -19,11 +19,7 @@
+  * This file is auto-magically created.   Changes will be nuked.
+  */
+ 
+-#ifdef __STDC__
+-#define my_paste(x, y, z) x ## y ## z
+-#else
+ #define my_paste(x, y, z) x/**/y/**/z
+-#endif
+ 
+ #include "config.h"
+ #ifdef ANONYMOUS_COMPILE
>Release-Note:
>Audit-Trail:
>Unformatted: