svn commit: r373662 - in head: devel/kdevelop-pg-qt/files lang/parrot/files security/nessus-libnasl security/nessus-libnasl/files security/openvas-libnasl/files www/htmlcxx www/htmlcxx/files www/we...
Antoine Brodin
antoine at FreeBSD.org
Sun Nov 30 11:20:38 UTC 2014
Author: antoine
Date: Sun Nov 30 11:20:35 2014
New Revision: 373662
URL: https://svnweb.freebsd.org/changeset/ports/373662
QAT: https://qat.redports.org/buildarchive/r373662/
Log:
Allow building with bison 3
PR: ports/194680
Added:
head/devel/kdevelop-pg-qt/files/patch-kdev-pg_kdev-pg-parser.yy (contents, props changed)
head/lang/parrot/files/
head/lang/parrot/files/patch-compilers_imcc_imcc.y (contents, props changed)
head/security/nessus-libnasl/files/patch-nasl_nasl__grammar.y (contents, props changed)
head/security/openvas-libnasl/files/
head/security/openvas-libnasl/files/patch-nasl_nasl__grammar.y (contents, props changed)
head/www/webkit-gtk2/files/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y (contents, props changed)
Modified:
head/security/nessus-libnasl/pkg-plist
head/www/htmlcxx/Makefile
head/www/htmlcxx/files/patch-css_syntax.y
head/www/htmlcxx/pkg-plist
head/x11/xstroke/files/patch-rec_parse.y
Added: head/devel/kdevelop-pg-qt/files/patch-kdev-pg_kdev-pg-parser.yy
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/kdevelop-pg-qt/files/patch-kdev-pg_kdev-pg-parser.yy Sun Nov 30 11:20:35 2014 (r373662)
@@ -0,0 +1,11 @@
+--- kdev-pg/kdev-pg-parser.yy.orig 2012-01-27 21:40:18 UTC
++++ kdev-pg/kdev-pg-parser.yy
+@@ -309,7 +309,7 @@ opt_lexer_action
+ | T_CONTINUE {
+ r = "\nlxCONTINUE;\n";
+ }
+- | /* empty */ { r = "\nlxSKIP\n" }
++ | /* empty */ { r = "\nlxSKIP\n"; }
+ ;
+
+ regexp
Added: head/lang/parrot/files/patch-compilers_imcc_imcc.y
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/parrot/files/patch-compilers_imcc_imcc.y Sun Nov 30 11:20:35 2014 (r373662)
@@ -0,0 +1,11 @@
+--- compilers/imcc/imcc.y.orig 2013-01-28 19:57:42 UTC
++++ compilers/imcc/imcc.y
+@@ -45,7 +45,7 @@ This file contains the grammar of the PI
+
+ /* prevent declarations of malloc() and free() in the generated parser. */
+ #define YYMALLOC
+-#define YYFREE(Ptr) do { /* empty */; } while (YYID (0))
++#define YYFREE(Ptr) do { /* empty */; } while (0)
+
+ #ifndef YYENABLE_NLS
+ # define YYENABLE_NLS 0
Added: head/security/nessus-libnasl/files/patch-nasl_nasl__grammar.y
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/nessus-libnasl/files/patch-nasl_nasl__grammar.y Sun Nov 30 11:20:35 2014 (r373662)
@@ -0,0 +1,37 @@
+--- nasl/nasl_grammar.y.orig 2005-11-01 18:27:57 UTC
++++ nasl/nasl_grammar.y
+@@ -1,4 +1,6 @@
+ %pure_parser
++%parse-param {naslctxt * parm}
++%lex-param {naslctxt * parm}
+ %expect 1
+ %{
+ /* Nessus Attack Scripting Language version 2
+@@ -19,9 +21,6 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#define YYPARSE_PARAM parm
+-#define YYLEX_PARAM parm
+-
+ #define LNB (((naslctxt*)parm)->line_nb)
+ #include "includes.h"
+ #include "nasl_tree.h"
+@@ -31,7 +30,7 @@
+ #include "nasl_lex_ctxt.h"
+ #include "nasl_debug.h"
+
+-static void naslerror(const char *);
++static void naslerror(naslctxt *, const char *);
+ #define YYERROR_VERBOSE
+ %}
+
+@@ -466,7 +465,7 @@ glob: GLOBAL arg_decl
+ #include <stdlib.h>
+
+ static void
+-naslerror(const char *s)
++naslerror(naslctxt *parm, const char *s)
+ {
+ fputs(s, stderr);
+ }
Modified: head/security/nessus-libnasl/pkg-plist
==============================================================================
--- head/security/nessus-libnasl/pkg-plist Sun Nov 30 11:16:10 2014 (r373661)
+++ head/security/nessus-libnasl/pkg-plist Sun Nov 30 11:20:35 2014 (r373662)
@@ -8,5 +8,3 @@ lib/libnasl.so.2.2.9
man/man1/nasl.1.gz
man/man1/nasl-config.1.gz
var/nessus/nessus_org.pem
- at dirrmtry var/nessus
- at dirrmtry var
Added: head/security/openvas-libnasl/files/patch-nasl_nasl__grammar.y
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/openvas-libnasl/files/patch-nasl_nasl__grammar.y Sun Nov 30 11:20:35 2014 (r373662)
@@ -0,0 +1,37 @@
+--- nasl/nasl_grammar.y.orig 2009-02-10 11:14:10 UTC
++++ nasl/nasl_grammar.y
+@@ -1,4 +1,6 @@
+ %pure_parser
++%parse-param {void *parm}
++%lex-param {void *parm}
+ %expect 1
+ %{
+ /* Nessus Attack Scripting Language version 2
+@@ -19,9 +21,6 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#define YYPARSE_PARAM parm
+-#define YYLEX_PARAM parm
+-
+ #define LNB (((naslctxt*)parm)->line_nb)
+ #include "includes.h"
+ #include "nasl_tree.h"
+@@ -32,7 +31,7 @@
+ #include "nasl_debug.h"
+ #include "nasl_signature.h"
+
+-static void naslerror(const char *);
++static void naslerror(naslctxt *, const char *);
+ #define YYERROR_VERBOSE
+ %}
+
+@@ -470,7 +469,7 @@ glob: GLOBAL arg_decl
+ #include <stdlib.h>
+
+ static void
+-naslerror(const char *s)
++naslerror(naslctxt *parm, const char *s)
+ {
+ fputs(s, stderr);
+ }
Modified: head/www/htmlcxx/Makefile
==============================================================================
--- head/www/htmlcxx/Makefile Sun Nov 30 11:16:10 2014 (r373661)
+++ head/www/htmlcxx/Makefile Sun Nov 30 11:20:35 2014 (r373662)
@@ -12,13 +12,12 @@ COMMENT= HTML and CSS APIs for C++
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/LGPL_V2
-BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison
-
-USES= iconv libtool
+USES= bison iconv libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE=yes
Modified: head/www/htmlcxx/files/patch-css_syntax.y
==============================================================================
--- head/www/htmlcxx/files/patch-css_syntax.y Sun Nov 30 11:16:10 2014 (r373661)
+++ head/www/htmlcxx/files/patch-css_syntax.y Sun Nov 30 11:20:35 2014 (r373662)
@@ -1,9 +1,30 @@
---- css/css_syntax.y.orig 2012-09-19 15:27:03.000000000 +0800
-+++ css/css_syntax.y 2012-09-19 15:28:12.000000000 +0800
-@@ -1,5 +1,6 @@
+--- css/css_syntax.y.orig 2011-02-13 22:24:53 UTC
++++ css/css_syntax.y
+@@ -1,16 +1,17 @@
%{
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include "css_lex.h"
#include "parser.h"
+
+-#define YYPARSE_PARAM yyparam
+ #define YYERROR_VERBOSE 1
+ //#define YYDEBUG 1
+
+ %}
+
+ %pure_parser
++%parse-param { struct selector_list_t **yyparam }
+
+ %union {
+ char *lexeme;
+@@ -571,7 +572,7 @@ hexcolor
+
+ %%
+
+-int yyerror(char *s) {
++int yyerror(struct selector_list_t **yyparam, char *s) {
+ #if YYDEBUG
+ fprintf(stderr, "Error: %s\n", s);
+ #endif
Modified: head/www/htmlcxx/pkg-plist
==============================================================================
--- head/www/htmlcxx/pkg-plist Sun Nov 30 11:16:10 2014 (r373661)
+++ head/www/htmlcxx/pkg-plist Sun Nov 30 11:20:35 2014 (r373662)
@@ -23,8 +23,3 @@ lib/libhtmlcxx.so
lib/libhtmlcxx.so.3
lib/libhtmlcxx.so.3.1.0
share/htmlcxx/css/default.css
- at dirrm share/htmlcxx/css
- at dirrm share/htmlcxx
- at dirrm include/htmlcxx/html
- at dirrm include/htmlcxx/css
- at dirrm include/htmlcxx
Added: head/www/webkit-gtk2/files/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y Sun Nov 30 11:20:35 2014 (r373662)
@@ -0,0 +1,13 @@
+Allow building with bison 3
+Obtained from http://trac.webkit.org/changeset/154109/trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+
+--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2012-08-20 16:26:06 UTC
++++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -32,6 +32,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
Modified: head/x11/xstroke/files/patch-rec_parse.y
==============================================================================
--- head/x11/xstroke/files/patch-rec_parse.y Sun Nov 30 11:16:10 2014 (r373661)
+++ head/x11/xstroke/files/patch-rec_parse.y Sun Nov 30 11:20:35 2014 (r373662)
@@ -1,5 +1,24 @@
---- rec_parse.y.orig 2001-12-10 18:01:17.000000000 +0100
-+++ rec_parse.y 2009-03-03 00:57:09.000000000 +0100
+--- rec_parse.y.orig 2001-12-10 17:01:17 UTC
++++ rec_parse.y
+@@ -32,9 +32,8 @@
+ #include "dmalloc.h"
+ #endif
+
+-static int yyerror(char *err);
++static int yyerror(rec_t *rec, char *err);
+
+-#define YYPARSE_PARAM rec
+ #define YYERROR_VERBOSE
+
+ #ifdef REC_PARSE_DEBUG
+@@ -47,6 +46,7 @@ static feature_list_t FEATURE_ERROR = {
+ %}
+
+ %pure_parser
++%parse-param { rec_t *rec }
+
+ %union {
+ int ival;
@@ -141,7 +141,7 @@ mode_decl : MODE STRING
| MODE STRING
{
@@ -24,3 +43,12 @@
gesture_list : gesture
{
+@@ -342,7 +344,7 @@ option : OPTION STRING STRING
+
+ %%
+
+-static int yyerror(char *err)
++static int yyerror(rec_t *rec, char *err)
+ {
+ char *loc = rec_lex_location_alloc();
+ fprintf(stderr, "%s: %s\n", loc, err);
More information about the svn-ports-head
mailing list