ports/176956: [PATCH] textproc/syck: fix compile error

[Stephon Chen]

>Number:         176956
>Category:       ports
>Synopsis:       [PATCH] textproc/syck: fix compile error
>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:   Thu Mar 14 14:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Bo-Chong Chen
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD alumni.cs.nctu.edu.tw 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012
>Description:
fix compile error
based on https://github.com/indeyets/syck/commit/4c0e9b5e2e9fa93f18c850f4a9c2cfe0e835b7d1

Added file(s):
- files/patch-lib_gram.y
- files/patch-lib_syck.h
- files/patch-lib_token.c

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

--- syck-0.70_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/syck/Makefile /amd/gcs/93/9317544/ports/textproc/syck/Makefile
--- /usr/ports/textproc/syck/Makefile	2013-03-08 21:21:31.000000000 +0800
+++ /amd/gcs/93/9317544/ports/textproc/syck/Makefile	2013-03-14 22:00:26.189254000 +0800
@@ -1,16 +1,19 @@
-# Created by: dd
+# New ports collection makefile for:    syck
+# Date created:			2 Dec 2004
+# Whom:				Alexey Zakhlestin<indeyets at gmail.com> 
+#
 # $FreeBSD: textproc/syck/Makefile 313647 2013-03-08 13:21:31Z miwi $
+#
 
 PORTNAME=	syck
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://cloud.github.com/downloads/indeyets/syck/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A library for reading and writing YAML 1.0
 
-BROKEN=		does not build
-
 GNU_CONFIGURE=	yes
 USES=		bison
 CFLAGS+=	-fPIC
diff -ruN --exclude=CVS /usr/ports/textproc/syck/files/patch-lib_gram.y /amd/gcs/93/9317544/ports/textproc/syck/files/patch-lib_gram.y
--- /usr/ports/textproc/syck/files/patch-lib_gram.y	1970-01-01 08:00:00.000000000 +0800
+++ /amd/gcs/93/9317544/ports/textproc/syck/files/patch-lib_gram.y	2013-03-14 21:36:39.000000000 +0800
@@ -0,0 +1,22 @@
+--- lib/gram.y.orig	2013-03-14 21:31:55.000000000 +0800
++++ lib/gram.y	2013-03-14 21:32:31.000000000 +0800
+@@ -9,7 +9,8 @@
+ 
+ %start doc
+ %pure-parser
+-
++%parse-param {void* parser}
++%lex-param {void* parser}
+ 
+ %{
+ 
+@@ -24,9 +25,6 @@
+ 
+ void apply_seq_in_map( SyckParser *parser, SyckNode *n );
+ 
+-#define YYPARSE_PARAM   parser
+-#define YYLEX_PARAM     parser
+-
+ #define NULL_NODE(parser, node) \
+         SyckNode *node = syck_new_str( "", scalar_plain ); \
+         if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
diff -ruN --exclude=CVS /usr/ports/textproc/syck/files/patch-lib_syck.h /amd/gcs/93/9317544/ports/textproc/syck/files/patch-lib_syck.h
--- /usr/ports/textproc/syck/files/patch-lib_syck.h	1970-01-01 08:00:00.000000000 +0800
+++ /amd/gcs/93/9317544/ports/textproc/syck/files/patch-lib_syck.h	2013-03-14 21:36:39.000000000 +0800
@@ -0,0 +1,11 @@
+--- lib/syck.h.orig	2013-03-14 21:32:03.000000000 +0800
++++ lib/syck.h	2013-03-14 21:32:45.000000000 +0800
+@@ -467,7 +467,7 @@
+ /*
+  * Lexer prototypes
+  */
+-void syckerror( const char * );
++void syckerror( void *, const char * );
+ int syckparse( void * );
+ 
+ #if defined(__cplusplus)
diff -ruN --exclude=CVS /usr/ports/textproc/syck/files/patch-lib_token.c /amd/gcs/93/9317544/ports/textproc/syck/files/patch-lib_token.c
--- /usr/ports/textproc/syck/files/patch-lib_token.c	1970-01-01 08:00:00.000000000 +0800
+++ /amd/gcs/93/9317544/ports/textproc/syck/files/patch-lib_token.c	2013-03-14 21:36:39.000000000 +0800
@@ -0,0 +1,34 @@
+--- lib/token.c.orig	2013-03-14 21:32:08.000000000 +0800
++++ lib/token.c	2013-03-14 21:33:14.000000000 +0800
+@@ -200,7 +200,7 @@
+     { \
+         if ( *indent == '\t' ) \
+         { \
+-            syckerror("TAB found in your indentation, please remove"); \
++            syckerror(0, "TAB found in your indentation, please remove"); \
+             return 0; \
+         } \
+         else if ( is_newline( ++indent ) ) \
+@@ -266,11 +266,11 @@
+         return sycklex_yaml_utf8( sycklval, parser );
+ 
+         case syck_yaml_utf16:
+-            syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
++            syckerror( 0, "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
+         break;
+ 
+         case syck_yaml_utf32:
+-            syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
++            syckerror( 0, "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
+         break;
+ 
+         case syck_bytecode_utf8:
+@@ -2758,7 +2758,7 @@
+ }
+ 
+ void 
+-syckerror( const char *msg )
++syckerror( void * parser, const char *msg )
+ {
+     if ( syck_parser_ptr->error_handler == NULL )
+         syck_parser_ptr->error_handler = syck_default_error_handler;
--- syck-0.70_1.patch ends here ---

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