Date: Sat, 23 Mar 2013 17:51:37 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315052 - in head/textproc/syck: . files Message-ID: <201303231751.r2NHpbpp023448@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sat Mar 23 17:51:36 2013 New Revision: 315052 URL: http://svnweb.freebsd.org/changeset/ports/315052 Log: - Unbreak build PR: 176956 Submitted by: Stephon Chen <stephon@gmail.com> Added: head/textproc/syck/files/ head/textproc/syck/files/patch-lib_gram.y (contents, props changed) head/textproc/syck/files/patch-lib_syck.h (contents, props changed) head/textproc/syck/files/patch-lib_token.c (contents, props changed) Modified: head/textproc/syck/Makefile Modified: head/textproc/syck/Makefile ============================================================================== --- head/textproc/syck/Makefile Sat Mar 23 17:47:44 2013 (r315051) +++ head/textproc/syck/Makefile Sat Mar 23 17:51:36 2013 (r315052) @@ -9,8 +9,6 @@ MASTER_SITES= http://cloud.github.com/do MAINTAINER= ports@FreeBSD.org COMMENT= A library for reading and writing YAML 1.0 -BROKEN= does not build - GNU_CONFIGURE= yes USES= bison CFLAGS+= -fPIC Added: head/textproc/syck/files/patch-lib_gram.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/syck/files/patch-lib_gram.y Sat Mar 23 17:51:36 2013 (r315052) @@ -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 ) \ Added: head/textproc/syck/files/patch-lib_syck.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/syck/files/patch-lib_syck.h Sat Mar 23 17:51:36 2013 (r315052) @@ -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) Added: head/textproc/syck/files/patch-lib_token.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/syck/files/patch-lib_token.c Sat Mar 23 17:51:36 2013 (r315052) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303231751.r2NHpbpp023448>