ports/60675: Fix comms/seyon build on 5.X systems

[Samy Al Bahra]

>Number:         60675
>Category:       ports
>Synopsis:       Fix comms/seyon build on 5.X systems
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 28 21:10:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Samy Al Bahra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled 
>Environment:


System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003     samy at beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386


>Description:


comms/seyon does not build on 5.X
systems due to the fact that multiline
string literals are depreciated with
gcc 3.X. The following patch fixes this.


>How-To-Repeat:


Build with gcc 3.X.


>Fix:


--- seyon.patch begins here ---
diff -ruN seyon/Makefile /home/samy/tmp/seyon/Makefile
--- seyon/Makefile	Fri Dec 12 13:49:29 2003
+++ /home/samy/tmp/seyon/Makefile	Mon Dec 29 07:21:55 2003
@@ -20,10 +20,4 @@
 
 MAN1=		seyon.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION} (missing header)"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN seyon/files/patch-SeParse.y /home/samy/tmp/seyon/files/patch-SeParse.y
--- seyon/files/patch-SeParse.y	Thu Jan  1 03:00:00 1970
+++ /home/samy/tmp/seyon/files/patch-SeParse.y	Mon Dec 29 07:28:42 2003
@@ -0,0 +1,35 @@
+--- SeParse.y.orig	Mon Dec 29 07:24:02 2003
++++ SeParse.y	Mon Dec 29 07:28:38 2003
+@@ -81,19 +81,19 @@
+ {
+   char long_line[1000];
+ 
+-  char input_str[] = "This(is, a, real, funky); script();
+-            Scripts(); Can(be); Multi(Line, \"Can't they?\");
+-            Commas(are, no, longer, optional, inside, arglists);
+-	    Scripts(); Can(); contain(\"tabs \\t and backspaces \\b\");
+-	    As(\"Well\\ as Quoted Strings\", and, '\"Quoted Strings inside
+-	    quoted strings\"');
+-	esc(can, appear, outside, strings, ^z, \\012\\015\\n);
+-	    But(parenthesis, should, match);
+-  We(\"have a funny way of specifying \\012 chars and even)\"); 
+-	backslashes( \" \\\\ \");
+-  new(\"in this version are ^m and ^A ctr-escapes, as in ^S^Q\");
+- The(next, line, will, give, a, syntax, error, because, it, has, two, adj, functions,
+-	without, a, separating, semicolon);
++  char input_str[] = "This(is, a, real, funky); script();\n\
++            Scripts(); Can(be); Multi(Line, \"Can't they?\");\n\
++            Commas(are, no, longer, optional, inside, arglists);\n\
++	    Scripts(); Can(); contain(\"tabs \\t and backspaces \\b\");\n\
++	    As(\"Well\\ as Quoted Strings\", and, '\"Quoted Strings inside\n\
++	    quoted strings\"');\n\
++	esc(can, appear, outside, strings, ^z, \\012\\015\\n);\n\
++	    But(parenthesis, should, match);\n\
++  We(\"have a funny way of specifying \\012 chars and even)\"); \n\
++	backslashes( \" \\\\ \");\n\
++  new(\"in this version are ^m and ^A ctr-escapes, as in ^S^Q\");\n\
++ The(next, line, will, give, a, syntax, error, because, it, has, two, adj, functions,\n\
++	without, a, separating, semicolon);\n\
+  End() script()";
+ 
+   printf("------ String to parse: \n%s\n\n---- Parsing begins:\n", input_str);
diff -ruN seyon/files/patch-SeScan.c /home/samy/tmp/seyon/files/patch-SeScan.c
--- seyon/files/patch-SeScan.c	Thu Jan  1 03:00:00 1970
+++ /home/samy/tmp/seyon/files/patch-SeScan.c	Mon Dec 29 07:27:54 2003
@@ -0,0 +1,13 @@
+--- SeScan.c.orig	Mon Dec 29 07:26:24 2003
++++ SeScan.c	Mon Dec 29 07:27:42 2003
+@@ -275,8 +275,8 @@
+ #ifdef TEST
+ main()
+ {
+-  scSetInputBuf("Just to see if we'\\'re \\n\\033 able to distinguish' words and strings
+-\"Also 'quotes' inside strings\" and 'strs \"inside quotes\"'
++  scSetInputBuf("Just to see if we'\\'re \\n\\033 able to distinguish' words and strings\n\
++\"Also 'quotes' inside strings\" and 'strs \"inside quotes\"'\n\
+ Not to forget ^S and ^q control ^ chars");
+ 
+   while (lGetWord() != 0);
--- seyon.patch ends here ---



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