Update to qgis 2.6.0 'Brighton'.

See https://www.qgis.org/en/site/forusers/visualchangelog260/index.html Use devel/gflex instead of base flex which doesnt seem to handle %option reentrant, used since 2427546d88 commit parser files generated locally with bison 2.6.2.
2014-11-10 16:05:17 +00:00 · 2014-11-10 16:05:17 +00:00 · 17be03d742
commit 17be03d742
parent 29d2f86c43
20 changed files with 477 additions and 416 deletions
--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@ -1,20 +1,18 @@
-# $OpenBSD: Makefile,v 1.33 2014/10/08 14:36:19 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.34 2014/11/10 16:05:17 landry Exp $

 COMMENT =	desktop geographical information system

 SHARED_ONLY =	Yes

-DISTNAME =	qgis-2.4.0
-REVISION =	0
+DISTNAME =	qgis-2.6.0
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	geo x11

-SHARED_LIBS =	qgis_core	6.0 \
-		qgis_gui	5.0 \
-		qgis_analysis	2.0 \
+SHARED_LIBS =	qgis_core	7.0 \
+		qgis_gui	6.0 \
+		qgis_analysis	3.0 \
 		qgispython	2.0 \
-		qgis_networkanalysis 0.0 \
-		qgissqlanyconnection 0.0 # 2.0
+		qgis_networkanalysis 0.0

 HOMEPAGE =	http://www.qgis.org/

@ -30,6 +28,7 @@ MODULES =	devel/cmake \
 		lang/python

 BUILD_DEPENDS =	x11/py-qt4>=4.8.4 \
+		devel/flex \
 		geo/gdal,-python

 # need to update bison...
@ -58,7 +57,7 @@ WANTLIB += 	ICE SM X11 Xext Xi Xinerama Xrender c expat \
 		mng png pthread util stdc++ z proj \
 		QtGui QtNetwork QtXml QtSql QtCore QtScript QtSvg \
 		QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi \
-		QtTest spatialindex spatialite sqlite3
+		QtTest spatialindex spatialite sqlite3 qscintilla2
 WANTLIB += ${MODPY_WANTLIB} jpeg tiff

 CONFIGURE_ENV+=	VERBOSE=1
--- a/geo/qgis/distinfo
+++ b/geo/qgis/distinfo
@ -1,2 +1,2 @@
-SHA256 (qgis-2.4.0.tar.bz2) = cRt9gd3/RbCDoh8FyKpQk6ajig7kLfzIcyNPzvH83XY=
-SIZE (qgis-2.4.0.tar.bz2) = 85228657
+SHA256 (qgis-2.6.0.tar.bz2) = dUlg8r7UuPhmfUrON1r2nZ15PgQWg+fQHDBxu0oePlw=
+SIZE (qgis-2.6.0.tar.bz2) = 60132057
--- a/geo/qgis/files/qgsexpressionparser.cpp
+++ b/geo/qgis/files/qgsexpressionparser.cpp
@ -50,7 +50,7 @@
 #define YYSKELETON_NAME "yacc.c"

 /* Pure parsers.  */
-#define YYPURE 0
+#define YYPURE 1

 /* Push parsers.  */
 #define YYPUSH 0
@ -70,7 +70,7 @@

 /* Copy the first part of user declarations.  */
 /* Line 336 of yacc.c  */
-#line 16 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 16 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"

 #include <qglobal.h>
 #include <QList>
@ -85,9 +85,16 @@
 // don't redeclare malloc/free
 #define YYINCLUDED_STDLIB_H 1

+struct expression_parser_context;
+#include "qgsexpressionparser.hpp"
+
 //! from lexer
-extern int exp_lex();
-extern void exp_set_input_buffer(const char* buffer);
+typedef void* yyscan_t;
+typedef struct yy_buffer_state* YY_BUFFER_STATE;
+extern int exp_lex_init(yyscan_t* scanner);
+extern int exp_lex_destroy(yyscan_t scanner);
+extern int exp_lex(YYSTYPE* yylval_param, yyscan_t yyscanner);
+extern YY_BUFFER_STATE exp__scan_string(const char* buffer, yyscan_t scanner);

 /** returns parsed tree, otherwise returns NULL and sets parserErrorMsg
    (interface function to be called from QgsExpression)
@ -95,12 +102,20 @@ extern void exp_set_input_buffer(const char* buffer);
 QgsExpression::Node* parseExpression(const QString& str, QString& parserErrorMsg);

 /** error handler for bison */
-void exp_error(const char* msg);
+void exp_error(expression_parser_context* parser_ctx, const char* msg);

-//! varible where the parser error will be stored
-QString gExpParserErrorMsg;
-QgsExpression::Node* gExpParserRootNode;
+struct expression_parser_context
+{
+  // lexer context
+  yyscan_t flex_scanner;

+  // varible where the parser error will be stored
+  QString errorMsg;
+  // root node of the expression
+  QgsExpression::Node* rootNode;
+};
+
+#define scanner parser_ctx->flex_scanner

 // we want verbose error messages
 #define YYERROR_VERBOSE 1
@ -109,7 +124,7 @@ QgsExpression::Node* gExpParserRootNode;


 /* Line 336 of yacc.c  */
-#line 113 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 128 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"

 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@ -129,11 +144,11 @@ QgsExpression::Node* gExpParserRootNode;

 /* In a future release of Bison, this section will be replaced
   by #include "qgsexpressionparser.hpp".  */
-#ifndef EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
-# define EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
+#ifndef EXP_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
+# define EXP_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 #if YYDEBUG
 extern int exp_debug;
@ -188,7 +203,7 @@ extern int exp_debug;
 typedef union YYSTYPE
 {
 /* Line 350 of yacc.c  */
-#line 57 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 77 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"

  QgsExpression::Node* node;
  QgsExpression::NodeList* nodelist;
@ -202,14 +217,13 @@ typedef union YYSTYPE


 /* Line 350 of yacc.c  */
-#line 206 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 221 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif

-extern YYSTYPE exp_lval;

 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@ -219,18 +233,18 @@ int exp_parse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int exp_parse (void);
+int exp_parse (expression_parser_context* parser_ctx);
 #else
 int exp_parse ();
 #endif
 #endif /* ! YYPARSE_PARAM */

-#endif /* !EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP  */
+#endif /* !EXP_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP  */

 /* Copy the second part of user declarations.  */

 /* Line 353 of yacc.c  */
-#line 234 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 248 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"

 #ifdef short
 # undef short
@ -538,11 +552,11 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,   133,   133,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
-     154,   155,   156,   158,   178,   179,   181,   182,   184,   185,
-     188,   191,   215,   216,   217,   218,   222,   223,   227,   228,
-     232
+       0,   153,   153,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   178,   198,   199,   201,   202,   204,   205,
+     208,   211,   235,   236,   237,   238,   242,   243,   247,   248,
+     252
 };
 #endif

@ -753,7 +767,7 @@ do                                                              \
    }                                                           \
  else                                                          \
    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
+      yyerror (parser_ctx, YY_("syntax error: cannot back up")); \
      YYERROR;							\
    }								\
 while (YYID (0))
@ -800,9 +814,9 @@ while (YYID (0))
 /* YYLEX -- calling `yylex' with the right arguments.  */

 #ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex ()
+# define YYLEX yylex (&yylval, scanner)
 #endif

 /* Enable debugging if requested.  */
@ -825,7 +839,7 @@ do {									  \
    {									  \
      YYFPRINTF (stderr, "%s ", Title);					  \
      yy_symbol_print (stderr,						  \
-		  Type, Value); \
+		  Type, Value, parser_ctx); \
      YYFPRINTF (stderr, "\n");						  \
    }									  \
 } while (YYID (0))
@ -839,19 +853,21 @@ do {									  \
 #if (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, expression_parser_context* parser_ctx)
 #else
 static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, parser_ctx)
    FILE *yyoutput;
    int yytype;
    YYSTYPE const * const yyvaluep;
+    expression_parser_context* parser_ctx;
 #endif
 {
  FILE *yyo = yyoutput;
  YYUSE (yyo);
  if (!yyvaluep)
    return;
+  YYUSE (parser_ctx);
 # ifdef YYPRINT
  if (yytype < YYNTOKENS)
    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
@ -873,13 +889,14 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, expression_parser_context* parser_ctx)
 #else
 static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
+yy_symbol_print (yyoutput, yytype, yyvaluep, parser_ctx)
    FILE *yyoutput;
    int yytype;
    YYSTYPE const * const yyvaluep;
+    expression_parser_context* parser_ctx;
 #endif
 {
  if (yytype < YYNTOKENS)
@ -887,7 +904,7 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
  else
    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, parser_ctx);
  YYFPRINTF (yyoutput, ")");
 }

@ -930,12 +947,13 @@ do {								\
 #if (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, expression_parser_context* parser_ctx)
 #else
 static void
-yy_reduce_print (yyvsp, yyrule)
+yy_reduce_print (yyvsp, yyrule, parser_ctx)
    YYSTYPE *yyvsp;
    int yyrule;
+    expression_parser_context* parser_ctx;
 #endif
 {
  int yynrhs = yyr2[yyrule];
@ -949,7 +967,7 @@ yy_reduce_print (yyvsp, yyrule)
      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+		       		       , parser_ctx);
      YYFPRINTF (stderr, "\n");
    }
 }
@ -957,7 +975,7 @@ yy_reduce_print (yyvsp, yyrule)
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
+    yy_reduce_print (yyvsp, Rule, parser_ctx); \
 } while (YYID (0))

 /* Nonzero means print parse trace.  It is left uninitialized so that
@ -1234,16 +1252,18 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 #if (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, expression_parser_context* parser_ctx)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep, parser_ctx)
    const char *yymsg;
    int yytype;
    YYSTYPE *yyvaluep;
+    expression_parser_context* parser_ctx;
 #endif
 {
  YYUSE (yyvaluep);
+  YYUSE (parser_ctx);

  if (!yymsg)
    yymsg = "Deleting";
@ -1253,45 +1273,45 @@ yydestruct (yymsg, yytype, yyvaluep)
    {
      case 31: /* STRING */
 /* Line 1381 of yacc.c  */
-#line 129 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 149 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
 	{ delete ((*yyvaluep).text); };
 /* Line 1381 of yacc.c  */
-#line 1260 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1280 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 	break;
      case 32: /* COLUMN_REF */
 /* Line 1381 of yacc.c  */
-#line 129 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 149 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
 	{ delete ((*yyvaluep).text); };
 /* Line 1381 of yacc.c  */
-#line 1267 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1287 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 	break;
      case 33: /* FUNCTION */
 /* Line 1381 of yacc.c  */
-#line 129 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 149 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
 	{ delete ((*yyvaluep).text); };
 /* Line 1381 of yacc.c  */
-#line 1274 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1294 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 	break;
      case 34: /* SPECIAL_COL */
 /* Line 1381 of yacc.c  */
-#line 129 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 149 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
 	{ delete ((*yyvaluep).text); };
 /* Line 1381 of yacc.c  */
-#line 1281 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1301 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 	break;
      case 42: /* expression */
 /* Line 1381 of yacc.c  */
-#line 127 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 147 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
 	{ delete ((*yyvaluep).node); };
 /* Line 1381 of yacc.c  */
-#line 1288 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1308 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 	break;
      case 43: /* exp_list */
 /* Line 1381 of yacc.c  */
-#line 128 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 148 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
 	{ delete ((*yyvaluep).nodelist); };
 /* Line 1381 of yacc.c  */
-#line 1295 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1315 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
 	break;

      default:
@ -1302,16 +1322,6 @@ yydestruct (yymsg, yytype, yyvaluep)



-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
 /*----------.
 | yyparse.  |
 `----------*/
@ -1330,14 +1340,23 @@ yyparse (YYPARSE_PARAM)
 #if (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (void)
+yyparse (expression_parser_context* parser_ctx)
 #else
 int
-yyparse ()
-
+yyparse (parser_ctx)
+    expression_parser_context* parser_ctx;
 #endif
 #endif
 {
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+    /* Number of syntax errors so far.  */
+    int yynerrs;
+
    int yystate;
    /* Number of tokens to shift before error messages enabled.  */
    int yyerrstatus;
@ -1578,146 +1597,146 @@ yyreduce:
    {
        case 2:
 /* Line 1787 of yacc.c  */
-#line 133 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
-    { gExpParserRootNode = (yyvsp[(1) - (1)].node); }
+#line 153 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
+    { parser_ctx->rootNode = (yyvsp[(1) - (1)].node); }
    break;

  case 3:
 /* Line 1787 of yacc.c  */
-#line 137 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 157 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 4:
 /* Line 1787 of yacc.c  */
-#line 138 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 158 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 5:
 /* Line 1787 of yacc.c  */
-#line 139 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 159 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 6:
 /* Line 1787 of yacc.c  */
-#line 140 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 160 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 7:
 /* Line 1787 of yacc.c  */
-#line 141 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 161 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 8:
 /* Line 1787 of yacc.c  */
-#line 142 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 162 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 9:
 /* Line 1787 of yacc.c  */
-#line 143 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 163 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 10:
 /* Line 1787 of yacc.c  */
-#line 144 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 164 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 11:
 /* Line 1787 of yacc.c  */
-#line 145 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 165 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 12:
 /* Line 1787 of yacc.c  */
-#line 146 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 166 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 13:
 /* Line 1787 of yacc.c  */
-#line 147 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 167 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 14:
 /* Line 1787 of yacc.c  */
-#line 148 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 168 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 15:
 /* Line 1787 of yacc.c  */
-#line 149 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 169 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 16:
 /* Line 1787 of yacc.c  */
-#line 150 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 170 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 17:
 /* Line 1787 of yacc.c  */
-#line 151 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 171 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 18:
 /* Line 1787 of yacc.c  */
-#line 152 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 172 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 19:
 /* Line 1787 of yacc.c  */
-#line 153 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 173 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 20:
 /* Line 1787 of yacc.c  */
-#line 154 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 174 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = BINOP((yyvsp[(2) - (3)].b_op), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 21:
 /* Line 1787 of yacc.c  */
-#line 155 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 175 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeUnaryOperator((yyvsp[(1) - (2)].u_op), (yyvsp[(2) - (2)].node)); }
    break;

  case 22:
 /* Line 1787 of yacc.c  */
-#line 156 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 176 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = (yyvsp[(2) - (3)].node); }
    break;

  case 23:
 /* Line 1787 of yacc.c  */
-#line 159 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 179 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    {
          int fnIndex = QgsExpression::functionIndex(*(yyvsp[(1) - (4)].text));
          if (fnIndex == -1)
          {
            // this should not actually happen because already in lexer we check whether an identifier is a known function
            // (if the name is not known the token is parsed as a column)
-            exp_error("Function is not known");
+            exp_error(parser_ctx, "Function is not known");
            YYERROR;
          }
          if ( QgsExpression::Functions()[fnIndex]->params() != -1
               && QgsExpression::Functions()[fnIndex]->params() != (yyvsp[(3) - (4)].nodelist)->count() )
          {
-            exp_error("Function is called with wrong number of arguments");
+            exp_error(parser_ctx, "Function is called with wrong number of arguments");
            YYERROR;
          }
          (yyval.node) = new QgsExpression::NodeFunction(fnIndex, (yyvsp[(3) - (4)].nodelist));
@ -1727,56 +1746,56 @@ yyreduce:

  case 24:
 /* Line 1787 of yacc.c  */
-#line 178 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 198 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeInOperator((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].nodelist), false);  }
    break;

  case 25:
 /* Line 1787 of yacc.c  */
-#line 179 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 199 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeInOperator((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].nodelist), true); }
    break;

  case 26:
 /* Line 1787 of yacc.c  */
-#line 181 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 201 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = (yyvsp[(2) - (2)].node); }
    break;

  case 27:
 /* Line 1787 of yacc.c  */
-#line 182 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 202 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeUnaryOperator( QgsExpression::uoMinus, (yyvsp[(2) - (2)].node)); }
    break;

  case 28:
 /* Line 1787 of yacc.c  */
-#line 184 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 204 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeCondition((yyvsp[(2) - (3)].whenthenlist)); }
    break;

  case 29:
 /* Line 1787 of yacc.c  */
-#line 185 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 205 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeCondition((yyvsp[(2) - (5)].whenthenlist),(yyvsp[(4) - (5)].node)); }
    break;

  case 30:
 /* Line 1787 of yacc.c  */
-#line 188 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 208 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeColumnRef( *(yyvsp[(1) - (1)].text) ); delete (yyvsp[(1) - (1)].text); }
    break;

  case 31:
 /* Line 1787 of yacc.c  */
-#line 192 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 212 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    {
          int fnIndex = QgsExpression::functionIndex(*(yyvsp[(1) - (1)].text));
          if (fnIndex == -1)
          {
      if ( !QgsExpression::hasSpecialColumn( *(yyvsp[(1) - (1)].text) ) )
 	    {
-	      exp_error("Special column is not known");
+        exp_error(parser_ctx, "Special column is not known");
 	      YYERROR;
 	    }
 	    // $var is equivalent to _specialcol_( "$var" )
@ -1795,61 +1814,61 @@ yyreduce:

  case 32:
 /* Line 1787 of yacc.c  */
-#line 215 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 235 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].numberFloat)) ); }
    break;

  case 33:
 /* Line 1787 of yacc.c  */
-#line 216 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 236 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeLiteral( QVariant((yyvsp[(1) - (1)].numberInt)) ); }
    break;

  case 34:
 /* Line 1787 of yacc.c  */
-#line 217 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 237 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeLiteral( QVariant(*(yyvsp[(1) - (1)].text)) ); delete (yyvsp[(1) - (1)].text); }
    break;

  case 35:
 /* Line 1787 of yacc.c  */
-#line 218 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 238 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.node) = new QgsExpression::NodeLiteral( QVariant() ); }
    break;

  case 36:
 /* Line 1787 of yacc.c  */
-#line 222 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 242 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.nodelist) = (yyvsp[(1) - (3)].nodelist); (yyvsp[(1) - (3)].nodelist)->append((yyvsp[(3) - (3)].node)); }
    break;

  case 37:
 /* Line 1787 of yacc.c  */
-#line 223 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 243 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.nodelist) = new QgsExpression::NodeList(); (yyval.nodelist)->append((yyvsp[(1) - (1)].node)); }
    break;

  case 38:
 /* Line 1787 of yacc.c  */
-#line 227 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 247 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.whenthenlist) = (yyvsp[(1) - (2)].whenthenlist); (yyvsp[(1) - (2)].whenthenlist)->append((yyvsp[(2) - (2)].whenthen)); }
    break;

  case 39:
 /* Line 1787 of yacc.c  */
-#line 228 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 248 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.whenthenlist) = new QgsExpression::WhenThenList(); (yyval.whenthenlist)->append((yyvsp[(1) - (1)].whenthen)); }
    break;

  case 40:
 /* Line 1787 of yacc.c  */
-#line 232 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 252 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
    { (yyval.whenthen) = new QgsExpression::WhenThen((yyvsp[(2) - (4)].node),(yyvsp[(4) - (4)].node)); }
    break;


 /* Line 1787 of yacc.c  */
-#line 1853 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.cpp"
+#line 1872 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.cpp"
      default: break;
    }
  /* User semantic actions sometimes alter yychar, and that requires
@ -1899,7 +1918,7 @@ yyerrlab:
    {
      ++yynerrs;
 #if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
+      yyerror (parser_ctx, YY_("syntax error"));
 #else
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                        yyssp, yytoken)
@ -1926,7 +1945,7 @@ yyerrlab:
                yymsgp = yymsg;
              }
          }
-        yyerror (yymsgp);
+        yyerror (parser_ctx, yymsgp);
        if (yysyntax_error_status == 2)
          goto yyexhaustedlab;
      }
@ -1950,7 +1969,7 @@ yyerrlab:
      else
 	{
 	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
+		      yytoken, &yylval, parser_ctx);
 	  yychar = YYEMPTY;
 	}
    }
@ -2006,7 +2025,7 @@ yyerrlab1:


      yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+		  yystos[yystate], yyvsp, parser_ctx);
      YYPOPSTACK (1);
      yystate = *yyssp;
      YY_STACK_PRINT (yyss, yyssp);
@ -2041,7 +2060,7 @@ yyabortlab:
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+  yyerror (parser_ctx, YY_("memory exhausted"));
  yyresult = 2;
  /* Fall through.  */
 #endif
@ -2053,7 +2072,7 @@ yyreturn:
         user semantic actions for why this is necessary.  */
      yytoken = YYTRANSLATE (yychar);
      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
+                  yytoken, &yylval, parser_ctx);
    }
  /* Do not reclaim the symbols of the rule which action triggered
     this YYABORT or YYACCEPT.  */
@ -2062,7 +2081,7 @@ yyreturn:
  while (yyssp != yyss)
    {
      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+		  yystos[*yyssp], yyvsp, parser_ctx);
      YYPOPSTACK (1);
    }
 #ifndef yyoverflow
@ -2079,31 +2098,36 @@ yyreturn:


 /* Line 2048 of yacc.c  */
-#line 235 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 255 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"
+


 // returns parsed tree, otherwise returns NULL and sets parserErrorMsg
 QgsExpression::Node* parseExpression(const QString& str, QString& parserErrorMsg)
 {
-  gExpParserRootNode = NULL;
-  exp_set_input_buffer(str.toUtf8().constData());
-  int res = exp_parse();
+  expression_parser_context ctx;
+  ctx.rootNode = 0;
+
+  exp_lex_init(&ctx.flex_scanner);
+  exp__scan_string(str.toUtf8().constData(), ctx.flex_scanner);
+  int res = exp_parse(&ctx);
+  exp_lex_destroy(ctx.flex_scanner);

  // list should be empty when parsing was OK
  if (res == 0) // success?
  {
-    return gExpParserRootNode;
+    return ctx.rootNode;
  }
  else // error?
  {
-    parserErrorMsg = gExpParserErrorMsg;
+    parserErrorMsg = ctx.errorMsg;
    return NULL;
  }
 }


-void exp_error(const char* msg)
+void exp_error(expression_parser_context* parser_ctx, const char* msg)
 {
-  gExpParserErrorMsg = msg;
+  parser_ctx->errorMsg = msg;
 }

--- a/geo/qgis/files/qgsexpressionparser.hpp
+++ b/geo/qgis/files/qgsexpressionparser.hpp
@ -30,11 +30,11 @@
   This special exception was added by the Free Software Foundation in
   version 2.2 of Bison.  */

-#ifndef EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
-# define EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
+#ifndef EXP_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
+# define EXP_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 #if YYDEBUG
 extern int exp_debug;
@ -89,7 +89,7 @@ extern int exp_debug;
 typedef union YYSTYPE
 {
 /* Line 2049 of yacc.c  */
-#line 57 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/core/qgsexpressionparser.yy"
+#line 77 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/core/qgsexpressionparser.yy"

  QgsExpression::Node* node;
  QgsExpression::NodeList* nodelist;
@ -103,14 +103,13 @@ typedef union YYSTYPE


 /* Line 2049 of yacc.c  */
-#line 107 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/core/qgsexpressionparser.hpp"
+#line 107 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/core/qgsexpressionparser.hpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif

-extern YYSTYPE exp_lval;

 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@ -120,10 +119,10 @@ int exp_parse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int exp_parse (void);
+int exp_parse (expression_parser_context* parser_ctx);
 #else
 int exp_parse ();
 #endif
 #endif /* ! YYPARSE_PARAM */

-#endif /* !EXP_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP  */
+#endif /* !EXP_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_CORE_QGSEXPRESSIONPARSER_HPP  */
--- a/geo/qgis/files/qgsrastercalcparser.cpp
+++ b/geo/qgis/files/qgsrastercalcparser.cpp
@ -70,7 +70,7 @@

 /* Copy the first part of user declarations.  */
 /* Line 336 of yacc.c  */
-#line 19 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 19 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"

  #include "qgsrastercalcnode.h"

@ -104,7 +104,7 @@
  #define YYERROR_VERBOSE 1

 /* Line 336 of yacc.c  */
-#line 108 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"
+#line 108 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"

 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@ -124,8 +124,8 @@

 /* In a future release of Bison, this section will be replaced
   by #include "qgsrastercalcparser.hpp".  */
-#ifndef RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
-# define RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
+#ifndef RASTER_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
+# define RASTER_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
@ -157,11 +157,11 @@ extern int rasterdebug;
 typedef union YYSTYPE
 {
 /* Line 350 of yacc.c  */
-#line 52 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 52 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
 QgsRasterCalcNode* node; double number; QgsRasterCalcNode::Operator op;

 /* Line 350 of yacc.c  */
-#line 165 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"
+#line 165 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@ -184,12 +184,12 @@ int rasterparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */

-#endif /* !RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP  */
+#endif /* !RASTER_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP  */

 /* Copy the second part of user declarations.  */

 /* Line 353 of yacc.c  */
-#line 193 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"
+#line 193 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"

 #ifdef short
 # undef short
@ -1444,127 +1444,127 @@ yyreduce:
    {
        case 2:
 /* Line 1787 of yacc.c  */
-#line 77 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 77 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    {}
    break;

  case 3:
 /* Line 1787 of yacc.c  */
-#line 81 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 81 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode((yyvsp[(1) - (4)].op), (yyvsp[(3) - (4)].node), 0); joinTmpNodes((yyval.node), (yyvsp[(3) - (4)].node), 0);}
    break;

  case 4:
 /* Line 1787 of yacc.c  */
-#line 82 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 82 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opAND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 5:
 /* Line 1787 of yacc.c  */
-#line 83 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 83 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opOR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 6:
 /* Line 1787 of yacc.c  */
-#line 84 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 84 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opEQ, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 7:
 /* Line 1787 of yacc.c  */
-#line 85 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 85 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opNE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 8:
 /* Line 1787 of yacc.c  */
-#line 86 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 86 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opGT, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 9:
 /* Line 1787 of yacc.c  */
-#line 87 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 87 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opLT, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 10:
 /* Line 1787 of yacc.c  */
-#line 88 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 88 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opGE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 11:
 /* Line 1787 of yacc.c  */
-#line 89 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 89 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opLE, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node) ); joinTmpNodes((yyval.node), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
    break;

  case 12:
 /* Line 1787 of yacc.c  */
-#line 90 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 90 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode(QgsRasterCalcNode::opPOW, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 13:
 /* Line 1787 of yacc.c  */
-#line 91 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 91 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode(QgsRasterCalcNode::opMUL, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 14:
 /* Line 1787 of yacc.c  */
-#line 92 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 92 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode(QgsRasterCalcNode::opDIV, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 15:
 /* Line 1787 of yacc.c  */
-#line 93 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 93 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode(QgsRasterCalcNode::opPLUS, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 16:
 /* Line 1787 of yacc.c  */
-#line 94 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 94 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode(QgsRasterCalcNode::opMINUS, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); joinTmpNodes((yyval.node),(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node)); }
    break;

  case 17:
 /* Line 1787 of yacc.c  */
-#line 95 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 95 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = (yyvsp[(2) - (3)].node); }
    break;

  case 18:
 /* Line 1787 of yacc.c  */
-#line 96 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 96 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = (yyvsp[(2) - (2)].node); }
    break;

  case 19:
 /* Line 1787 of yacc.c  */
-#line 97 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 97 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode( QgsRasterCalcNode::opSIGN, (yyvsp[(2) - (2)].node), 0 ); joinTmpNodes((yyval.node), (yyvsp[(2) - (2)].node), 0); }
    break;

  case 20:
 /* Line 1787 of yacc.c  */
-#line 98 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 98 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode((yyvsp[(1) - (1)].number)); addToTmpNodes((yyval.node)); }
    break;

  case 21:
 /* Line 1787 of yacc.c  */
-#line 99 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 99 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
    { (yyval.node) = new QgsRasterCalcNode(QString::fromUtf8(rastertext)); addToTmpNodes((yyval.node)); }
    break;


 /* Line 1787 of yacc.c  */
-#line 1568 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"
+#line 1568 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/analysis/qgsrastercalcparser.cpp"
      default: break;
    }
  /* User semantic actions sometimes alter yychar, and that requires
@ -1794,7 +1794,7 @@ yyreturn:


 /* Line 2048 of yacc.c  */
-#line 102 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 102 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"


 void addToTmpNodes(QgsRasterCalcNode* node)
--- a/geo/qgis/files/qgsrastercalcparser.hpp
+++ b/geo/qgis/files/qgsrastercalcparser.hpp
@ -30,8 +30,8 @@
   This special exception was added by the Free Software Foundation in
   version 2.2 of Bison.  */

-#ifndef RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
-# define RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
+#ifndef RASTER_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
+# define RASTER_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
@ -63,11 +63,11 @@ extern int rasterdebug;
 typedef union YYSTYPE
 {
 /* Line 2049 of yacc.c  */
-#line 52 "/home/ports/pobj/qgis-2.4.0/qgis-2.4.0/src/analysis/raster/qgsrastercalcparser.yy"
+#line 52 "/usr/obj/ports/qgis-2.6.0/qgis-2.6.0/src/analysis/raster/qgsrastercalcparser.yy"
 QgsRasterCalcNode* node; double number; QgsRasterCalcNode::Operator op;

 /* Line 2049 of yacc.c  */
-#line 71 "/home/ports/pobj/qgis-2.4.0/build-amd64/src/analysis/qgsrastercalcparser.hpp"
+#line 71 "/usr/obj/ports/qgis-2.6.0/build-amd64/src/analysis/qgsrastercalcparser.hpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@ -90,4 +90,4 @@ int rasterparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */

-#endif /* !RASTER_HOME_PORTS_POBJ_QGIS_2_4_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP  */
+#endif /* !RASTER_USR_OBJ_PORTS_QGIS_2_6_0_BUILD_AMD64_SRC_ANALYSIS_QGSRASTERCALCPARSER_HPP  */
--- a/geo/qgis/patches/patch-CMakeLists_txt
+++ b/geo/qgis/patches/patch-CMakeLists_txt
@ -1,9 +1,9 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.7 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-CMakeLists_txt,v 1.8 2014/11/10 16:05:17 landry Exp $
 chunk 1: dont look for bison, since >2.4 is required..
 chunk 2: http://hub.qgis.org/issues/3999
 lots of undefined refs to syms in libc, we dont link shlibs with -lc
--- CMakeLists.txt.orig	Fri Jun 27 14:00:08 2014
-+++ CMakeLists.txt	Mon Aug 18 11:34:39 2014
+--- CMakeLists.txt.orig	Fri Oct 31 15:17:19 2014
+++ CMakeLists.txt	Fri Nov  7 14:32:50 2014
@@ -141,13 +141,13 @@ IF (NOT FLEX_EXECUTABLE)
   MESSAGE(FATAL_ERROR "Couldn't find Flex")
 ENDIF (NOT FLEX_EXECUTABLE)
@ -23,7 +23,7 @@ lots of undefined refs to syms in libc, we dont link shlibs with -lc
 
 #############################################################
 # search for dependencies
-@@ -496,12 +496,6 @@ IF (WIN32)
+@@ -489,12 +489,6 @@ IF (WIN32)
   SET(DLLIMPORT "__declspec(dllimport)")
   SET(DLLEXPORT "__declspec(dllexport)")
 ELSE (WIN32)
--- a/geo/qgis/patches/patch-cmake_FindGDAL_cmake
+++ b/geo/qgis/patches/patch-cmake_FindGDAL_cmake
@ -1,6 +1,6 @@
-$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.4 2014/08/20 08:54:45 landry Exp $
--- cmake/FindGDAL.cmake.orig	Fri Jun 27 14:00:08 2014
-+++ cmake/FindGDAL.cmake	Mon Aug 18 15:49:46 2014
+$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.5 2014/11/10 16:05:17 landry Exp $
+--- cmake/FindGDAL.cmake.orig	Fri Oct 31 15:17:19 2014
+++ cmake/FindGDAL.cmake	Fri Nov  7 14:44:07 2014
@@ -158,7 +158,7 @@ ELSE(WIN32)
             SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
           ENDIF (NOT GDAL_LIBRARY)
--- a/geo/qgis/patches/patch-cmake_FindGEOS_cmake
+++ b/geo/qgis/patches/patch-cmake_FindGEOS_cmake
@ -1,6 +1,6 @@
-$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.5 2014/08/20 08:54:45 landry Exp $
--- cmake/FindGEOS.cmake.orig	Fri Jun 27 14:00:08 2014
-+++ cmake/FindGEOS.cmake	Mon Aug 18 15:49:46 2014
+$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.6 2014/11/10 16:05:17 landry Exp $
+--- cmake/FindGEOS.cmake.orig	Fri Oct 31 15:17:19 2014
+++ cmake/FindGEOS.cmake	Fri Nov  7 14:44:07 2014
@@ -145,7 +145,7 @@ ELSE(WIN32)
             SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
           ENDIF (NOT GEOS_LIBRARY)
--- a/geo/qgis/patches/patch-cmake_FindPostgres_cmake
+++ b/geo/qgis/patches/patch-cmake_FindPostgres_cmake
@ -1,6 +1,6 @@
-$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.4 2014/08/20 08:54:45 landry Exp $
--- cmake/FindPostgres.cmake.orig	Fri Jun 27 14:00:08 2014
-+++ cmake/FindPostgres.cmake	Mon Aug 18 15:49:46 2014
+$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.5 2014/11/10 16:05:17 landry Exp $
+--- cmake/FindPostgres.cmake.orig	Fri Oct 31 15:17:19 2014
+++ cmake/FindPostgres.cmake	Fri Nov  7 14:44:07 2014
@@ -96,7 +96,7 @@ ELSE(WIN32)
         ENDFOREACH(_LIBNAME ${_LIBS})
 
--- a/geo/qgis/patches/patch-cmake_Flex_cmake
+++ b/geo/qgis/patches/patch-cmake_Flex_cmake
@ -0,0 +1,14 @@
+$OpenBSD: patch-cmake_Flex_cmake,v 1.1 2014/11/10 16:05:17 landry Exp $
+Use gflex from ports, our flex doesnt handle %option reentrant
+used since https://github.com/qgis/QGIS/commit/2427546d8850c7f0b2ca191b238a77c49f648510
+--- cmake/Flex.cmake.orig	Fri Nov  7 10:51:41 2014
+++ cmake/Flex.cmake	Fri Nov  7 10:52:43 2014
+@@ -15,7 +15,7 @@ MACRO(FIND_FLEX)
+                      PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
+                     )
+       ELSE(MSVC)
+-        FIND_PROGRAM(FLEX_EXECUTABLE flex)
+        FIND_PROGRAM(FLEX_EXECUTABLE gflex)
+       ENDIF (MSVC)
+         IF (NOT FLEX_EXECUTABLE)
+           MESSAGE(FATAL_ERROR "flex not found - aborting")
--- a/geo/qgis/patches/patch-src_analysis_CMakeLists_txt
+++ b/geo/qgis/patches/patch-src_analysis_CMakeLists_txt
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_analysis_CMakeLists_txt,v 1.1 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_analysis_CMakeLists_txt,v 1.2 2014/11/10 16:05:17 landry Exp $
 dont call bison to generate the parser, and build the pregenerated file instead
--- src/analysis/CMakeLists.txt.orig	Fri Jun 27 14:00:08 2014
-+++ src/analysis/CMakeLists.txt	Mon Aug 18 13:32:52 2014
+--- src/analysis/CMakeLists.txt.orig	Fri Oct 31 15:17:19 2014
+++ src/analysis/CMakeLists.txt	Mon Nov 10 10:59:34 2014
@@ -33,6 +33,7 @@ SET(QGIS_ANALYSIS_SRCS
   raster/qgsrelief.cpp
   raster/qgsrastercalcnode.cpp
--- a/geo/qgis/patches/patch-src_app_qgisapp_cpp
+++ b/geo/qgis/patches/patch-src_app_qgisapp_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_app_qgisapp_cpp,v 1.4 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_app_qgisapp_cpp,v 1.5 2014/11/10 16:05:17 landry Exp $
 Fix paths to docs
--- src/app/qgisapp.cpp.orig	Fri Jun 27 14:00:08 2014
-+++ src/app/qgisapp.cpp	Tue Jul  1 08:53:16 2014
+--- src/app/qgisapp.cpp.orig	Fri Oct 31 15:17:19 2014
+++ src/app/qgisapp.cpp	Fri Nov  7 14:32:50 2014
@@ -1247,7 +1247,7 @@ void QgisApp::createActions()
   mActionQgisHomePage->setShortcut( QString() );
 #endif
@ -11,7 +11,7 @@ Fix paths to docs
 
   connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
   connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
-@@ -7496,7 +7496,7 @@ void QgisApp::helpContents()
+@@ -7684,7 +7684,7 @@ void QgisApp::helpContents()
 
 void QgisApp::apiDocumentation()
 {
@ -20,7 +20,7 @@ Fix paths to docs
   {
     openURL( "api/index.html" );
   }
-@@ -7521,7 +7521,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
+@@ -7709,7 +7709,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
   // open help in user browser
   if ( useQgisDocDirectory )
   {
--- a/geo/qgis/patches/patch-src_app_qgsabout_cpp
+++ b/geo/qgis/patches/patch-src_app_qgsabout_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_app_qgsabout_cpp,v 1.3 2014/08/20 09:00:36 landry Exp $
--- src/app/qgsabout.cpp.orig	Mon Aug 18 17:22:49 2014
-+++ src/app/qgsabout.cpp	Mon Aug 18 17:23:11 2014
-@@ -220,7 +220,7 @@ void QgsAbout::setWhatsNew( )
+$OpenBSD: patch-src_app_qgsabout_cpp,v 1.4 2014/11/10 16:05:17 landry Exp $
+--- src/app/qgsabout.cpp.orig	Fri Oct 31 15:17:19 2014
+++ src/app/qgsabout.cpp	Fri Nov  7 14:32:50 2014
+@@ -220,7 +220,7 @@ void QgsAbout::setWhatsNew()
   QString myStyle = QgsApplication::reportStyleSheet();
   txtWhatsNew->clear();
   txtWhatsNew->document()->setDefaultStyleSheet( myStyle );
--- a/geo/qgis/patches/patch-src_core_CMakeLists_txt
+++ b/geo/qgis/patches/patch-src_core_CMakeLists_txt
@ -1,16 +1,16 @@
-$OpenBSD: patch-src_core_CMakeLists_txt,v 1.6 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_core_CMakeLists_txt,v 1.7 2014/11/10 16:05:17 landry Exp $
 chunk 1/2: dont call bison to generate the parser, and build the pregenerated file instead
--- src/core/CMakeLists.txt.orig	Fri Jun 27 14:00:08 2014
-+++ src/core/CMakeLists.txt	Mon Aug 18 13:32:26 2014
-@@ -74,6 +74,7 @@ SET(QGIS_CORE_SRCS
+--- src/core/CMakeLists.txt.orig	Fri Oct 31 15:17:19 2014
+++ src/core/CMakeLists.txt	Mon Nov 10 10:59:34 2014
+@@ -79,6 +79,7 @@ SET(QGIS_CORE_SRCS
   qgsdistancearea.cpp
   qgserror.cpp
   qgsexpression.cpp
 +  qgsexpressionparser.cpp
   qgsexpression_texts.cpp
+   qgsexpressionfieldbuffer.cpp
   qgsfeature.cpp
-   qgsfeatureiterator.cpp
-@@ -317,7 +318,7 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
+@@ -337,7 +338,7 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
 
 ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll)
 
@ -19,7 +19,7 @@ chunk 1/2: dont call bison to generate the parser, and build the pregenerated fi
 
 SET(QGIS_CORE_MOC_HDRS
 
-@@ -715,9 +716,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
+@@ -760,9 +761,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
 TARGET_LINK_LIBRARIES(qgis_core
   ${QT_QTMAIN_LIBRARY}
   ${QT_QTXML_LIBRARY}
@ -31,4 +31,4 @@ chunk 1/2: dont call bison to generate the parser, and build the pregenerated fi
 +  ${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIB_DEPENDENCIES}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTWEBKIT_LIBRARY}
- 
+   ${QSCINTILLA_LIBRARY}
--- a/geo/qgis/patches/patch-src_core_qgsapplication_cpp
+++ b/geo/qgis/patches/patch-src_core_qgsapplication_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.2 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.3 2014/11/10 16:05:17 landry Exp $
 Fix paths to various doc files, installed in share/doc/qgis
 per doc/CMakeLists.txt patch
--- src/core/qgsapplication.cpp.orig	Fri Jun 27 14:00:08 2014
-+++ src/core/qgsapplication.cpp	Mon Aug 18 17:26:32 2014
+--- src/core/qgsapplication.cpp.orig	Fri Oct 31 15:17:19 2014
+++ src/core/qgsapplication.cpp	Fri Nov  7 14:32:50 2014
@@ -421,21 +421,21 @@ const QString QgsApplication::themeName()
 */
 const QString QgsApplication::authorsFilePath()
@ -28,7 +28,7 @@ per doc/CMakeLists.txt patch
 }
 
 /*!
-@@ -443,7 +443,7 @@ const QString QgsApplication::sponsorsFilePath()
+@@ -443,19 +443,19 @@ const QString QgsApplication::sponsorsFilePath()
 */
 const QString QgsApplication::donorsFilePath()
 {
@ -36,18 +36,14 @@ per doc/CMakeLists.txt patch
 +  return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/DONORS" );
 }
 
- /*!
-@@ -452,7 +452,7 @@ const QString QgsApplication::donorsFilePath()
- */
+ /** Returns the path to the sponsors file. */
 const QString QgsApplication::translatorsFilePath()
 {
 -  return ABISYM( mPkgDataPath ) + QString( "/doc/TRANSLATORS" );
 +  return ABISYM( mPkgDataPath ) + QString( "/../doc/qgis/TRANSLATORS" );
 }
 
- /*!
-@@ -460,7 +460,7 @@ const QString QgsApplication::translatorsFilePath()
- */
+ /** Returns the path to the licence file. */
 const QString QgsApplication::licenceFilePath()
 {
 -  return ABISYM( mPkgDataPath ) + QString( "/doc/LICENSE" );
--- a/geo/qgis/patches/patch-src_core_qgsvectorlayerfeatureiterator_cpp
+++ b/geo/qgis/patches/patch-src_core_qgsvectorlayerfeatureiterator_cpp
@ -1,11 +1,11 @@
-$OpenBSD: patch-src_core_qgsvectorlayerfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_core_qgsvectorlayerfeatureiterator_cpp,v 1.2 2014/11/10 16:05:17 landry Exp $

 http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
 http://hub.qgis.org/issues/10762

--- src/core/qgsvectorlayerfeatureiterator.cpp.orig	Tue Jul  1 09:06:45 2014
-+++ src/core/qgsvectorlayerfeatureiterator.cpp	Tue Jul  1 09:06:56 2014
-@@ -84,7 +84,7 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFea
+--- src/core/qgsvectorlayerfeatureiterator.cpp.orig	Fri Oct 31 15:17:19 2014
+++ src/core/qgsvectorlayerfeatureiterator.cpp	Fri Nov  7 14:32:50 2014
+@@ -86,7 +86,7 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFea
 
 
 QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
--- a/geo/qgis/patches/patch-src_mapserver_CMakeLists_txt
+++ b/geo/qgis/patches/patch-src_mapserver_CMakeLists_txt
@ -1,8 +1,8 @@
-$OpenBSD: patch-src_mapserver_CMakeLists_txt,v 1.3 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_mapserver_CMakeLists_txt,v 1.4 2014/11/10 16:05:17 landry Exp $
 install sld & xml in share/qgis
--- src/mapserver/CMakeLists.txt.orig	Fri Jun 27 14:00:08 2014
-+++ src/mapserver/CMakeLists.txt	Tue Jul  1 08:53:17 2014
-@@ -122,6 +122,6 @@ INSTALL(TARGETS
+--- src/mapserver/CMakeLists.txt.orig	Fri Oct 31 15:17:19 2014
+++ src/mapserver/CMakeLists.txt	Fri Nov  7 14:32:50 2014
+@@ -123,6 +123,6 @@ INSTALL(TARGETS
 INSTALL(FILES
   admin.sld
   wms_metadata.xml
--- a/geo/qgis/patches/patch-src_providers_memory_qgsmemoryfeatureiterator_cpp
+++ b/geo/qgis/patches/patch-src_providers_memory_qgsmemoryfeatureiterator_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-src_providers_memory_qgsmemoryfeatureiterator_cpp,v 1.1 2014/08/20 08:54:45 landry Exp $
+$OpenBSD: patch-src_providers_memory_qgsmemoryfeatureiterator_cpp,v 1.2 2014/11/10 16:05:17 landry Exp $
 http://osgeo-org.1560.x6.nabble.com/Compiling-QGIS-2-4-with-GCC-4-4-debian-squeeze-td5146777.html
 http://hub.qgis.org/issues/10762
--- src/providers/memory/qgsmemoryfeatureiterator.cpp.orig	Tue Jul  1 09:44:06 2014
-+++ src/providers/memory/qgsmemoryfeatureiterator.cpp	Tue Jul  1 09:44:19 2014
+--- src/providers/memory/qgsmemoryfeatureiterator.cpp.orig	Fri Oct 31 15:17:19 2014
+++ src/providers/memory/qgsmemoryfeatureiterator.cpp	Fri Nov  7 14:32:50 2014
@@ -23,7 +23,7 @@
 
 
@ -10,5 +10,5 @@ http://hub.qgis.org/issues/10762
 -    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
 +    : QgsAbstractFeatureIteratorFromSource<QgsMemoryFeatureSource>( source, ownSource, request )
     , mSelectRectGeom( 0 )
+     , mSubsetExpression( 0 )
 {
- 
--- a/geo/qgis/pkg/PLIST
+++ b/geo/qgis/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2014/08/20 08:54:45 landry Exp $
+@comment $OpenBSD: PLIST,v 1.12 2014/11/10 16:05:17 landry Exp $
@bin bin/qbrowser
@bin bin/qgis
@bin bin/qgis_bench
@ -25,6 +25,7 @@ include/qgis/qgis.h
 include/qgis/qgisgui.h
 include/qgis/qgisinterface.h
 include/qgis/qgisplugin.h
+include/qgis/qgsactionmenu.h
 include/qgis/qgsaddremoveitemcommand.h
 include/qgis/qgsaddremovemultiframecommand.h
 include/qgis/qgsannotationitem.h
@ -57,23 +58,36 @@ include/qgis/qgscategorizedsymbolrendererv2.h
 include/qgis/qgscategorizedsymbolrendererv2widget.h
 include/qgis/qgscharacterselectdialog.h
 include/qgis/qgscheckboxconfigdlg.h
-include/qgis/qgscheckboxwidget.h
 include/qgis/qgscheckboxwidgetfactory.h
-include/qgis/qgsclassificationwidget.h
+include/qgis/qgscheckboxwidgetwrapper.h
+include/qgis/qgsclassificationwidgetwrapper.h
 include/qgis/qgsclassificationwidgetwrapperfactory.h
 include/qgis/qgsclipper.h
 include/qgis/qgscliptominmaxenhancement.h
+include/qgis/qgscodeeditor.h
+include/qgis/qgscodeeditorcss.h
+include/qgis/qgscodeeditorhtml.h
+include/qgis/qgscodeeditorpython.h
+include/qgis/qgscodeeditorsql.h
 include/qgis/qgscollapsiblegroupbox.h
 include/qgis/qgscolorbrewerpalette.h
 include/qgis/qgscolorbutton.h
+include/qgis/qgscolorbuttonv2.h
 include/qgis/qgscolordialog.h
 include/qgis/qgscolorrampcombobox.h
 include/qgis/qgscolorrampshader.h
-include/qgis/qgscolorwidget.h
+include/qgis/qgscolorscheme.h
+include/qgis/qgscolorschemelist.h
+include/qgis/qgscolorschemeregistry.h
+include/qgis/qgscolorswatchgrid.h
 include/qgis/qgscolorwidgetfactory.h
+include/qgis/qgscolorwidgets.h
+include/qgis/qgscolorwidgetwrapper.h
 include/qgis/qgscomposerarrow.h
 include/qgis/qgscomposerattributetable.h
 include/qgis/qgscomposerattributetablemodel.h
+include/qgis/qgscomposerattributetablemodelv2.h
+include/qgis/qgscomposerattributetablev2.h
 include/qgis/qgscomposereffect.h
 include/qgis/qgscomposerframe.h
 include/qgis/qgscomposerhtml.h
@ -85,15 +99,21 @@ include/qgis/qgscomposerlegend.h
 include/qgis/qgscomposerlegenditem.h
 include/qgis/qgscomposerlegendstyle.h
 include/qgis/qgscomposermap.h
+include/qgis/qgscomposermapgrid.h
+include/qgis/qgscomposermapitem.h
+include/qgis/qgscomposermapoverview.h
+include/qgis/qgscomposermodel.h
 include/qgis/qgscomposermousehandles.h
 include/qgis/qgscomposermultiframe.h
 include/qgis/qgscomposermultiframecommand.h
+include/qgis/qgscomposerobject.h
 include/qgis/qgscomposerpicture.h
 include/qgis/qgscomposerruler.h
 include/qgis/qgscomposerscalebar.h
 include/qgis/qgscomposershape.h
 include/qgis/qgscomposertable.h
 include/qgis/qgscomposertablecolumn.h
+include/qgis/qgscomposertablev2.h
 include/qgis/qgscomposertexttable.h
 include/qgis/qgscomposerview.h
 include/qgis/qgscomposition.h
@ -119,6 +139,7 @@ include/qgis/qgsdatadefinedsymboldialog.h
 include/qgis/qgsdataitem.h
 include/qgis/qgsdataprovider.h
 include/qgis/qgsdatasourceuri.h
+include/qgis/qgsdatetimeedit.h
 include/qgis/qgsdatetimeeditconfig.h
 include/qgis/qgsdatetimeeditfactory.h
 include/qgis/qgsdatetimeeditwrapper.h
@ -136,6 +157,7 @@ include/qgis/qgsdialog.h
 include/qgis/qgsdistancearcproperter.h
 include/qgis/qgsdistancearea.h
 include/qgis/qgsdoubleboxscalebarstyle.h
+include/qgis/qgsdoublespinbox.h
 include/qgis/qgsdualview.h
 include/qgis/qgsdummyconfigdlg.h
 include/qgis/qgseditorconfigwidget.h
@ -146,14 +168,15 @@ include/qgis/qgseditorwidgetwrapper.h
 include/qgis/qgsellipsesymbollayerv2.h
 include/qgis/qgsellipsesymbollayerv2widget.h
 include/qgis/qgsencodingfiledialog.h
-include/qgis/qgsenumerationwidget.h
 include/qgis/qgsenumerationwidgetfactory.h
+include/qgis/qgsenumerationwidgetwrapper.h
 include/qgis/qgserror.h
 include/qgis/qgserrordialog.h
 include/qgis/qgsexception.h
 include/qgis/qgsexpression.h
 include/qgis/qgsexpressionbuilderdialog.h
 include/qgis/qgsexpressionbuilderwidget.h
+include/qgis/qgsexpressionfieldbuffer.h
 include/qgis/qgsexpressionhighlighter.h
 include/qgis/qgsexpressionselectiondialog.h
 include/qgis/qgsextentgroupbox.h
@ -174,8 +197,8 @@ include/qgis/qgsfieldmodel.h
 include/qgis/qgsfieldproxymodel.h
 include/qgis/qgsfieldvalidator.h
 include/qgis/qgsfiledropedit.h
-include/qgis/qgsfilenamewidget.h
 include/qgis/qgsfilenamewidgetfactory.h
+include/qgis/qgsfilenamewidgetwrapper.h
 include/qgis/qgsfillsymbollayerv2.h
 include/qgis/qgsfilterlineedit.h
 include/qgis/qgsfontutils.h
@ -199,14 +222,15 @@ include/qgis/qgsgraphbuilder.h
 include/qgis/qgsgraphbuilderintr.h
 include/qgis/qgsgraphdirector.h
 include/qgis/qgsgridfilewriter.h
-include/qgis/qgshiddenwidget.h
 include/qgis/qgshiddenwidgetfactory.h
+include/qgis/qgshiddenwidgetwrapper.h
 include/qgis/qgshighlight.h
 include/qgis/qgshillshadefilter.h
 include/qgis/qgshistogramdiagram.h
 include/qgis/qgshtmlannotationitem.h
 include/qgis/qgshttptransaction.h
 include/qgis/qgshuesaturationfilter.h
+include/qgis/qgsidentifymenu.h
 include/qgis/qgsidwinterpolator.h
 include/qgis/qgsifeatureselectionmanager.h
 include/qgis/qgsinterpolator.h
@ -221,6 +245,7 @@ include/qgis/qgslayertreegroup.h
 include/qgis/qgslayertreelayer.h
 include/qgis/qgslayertreemapcanvasbridge.h
 include/qgis/qgslayertreemodel.h
+include/qgis/qgslayertreemodellegendnode.h
 include/qgis/qgslayertreenode.h
 include/qgis/qgslayertreeregistrybridge.h
 include/qgis/qgslayertreeutils.h
@ -229,6 +254,9 @@ include/qgis/qgslayertreeviewdefaultactions.h
 include/qgis/qgslegacyhelpers.h
 include/qgis/qgslegendinterface.h
 include/qgis/qgslegendmodel.h
+include/qgis/qgslegendrenderer.h
+include/qgis/qgslegendsettings.h
+include/qgis/qgslegendsymbolitemv2.h
 include/qgis/qgslinearminmaxenhancement.h
 include/qgis/qgslinearminmaxenhancementwithclip.h
 include/qgis/qgslinesymbollayerv2.h
@ -241,9 +269,11 @@ include/qgis/qgsmapcanvas.h
 include/qgis/qgsmapcanvasitem.h
 include/qgis/qgsmapcanvasmap.h
 include/qgis/qgsmapcanvassnapper.h
+include/qgis/qgsmaphittest.h
 include/qgis/qgsmaplayer.h
 include/qgis/qgsmaplayeractionregistry.h
 include/qgis/qgsmaplayercombobox.h
+include/qgis/qgsmaplayerlegend.h
 include/qgis/qgsmaplayermodel.h
 include/qgis/qgsmaplayerproxymodel.h
 include/qgis/qgsmaplayerregistry.h
@ -259,6 +289,7 @@ include/qgis/qgsmaptip.h
 include/qgis/qgsmaptool.h
 include/qgis/qgsmaptoolemitpoint.h
 include/qgis/qgsmaptoolidentify.h
+include/qgis/qgsmaptoolidentifyfeature.h
 include/qgis/qgsmaptoolpan.h
 include/qgis/qgsmaptoolzoom.h
 include/qgis/qgsmaptopixel.h
@ -274,6 +305,7 @@ include/qgis/qgsmimedatautils.h
 include/qgis/qgsmultibandcolorrenderer.h
 include/qgis/qgsmultibandcolorrendererwidget.h
 include/qgis/qgsnetworkaccessmanager.h
+include/qgis/qgsnetworkcontentfetcher.h
 include/qgis/qgsnetworkreplyparser.h
 include/qgis/qgsnewhttpconnection.h
 include/qgis/qgsnewvectorlayerdialog.h
@ -299,8 +331,8 @@ include/qgis/qgspallabeling.h
 include/qgis/qgspaperitem.h
 include/qgis/qgspenstylecombobox.h
 include/qgis/qgsphotoconfigdlg.h
-include/qgis/qgsphotowidget.h
 include/qgis/qgsphotowidgetfactory.h
+include/qgis/qgsphotowidgetwrapper.h
 include/qgis/qgspiediagram.h
 include/qgis/qgspluginlayer.h
 include/qgis/qgspluginlayerregistry.h
@ -323,8 +355,8 @@ include/qgis/qgspseudocolorshader.h
 include/qgis/qgspythonrunner.h
 include/qgis/qgsquerybuilder.h
 include/qgis/qgsrangeconfigdlg.h
-include/qgis/qgsrangewidget.h
 include/qgis/qgsrangewidgetfactory.h
+include/qgis/qgsrangewidgetwrapper.h
 include/qgis/qgsraster.h
 include/qgis/qgsrasterbandstats.h
 include/qgis/qgsrasterblock.h
@ -361,14 +393,15 @@ include/qgis/qgsrasterviewport.h
 include/qgis/qgsrectangle.h
 include/qgis/qgsrelation.h
 include/qgis/qgsrelationadddlg.h
-include/qgis/qgsrelationeditor.h
+include/qgis/qgsrelationeditorwidget.h
 include/qgis/qgsrelationmanager.h
 include/qgis/qgsrelationmanagerdialog.h
+include/qgis/qgsrelationreferenceconfigdlg.h
 include/qgis/qgsrelationreferencefactory.h
 include/qgis/qgsrelationreferencewidget.h
+include/qgis/qgsrelationreferencewidgetwrapper.h
 include/qgis/qgsrelationwidgetwrapper.h
 include/qgis/qgsrelief.h
-include/qgis/qgsrelreferenceconfigdlg.h
 include/qgis/qgsrenderchecker.h
 include/qgis/qgsrendercontext.h
 include/qgis/qgsrendererv2.h
@ -401,6 +434,7 @@ include/qgis/qgsslopefilter.h
 include/qgis/qgssmartgroupeditordialog.h
 include/qgis/qgssnapper.h
 include/qgis/qgsspatialindex.h
+include/qgis/qgsspinbox.h
 include/qgis/qgsstylev2.h
 include/qgis/qgsstylev2exportimportdialog.h
 include/qgis/qgsstylev2managerdialog.h
@ -420,24 +454,24 @@ include/qgis/qgssymbolv2selectordialog.h
 include/qgis/qgstextannotationitem.h
 include/qgis/qgstextdiagram.h
 include/qgis/qgstexteditconfigdlg.h
-include/qgis/qgstexteditwidget.h
 include/qgis/qgstexteditwidgetfactory.h
+include/qgis/qgstexteditwrapper.h
 include/qgis/qgsticksscalebarstyle.h
 include/qgis/qgstininterpolator.h
 include/qgis/qgstolerance.h
 include/qgis/qgstotalcurvaturefilter.h
 include/qgis/qgsuniquevaluesconfigdlg.h
-include/qgis/qgsuniquevaluewidget.h
 include/qgis/qgsuniquevaluewidgetfactory.h
+include/qgis/qgsuniquevaluewidgetwrapper.h
 include/qgis/qgsunitselectionwidget.h
-include/qgis/qgsuuidwidget.h
 include/qgis/qgsuuidwidgetfactory.h
+include/qgis/qgsuuidwidgetwrapper.h
 include/qgis/qgsvaluemapconfigdlg.h
-include/qgis/qgsvaluemapwidget.h
 include/qgis/qgsvaluemapwidgetfactory.h
+include/qgis/qgsvaluemapwidgetwrapper.h
 include/qgis/qgsvaluerelationconfigdlg.h
-include/qgis/qgsvaluerelationwidget.h
 include/qgis/qgsvaluerelationwidgetfactory.h
+include/qgis/qgsvaluerelationwidgetwrapper.h
 include/qgis/qgsvectorcolorbrewercolorrampv2dialog.h
 include/qgis/qgsvectorcolorrampv2.h
 include/qgis/qgsvectordataprovider.h
@ -459,8 +493,8 @@ include/qgis/qgsvectorrandomcolorrampv2dialog.h
 include/qgis/qgsvectorsimplifymethod.h
 include/qgis/qgsvertexmarker.h
 include/qgis/qgswebviewconfigdlg.h
-include/qgis/qgswebviewwidget.h
 include/qgis/qgswebviewwidgetfactory.h
+include/qgis/qgswebviewwidgetwrapper.h
 include/qgis/qgswidgetwrapper.h
 include/qgis/qgszonalstatistics.h
 include/qgis/ui_qgscredentialdialog.h
@ -480,7 +514,6 @@ include/qgis/ui_qgssublayersdialogbase.h
@lib lib/libqgis_gui.so.${LIBqgis_gui_VERSION}
@lib lib/libqgis_networkanalysis.so.${LIBqgis_networkanalysis_VERSION}
@lib lib/libqgispython.so.${LIBqgispython_VERSION}
-@lib lib/libqgissqlanyconnection.so.${LIBqgissqlanyconnection_VERSION}
 lib/qgis/
@bin lib/qgis/crssync
 lib/qgis/plugins/
@ -506,8 +539,6 @@ lib/qgis/plugins/libroadgraphplugin.so
 lib/qgis/plugins/libspatialiteprovider.so
 lib/qgis/plugins/libspatialqueryplugin.so
 lib/qgis/plugins/libspitplugin.so
-lib/qgis/plugins/libsqlanywhereplugin.so
-lib/qgis/plugins/libsqlanywhereprovider.so
 lib/qgis/plugins/libtopolplugin.so
 lib/qgis/plugins/libwcsprovider.so
 lib/qgis/plugins/libwfsprovider.so
@ -538,41 +569,27 @@ share/qgis/
 share/qgis/FindQGIS.cmake
 share/qgis/admin.sld
 share/qgis/i18n/
-share/qgis/i18n/qgis_af.qm
 share/qgis/i18n/qgis_ar.qm
-share/qgis/i18n/qgis_bg.qm
-share/qgis/i18n/qgis_bn.qm
 share/qgis/i18n/qgis_bs.qm
-share/qgis/i18n/qgis_ca.qm
 share/qgis/i18n/qgis_cs.qm
 share/qgis/i18n/qgis_da.qm
 share/qgis/i18n/qgis_de.qm
 share/qgis/i18n/qgis_el.qm
-share/qgis/i18n/qgis_en.qm
 share/qgis/i18n/qgis_es.qm
 share/qgis/i18n/qgis_et.qm
 share/qgis/i18n/qgis_eu.qm
-share/qgis/i18n/qgis_fa.qm
 share/qgis/i18n/qgis_fi.qm
 share/qgis/i18n/qgis_fr.qm
 share/qgis/i18n/qgis_gl.qm
-share/qgis/i18n/qgis_he.qm
-share/qgis/i18n/qgis_hi.qm
 share/qgis/i18n/qgis_hr.qm
 share/qgis/i18n/qgis_hu.qm
 share/qgis/i18n/qgis_id.qm
-share/qgis/i18n/qgis_is.qm
 share/qgis/i18n/qgis_it.qm
 share/qgis/i18n/qgis_ja.qm
-share/qgis/i18n/qgis_ka.qm
 share/qgis/i18n/qgis_km.qm
 share/qgis/i18n/qgis_ko.qm
-share/qgis/i18n/qgis_lo.qm
 share/qgis/i18n/qgis_lt.qm
 share/qgis/i18n/qgis_lv.qm
-share/qgis/i18n/qgis_ml.qm
-share/qgis/i18n/qgis_mn.qm
-share/qgis/i18n/qgis_mr.qm
 share/qgis/i18n/qgis_nb.qm
 share/qgis/i18n/qgis_nl.qm
 share/qgis/i18n/qgis_pl.qm
@ -582,19 +599,11 @@ share/qgis/i18n/qgis_ro.qm
 share/qgis/i18n/qgis_ru.qm
 share/qgis/i18n/qgis_sk.qm
 share/qgis/i18n/qgis_sl.qm
-share/qgis/i18n/qgis_sq.qm
 share/qgis/i18n/qgis_sr_Cyrl.qm
 share/qgis/i18n/qgis_sr_Latn.qm
 share/qgis/i18n/qgis_sv.qm
-share/qgis/i18n/qgis_sw.qm
-share/qgis/i18n/qgis_ta.qm
-share/qgis/i18n/qgis_te.qm
-share/qgis/i18n/qgis_th.qm
-share/qgis/i18n/qgis_tl.qm
 share/qgis/i18n/qgis_tr.qm
 share/qgis/i18n/qgis_uk.qm
-share/qgis/i18n/qgis_vi.qm
-share/qgis/i18n/qgis_xh.qm
 share/qgis/i18n/qgis_zh_CN.qm
 share/qgis/i18n/qgis_zh_TW.qm
 share/qgis/images/
@ -840,6 +849,7 @@ share/qgis/python/plugins/MetaSearch/dialogs/xmldialog.py
 share/qgis/python/plugins/MetaSearch/images/
 share/qgis/python/plugins/MetaSearch/images/MetaSearch.png
 share/qgis/python/plugins/MetaSearch/images/help.png
+share/qgis/python/plugins/MetaSearch/link_types.py
 share/qgis/python/plugins/MetaSearch/metadata.txt
 share/qgis/python/plugins/MetaSearch/plugin.py
 share/qgis/python/plugins/MetaSearch/resources/
@ -849,16 +859,10 @@ share/qgis/python/plugins/MetaSearch/resources/templates/record_metadata_dc.html
 share/qgis/python/plugins/MetaSearch/resources/templates/service_metadata.html
 share/qgis/python/plugins/MetaSearch/resources/templates/xml_highlight.html
 share/qgis/python/plugins/MetaSearch/ui/
-share/qgis/python/plugins/MetaSearch/ui/__init__.py
-share/qgis/python/plugins/MetaSearch/ui/maindialog.py
 share/qgis/python/plugins/MetaSearch/ui/maindialog.ui
-share/qgis/python/plugins/MetaSearch/ui/manageconnectionsdialog.py
 share/qgis/python/plugins/MetaSearch/ui/manageconnectionsdialog.ui
-share/qgis/python/plugins/MetaSearch/ui/newconnectiondialog.py
 share/qgis/python/plugins/MetaSearch/ui/newconnectiondialog.ui
-share/qgis/python/plugins/MetaSearch/ui/recorddialog.py
 share/qgis/python/plugins/MetaSearch/ui/recorddialog.ui
-share/qgis/python/plugins/MetaSearch/ui/xmldialog.py
 share/qgis/python/plugins/MetaSearch/ui/xmldialog.ui
 share/qgis/python/plugins/MetaSearch/util.py
 share/qgis/python/plugins/db_manager/
@ -1066,6 +1070,7 @@ share/qgis/python/plugins/fTools/tools/ui_frmRandPoints.py
 share/qgis/python/plugins/fTools/tools/ui_frmRandom.py
 share/qgis/python/plugins/fTools/tools/ui_frmReProject.py
 share/qgis/python/plugins/fTools/tools/ui_frmRegPoints.py
+share/qgis/python/plugins/fTools/tools/ui_frmSelectByLocation.py
 share/qgis/python/plugins/fTools/tools/ui_frmSimplify.py
 share/qgis/python/plugins/fTools/tools/ui_frmSpatialIndex.py
 share/qgis/python/plugins/fTools/tools/ui_frmSpatialJoin.py
@ -1111,16 +1116,13 @@ share/qgis/python/plugins/processing/algs/gdal/information.py
 share/qgis/python/plugins/processing/algs/gdal/merge.py
 share/qgis/python/plugins/processing/algs/gdal/nearblack.py
 share/qgis/python/plugins/processing/algs/gdal/ogr2ogr.py
+share/qgis/python/plugins/processing/algs/gdal/ogr2ogrclip.py
+share/qgis/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
 share/qgis/python/plugins/processing/algs/gdal/ogrinfo.py
 share/qgis/python/plugins/processing/algs/gdal/ogrsql.py
 share/qgis/python/plugins/processing/algs/gdal/pct2rgb.py
 share/qgis/python/plugins/processing/algs/gdal/polygonize.py
 share/qgis/python/plugins/processing/algs/gdal/proximity.py
-share/qgis/python/plugins/processing/algs/gdal/pyogr/
-share/qgis/python/plugins/processing/algs/gdal/pyogr/__init__.py
-share/qgis/python/plugins/processing/algs/gdal/pyogr/ogr2ogr.py
-share/qgis/python/plugins/processing/algs/gdal/pyogr/ogrds.py
-share/qgis/python/plugins/processing/algs/gdal/pyogr/ogrvrt.py
 share/qgis/python/plugins/processing/algs/gdal/rasterize.py
 share/qgis/python/plugins/processing/algs/gdal/rgb2pct.py
 share/qgis/python/plugins/processing/algs/gdal/roughness.py
@ -1243,6 +1245,7 @@ share/qgis/python/plugins/processing/algs/grass/description/r.terraflow.txt
 share/qgis/python/plugins/processing/algs/grass/description/r.thin.txt
 share/qgis/python/plugins/processing/algs/grass/description/r.to.vect.txt
 share/qgis/python/plugins/processing/algs/grass/description/r.topidx.txt
+share/qgis/python/plugins/processing/algs/grass/description/r.univar.txt
 share/qgis/python/plugins/processing/algs/grass/description/r.volume.txt
 share/qgis/python/plugins/processing/algs/grass/description/r.walk.txt
 share/qgis/python/plugins/processing/algs/grass/description/r.water.outlet.txt
@ -1313,6 +1316,7 @@ share/qgis/python/plugins/processing/algs/grass/ext/r_info.py
 share/qgis/python/plugins/processing/algs/grass/ext/r_regression_line.py
 share/qgis/python/plugins/processing/algs/grass/ext/r_report.py
 share/qgis/python/plugins/processing/algs/grass/ext/r_stats.py
+share/qgis/python/plugins/processing/algs/grass/ext/r_sum.py
 share/qgis/python/plugins/processing/algs/grass/ext/v_class.py
 share/qgis/python/plugins/processing/algs/grass/ext/v_info.py
 share/qgis/python/plugins/processing/algs/grass/ext/v_normal.py
@ -1326,7 +1330,6 @@ share/qgis/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
 share/qgis/python/plugins/processing/algs/grass7/Grass7Utils.py
 share/qgis/python/plugins/processing/algs/grass7/__init__.py
 share/qgis/python/plugins/processing/algs/grass7/description/
-share/qgis/python/plugins/processing/algs/grass7/description/TODO.txt
 share/qgis/python/plugins/processing/algs/grass7/description/i.atcorr.txt
 share/qgis/python/plugins/processing/algs/grass7/description/i.fft.txt
 share/qgis/python/plugins/processing/algs/grass7/description/i.his.rgb.txt
@ -1505,13 +1508,17 @@ share/qgis/python/plugins/processing/algs/lidar/
 share/qgis/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py
 share/qgis/python/plugins/processing/algs/lidar/__init__.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/
+share/qgis/python/plugins/processing/algs/lidar/fusion/ASCII2DTM.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/CanopyMaxima.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/CanopyModel.py
+share/qgis/python/plugins/processing/algs/lidar/fusion/Catalog.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/ClipData.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/CloudMetrics.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/Cover.py
-share/qgis/python/plugins/processing/algs/lidar/fusion/DensityMetrics.py
+share/qgis/python/plugins/processing/algs/lidar/fusion/Csv2Grid.py
+share/qgis/python/plugins/processing/algs/lidar/fusion/DTM2TIF.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/FilterData.py
+share/qgis/python/plugins/processing/algs/lidar/fusion/FirstLastReturn.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/FusionAlgorithm.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/FusionUtils.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/GridMetrics.py
@ -1519,6 +1526,8 @@ share/qgis/python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/GroundFilter.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/MergeData.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/OpenViewerAction.py
+share/qgis/python/plugins/processing/algs/lidar/fusion/PolyClipData.py
+share/qgis/python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py
 share/qgis/python/plugins/processing/algs/lidar/fusion/__init__.py
 share/qgis/python/plugins/processing/algs/lidar/lastools/
 share/qgis/python/plugins/processing/algs/lidar/lastools/LAStoolsAlgorithm.py
@ -1813,94 +1822,170 @@ share/qgis/python/plugins/processing/algs/qgis/
 share/qgis/python/plugins/processing/algs/qgis/AddTableField.py
 share/qgis/python/plugins/processing/algs/qgis/AutoincrementalField.py
 share/qgis/python/plugins/processing/algs/qgis/BarPlot.py
+share/qgis/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py
+share/qgis/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py
+share/qgis/python/plugins/processing/algs/qgis/Buffer.py
+share/qgis/python/plugins/processing/algs/qgis/Centroids.py
+share/qgis/python/plugins/processing/algs/qgis/Clip.py
 share/qgis/python/plugins/processing/algs/qgis/ConcaveHull.py
+share/qgis/python/plugins/processing/algs/qgis/ConvexHull.py
 share/qgis/python/plugins/processing/algs/qgis/CreateConstantRaster.py
+share/qgis/python/plugins/processing/algs/qgis/Delaunay.py
+share/qgis/python/plugins/processing/algs/qgis/DeleteColumn.py
+share/qgis/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py
+share/qgis/python/plugins/processing/algs/qgis/DensifyGeometries.py
+share/qgis/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
+share/qgis/python/plugins/processing/algs/qgis/Difference.py
+share/qgis/python/plugins/processing/algs/qgis/Dissolve.py
+share/qgis/python/plugins/processing/algs/qgis/Eliminate.py
 share/qgis/python/plugins/processing/algs/qgis/EquivalentNumField.py
 share/qgis/python/plugins/processing/algs/qgis/Explode.py
+share/qgis/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
+share/qgis/python/plugins/processing/algs/qgis/ExtentFromLayer.py
+share/qgis/python/plugins/processing/algs/qgis/ExtractByAttribute.py
+share/qgis/python/plugins/processing/algs/qgis/ExtractByLocation.py
+share/qgis/python/plugins/processing/algs/qgis/ExtractNodes.py
 share/qgis/python/plugins/processing/algs/qgis/FieldPyculator.py
 share/qgis/python/plugins/processing/algs/qgis/FieldsCalculator.py
+share/qgis/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py
+share/qgis/python/plugins/processing/algs/qgis/GeometryConvert.py
+share/qgis/python/plugins/processing/algs/qgis/Grid.py
+share/qgis/python/plugins/processing/algs/qgis/Gridify.py
+share/qgis/python/plugins/processing/algs/qgis/HubDistance.py
+share/qgis/python/plugins/processing/algs/qgis/HubLines.py
 share/qgis/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
+share/qgis/python/plugins/processing/algs/qgis/Intersection.py
 share/qgis/python/plugins/processing/algs/qgis/JoinAttributes.py
+share/qgis/python/plugins/processing/algs/qgis/LinesIntersection.py
+share/qgis/python/plugins/processing/algs/qgis/LinesToPolygons.py
 share/qgis/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py
+share/qgis/python/plugins/processing/algs/qgis/MeanCoords.py
+share/qgis/python/plugins/processing/algs/qgis/Merge.py
+share/qgis/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
+share/qgis/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py
+share/qgis/python/plugins/processing/algs/qgis/PointDistance.py
 share/qgis/python/plugins/processing/algs/qgis/PointsDisplacement.py
 share/qgis/python/plugins/processing/algs/qgis/PointsFromLines.py
 share/qgis/python/plugins/processing/algs/qgis/PointsFromPolygons.py
+share/qgis/python/plugins/processing/algs/qgis/PointsInPolygon.py
+share/qgis/python/plugins/processing/algs/qgis/PointsInPolygonUnique.py
+share/qgis/python/plugins/processing/algs/qgis/PointsInPolygonWeighted.py
 share/qgis/python/plugins/processing/algs/qgis/PointsLayerFromTable.py
 share/qgis/python/plugins/processing/algs/qgis/PointsToPaths.py
 share/qgis/python/plugins/processing/algs/qgis/PolarPlot.py
 share/qgis/python/plugins/processing/algs/qgis/Polygonize.py
+share/qgis/python/plugins/processing/algs/qgis/PolygonsToLines.py
 share/qgis/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
 share/qgis/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
+share/qgis/python/plugins/processing/algs/qgis/RandomExtract.py
+share/qgis/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsExtent.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsLayer.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py
+share/qgis/python/plugins/processing/algs/qgis/RandomSelection.py
+share/qgis/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py
 share/qgis/python/plugins/processing/algs/qgis/RasterLayerHistogram.py
 share/qgis/python/plugins/processing/algs/qgis/RasterLayerStatistics.py
+share/qgis/python/plugins/processing/algs/qgis/ReprojectLayer.py
 share/qgis/python/plugins/processing/algs/qgis/SaveSelectedFeatures.py
+share/qgis/python/plugins/processing/algs/qgis/SelectByAttribute.py
+share/qgis/python/plugins/processing/algs/qgis/SelectByExpression.py
+share/qgis/python/plugins/processing/algs/qgis/SelectByLocation.py
 share/qgis/python/plugins/processing/algs/qgis/SetRasterStyle.py
 share/qgis/python/plugins/processing/algs/qgis/SetVectorStyle.py
+share/qgis/python/plugins/processing/algs/qgis/SimplifyGeometries.py
+share/qgis/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
+share/qgis/python/plugins/processing/algs/qgis/SpatialJoin.py
 share/qgis/python/plugins/processing/algs/qgis/StatisticsByCategories.py
+share/qgis/python/plugins/processing/algs/qgis/SumLines.py
+share/qgis/python/plugins/processing/algs/qgis/TextToFloat.py
+share/qgis/python/plugins/processing/algs/qgis/Union.py
+share/qgis/python/plugins/processing/algs/qgis/UniqueValues.py
+share/qgis/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py
 share/qgis/python/plugins/processing/algs/qgis/VectorLayerHistogram.py
 share/qgis/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py
+share/qgis/python/plugins/processing/algs/qgis/VoronoiPolygons.py
 share/qgis/python/plugins/processing/algs/qgis/ZonalStatistics.py
 share/qgis/python/plugins/processing/algs/qgis/__init__.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/
-share/qgis/python/plugins/processing/algs/qgis/ftools/BasicStatisticsNumbers.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/BasicStatisticsStrings.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Buffer.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Centroids.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Clip.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/ConvexHull.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Delaunay.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/DensifyGeometries.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/DensifyGeometriesInterval.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Difference.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Dissolve.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Eliminate.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/ExportGeometryInfo.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/ExtentFromLayer.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/ExtractByLocation.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/ExtractNodes.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/FixedDistanceBuffer.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Intersection.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/LinesIntersection.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/LinesToPolygons.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/MeanCoords.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/MultipartToSingleparts.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/NearestNeighbourAnalysis.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/PointDistance.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/PointsInPolygon.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/PointsInPolygonUnique.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/PointsInPolygonWeighted.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/PolygonsToLines.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/RandomExtract.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/RandomExtractWithinSubsets.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/RandomSelection.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/RandomSelectionWithinSubsets.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/ReprojectLayer.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/SelectByLocation.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/SimplifyGeometries.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/SinglePartsToMultiparts.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/SpatialJoin.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/SumLines.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/Union.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/UniqueValues.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/VariableDistanceBuffer.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/VoronoiPolygons.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/__init__.py
-share/qgis/python/plugins/processing/algs/qgis/ftools/copyright.txt
-share/qgis/python/plugins/processing/algs/qgis/ftools/voronoi.py
-share/qgis/python/plugins/processing/algs/qgis/mmqgisx/
-share/qgis/python/plugins/processing/algs/qgis/mmqgisx/MMQGISXAlgorithms.py
-share/qgis/python/plugins/processing/algs/qgis/mmqgisx/__init__.py
-share/qgis/python/plugins/processing/algs/qgis/mmqgisx/copyright.txt
+share/qgis/python/plugins/processing/algs/qgis/help/
+share/qgis/python/plugins/processing/algs/qgis/help/addautoincrementalfield.rst
+share/qgis/python/plugins/processing/algs/qgis/help/addfieldtoattributestable.rst
+share/qgis/python/plugins/processing/algs/qgis/help/advancedpythonfieldcalculator.rst
+share/qgis/python/plugins/processing/algs/qgis/help/basicstatisticsfornumericfields.rst
+share/qgis/python/plugins/processing/algs/qgis/help/basicstatisticsfortextfields.rst
+share/qgis/python/plugins/processing/algs/qgis/help/clip.rst
+share/qgis/python/plugins/processing/algs/qgis/help/convertgeometrytype.rst
+share/qgis/python/plugins/processing/algs/qgis/help/convexhull.rst
+share/qgis/python/plugins/processing/algs/qgis/help/countpointsinpolygon.rst
+share/qgis/python/plugins/processing/algs/qgis/help/countpointsinpolygonweighted.rst
+share/qgis/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst
+share/qgis/python/plugins/processing/algs/qgis/help/createconstantrasterlayer.rst
+share/qgis/python/plugins/processing/algs/qgis/help/createequivalentnumericalfield.rst
+share/qgis/python/plugins/processing/algs/qgis/help/creategrid.rst
+share/qgis/python/plugins/processing/algs/qgis/help/delaunaytriangulation.rst
+share/qgis/python/plugins/processing/algs/qgis/help/deletecolumn.rst
+share/qgis/python/plugins/processing/algs/qgis/help/deleteduplicategeometries.rst
+share/qgis/python/plugins/processing/algs/qgis/help/densifygeometries.rst
+share/qgis/python/plugins/processing/algs/qgis/help/densifygeometriesgivenaninterval.rst
+share/qgis/python/plugins/processing/algs/qgis/help/difference.rst
+share/qgis/python/plugins/processing/algs/qgis/help/dissolve.rst
+share/qgis/python/plugins/processing/algs/qgis/help/distancematrix.rst
+share/qgis/python/plugins/processing/algs/qgis/help/distancetonearesthub.rst
+share/qgis/python/plugins/processing/algs/qgis/help/explodelines.rst
+share/qgis/python/plugins/processing/algs/qgis/help/exportaddgeometrycolumns.rst
+share/qgis/python/plugins/processing/algs/qgis/help/extractnodes.rst
+share/qgis/python/plugins/processing/algs/qgis/help/fieldcalculator.rst
+share/qgis/python/plugins/processing/algs/qgis/help/fixeddistancebuffer.rst
+share/qgis/python/plugins/processing/algs/qgis/help/hublines.rst
+share/qgis/python/plugins/processing/algs/qgis/help/intersection.rst
+share/qgis/python/plugins/processing/algs/qgis/help/joinattributestable.rst
+share/qgis/python/plugins/processing/algs/qgis/help/lineintersections.rst
+share/qgis/python/plugins/processing/algs/qgis/help/linestopolygons.rst
+share/qgis/python/plugins/processing/algs/qgis/help/listuniquevalues.rst
+share/qgis/python/plugins/processing/algs/qgis/help/meancoordinates.rst
+share/qgis/python/plugins/processing/algs/qgis/help/mergevectorlayers.rst
+share/qgis/python/plugins/processing/algs/qgis/help/multiparttosingleparts.rst
+share/qgis/python/plugins/processing/algs/qgis/help/nearestneighbouranalysis.rst
+share/qgis/python/plugins/processing/algs/qgis/help/pointsdisplacement.rst
+share/qgis/python/plugins/processing/algs/qgis/help/pointsfromlines.rst
+share/qgis/python/plugins/processing/algs/qgis/help/pointsfrompolygons.rst
+share/qgis/python/plugins/processing/algs/qgis/help/pointslayerfromtable.rst
+share/qgis/python/plugins/processing/algs/qgis/help/polygoncentroids.rst
+share/qgis/python/plugins/processing/algs/qgis/help/polygonfromlayerextent.rst
+share/qgis/python/plugins/processing/algs/qgis/help/polygonstolines.rst
+share/qgis/python/plugins/processing/algs/qgis/help/randomselection.rst
+share/qgis/python/plugins/processing/algs/qgis/help/randomselectionwithinsubsets.rst
+share/qgis/python/plugins/processing/algs/qgis/help/rasterlayerstatistics.rst
+share/qgis/python/plugins/processing/algs/qgis/help/reprojectlayer.rst
+share/qgis/python/plugins/processing/algs/qgis/help/saveselectedfeatures.rst
+share/qgis/python/plugins/processing/algs/qgis/help/selectbyattribute.rst
+share/qgis/python/plugins/processing/algs/qgis/help/selectbylocation.rst
+share/qgis/python/plugins/processing/algs/qgis/help/simplifygeometries.rst
+share/qgis/python/plugins/processing/algs/qgis/help/singlepartstomultipart.rst
+share/qgis/python/plugins/processing/algs/qgis/help/snappointstogrid.rst
+share/qgis/python/plugins/processing/algs/qgis/help/statisticsbycategories.rst
+share/qgis/python/plugins/processing/algs/qgis/help/sumlinelengths.rst
+share/qgis/python/plugins/processing/algs/qgis/help/texttofloat.rst
+share/qgis/python/plugins/processing/algs/qgis/help/union.rst
+share/qgis/python/plugins/processing/algs/qgis/help/variabledistancebuffer.rst
+share/qgis/python/plugins/processing/algs/qgis/help/voronoipolygons.rst
+share/qgis/python/plugins/processing/algs/qgis/help/zonalstatistics.rst
 share/qgis/python/plugins/processing/algs/qgis/postgis_utils.py
+share/qgis/python/plugins/processing/algs/qgis/scripts/
+share/qgis/python/plugins/processing/algs/qgis/scripts/Create_points_along_lines.py
+share/qgis/python/plugins/processing/algs/qgis/scripts/Fill_holes.py
+share/qgis/python/plugins/processing/algs/qgis/scripts/Fill_holes.py.help
+share/qgis/python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py
+share/qgis/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
+share/qgis/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py.help
+share/qgis/python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py
 share/qgis/python/plugins/processing/algs/qgis/ui/
 share/qgis/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
 share/qgis/python/plugins/processing/algs/qgis/ui/__init__.py
 share/qgis/python/plugins/processing/algs/qgis/ui/ui_DlgFieldsCalculator.py
+share/qgis/python/plugins/processing/algs/qgis/voronoi.py
 share/qgis/python/plugins/processing/algs/r/
 share/qgis/python/plugins/processing/algs/r/RAlgorithm.py
 share/qgis/python/plugins/processing/algs/r/RAlgorithmProvider.py
@ -1937,13 +2022,23 @@ share/qgis/python/plugins/processing/algs/saga/SagaUtils.py
 share/qgis/python/plugins/processing/algs/saga/SplitRGBBands.py
 share/qgis/python/plugins/processing/algs/saga/__init__.py
 share/qgis/python/plugins/processing/algs/saga/description/
+share/qgis/python/plugins/processing/algs/saga/description/2.0.8_AddPolygonAttributestoPoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.0.8_GetShapesExtents.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.0.8_InverseDistanceWeighted.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.0.8_MergeShapesLayers.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.0.8_Merging.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.0.8_OrdinaryKriging.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.0.8_PolygonDissolve.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.0.8_ShapesBuffer.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.0.8_Slope,Aspect,Curvature.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.0.8_SortGrid.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.0.8_SplitShapesLayerRandomly.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_AddPolygonAttributestoPoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_GetShapesExtents.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_GridCellIndex.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_InverseDistanceWeighted.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_MergeLayers.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_Mosaicking.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_OrdinaryKriging.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_PointStatisticsforPolygons.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_PolygonDifference.txt
@ -1956,12 +2051,14 @@ share/qgis/python/plugins/processing/algs/saga/description/2.1_PolygonUnion.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_PolygonUpdate.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_ShapesBuffer.txt
 share/qgis/python/plugins/processing/algs/saga/description/2.1_ShapesBufferFixed.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_Slope,Aspect,Curvature.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_SplitShapesLayerRandomly.txt
+share/qgis/python/plugins/processing/algs/saga/description/2.1_TransposeGrids.txt
 share/qgis/python/plugins/processing/algs/saga/description/AccumulatedCost(Anisotropic).txt
 share/qgis/python/plugins/processing/algs/saga/description/AccumulatedCost(Isotropic).txt
 share/qgis/python/plugins/processing/algs/saga/description/AddCoordinatestopoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/AddGridValuestoPoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/AddGridValuestoShapes.txt
-share/qgis/python/plugins/processing/algs/saga/description/AddPolygonAttributestoPoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/Aggregate.txt
 share/qgis/python/plugins/processing/algs/saga/description/AggregatePointObservations.txt
 share/qgis/python/plugins/processing/algs/saga/description/AggregationIndex.txt
@ -1995,9 +2092,9 @@ share/qgis/python/plugins/processing/algs/saga/description/ConvertMultipointstoP
 share/qgis/python/plugins/processing/algs/saga/description/ConvertPointstoLine(s).txt
 share/qgis/python/plugins/processing/algs/saga/description/ConvertPolygonLineVerticestoPoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/ConvertPolygonstoLines.txt
-share/qgis/python/plugins/processing/algs/saga/description/ConvertTabletoPoints.txt
 share/qgis/python/plugins/processing/algs/saga/description/ConvexHull.txt
 share/qgis/python/plugins/processing/algs/saga/description/CreateGraticule.txt
+share/qgis/python/plugins/processing/algs/saga/description/CropToData.txt
 share/qgis/python/plugins/processing/algs/saga/description/Cross-ClassificationandTabulation.txt
 share/qgis/python/plugins/processing/algs/saga/description/CrossProfiles.txt
 share/qgis/python/plugins/processing/algs/saga/description/CubicSplineApproximation.txt
@ -2010,7 +2107,6 @@ share/qgis/python/plugins/processing/algs/saga/description/DiurnalAnisotropicHea
 share/qgis/python/plugins/processing/algs/saga/description/DownslopeDistanceGradient.txt
 share/qgis/python/plugins/processing/algs/saga/description/EdgeContamination.txt
 share/qgis/python/plugins/processing/algs/saga/description/EffectiveAirFlowHeights.txt
-share/qgis/python/plugins/processing/algs/saga/description/EnumerateTableField.txt
 share/qgis/python/plugins/processing/algs/saga/description/FastRegionGrowingAlgorithm.txt
 share/qgis/python/plugins/processing/algs/saga/description/FastRepresentativeness.txt
 share/qgis/python/plugins/processing/algs/saga/description/FillGapsinRecords.txt
@ -2076,8 +2172,6 @@ share/qgis/python/plugins/processing/algs/saga/description/LineSimplification.tx
 share/qgis/python/plugins/processing/algs/saga/description/LocalMinimaandMaxima.txt
 share/qgis/python/plugins/processing/algs/saga/description/MajorityFilter.txt
 share/qgis/python/plugins/processing/algs/saga/description/MassBalanceIndex.txt
-share/qgis/python/plugins/processing/algs/saga/description/MergeShapesLayers.txt
-share/qgis/python/plugins/processing/algs/saga/description/Merging.txt
 share/qgis/python/plugins/processing/algs/saga/description/MetricConversions.txt
 share/qgis/python/plugins/processing/algs/saga/description/MinimumDistanceAnalysis.txt
 share/qgis/python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt
@ -2138,12 +2232,9 @@ share/qgis/python/plugins/processing/algs/saga/description/Simulation.txt
 share/qgis/python/plugins/processing/algs/saga/description/SinkDrainageRouteDetection.txt
 share/qgis/python/plugins/processing/algs/saga/description/SinkRemoval.txt
 share/qgis/python/plugins/processing/algs/saga/description/SkyViewFactor.txt
-share/qgis/python/plugins/processing/algs/saga/description/Slope,Aspect,Curvature.txt
 share/qgis/python/plugins/processing/algs/saga/description/SlopeLength.txt
 share/qgis/python/plugins/processing/algs/saga/description/SoilTextureClassification.txt
-share/qgis/python/plugins/processing/algs/saga/description/SortGrid.txt
 share/qgis/python/plugins/processing/algs/saga/description/SpatialPointPatternAnalysis.txt
-share/qgis/python/plugins/processing/algs/saga/description/SplitShapesLayerRandomly.txt
 share/qgis/python/plugins/processing/algs/saga/description/StatisticsforGrids.txt
 share/qgis/python/plugins/processing/algs/saga/description/StrahlerOrder.txt
 share/qgis/python/plugins/processing/algs/saga/description/StreamPowerIndex.txt
@ -2459,19 +2550,18 @@ share/qgis/python/plugins/processing/core/Processing.py
 share/qgis/python/plugins/processing/core/ProcessingConfig.py
 share/qgis/python/plugins/processing/core/ProcessingLog.py
 share/qgis/python/plugins/processing/core/ProcessingResults.py
-share/qgis/python/plugins/processing/core/RasterWriter.py
-share/qgis/python/plugins/processing/core/SilentProgress.py
-share/qgis/python/plugins/processing/core/TableWriter.py
-share/qgis/python/plugins/processing/core/VectorWriter.py
-share/qgis/python/plugins/processing/core/WrongHelpFileException.py
 share/qgis/python/plugins/processing/core/__init__.py
+share/qgis/python/plugins/processing/core/outputs.py
+share/qgis/python/plugins/processing/core/parameters.py
 share/qgis/python/plugins/processing/gui/
 share/qgis/python/plugins/processing/gui/AlgorithmClassification.py
 share/qgis/python/plugins/processing/gui/AlgorithmExecutionDialog.py
+share/qgis/python/plugins/processing/gui/AlgorithmExecutor.py
 share/qgis/python/plugins/processing/gui/AutofillDialog.py
 share/qgis/python/plugins/processing/gui/BatchInputSelectionPanel.py
 share/qgis/python/plugins/processing/gui/BatchOutputSelectionPanel.py
 share/qgis/python/plugins/processing/gui/BatchProcessingDialog.py
+share/qgis/python/plugins/processing/gui/CMakeLists.txt
 share/qgis/python/plugins/processing/gui/CommanderWindow.py
 share/qgis/python/plugins/processing/gui/ConfigDialog.py
 share/qgis/python/plugins/processing/gui/ContextAction.py
@ -2512,10 +2602,11 @@ share/qgis/python/plugins/processing/gui/RenderingStyles.py
 share/qgis/python/plugins/processing/gui/ResultsDialog.py
 share/qgis/python/plugins/processing/gui/ScriptEdit.py
 share/qgis/python/plugins/processing/gui/ScriptEditorDialog.py
+share/qgis/python/plugins/processing/gui/SilentProgress.py
 share/qgis/python/plugins/processing/gui/TestTools.py
 share/qgis/python/plugins/processing/gui/ToolboxAction.py
-share/qgis/python/plugins/processing/gui/UnthreadedAlgorithmExecutor.py
 share/qgis/python/plugins/processing/gui/__init__.py
+share/qgis/python/plugins/processing/gui/algclasssification.txt
 share/qgis/python/plugins/processing/images/
 share/qgis/python/plugins/processing/images/alg.png
 share/qgis/python/plugins/processing/images/commander.png
@ -2547,7 +2638,6 @@ share/qgis/python/plugins/processing/metadata.txt
 share/qgis/python/plugins/processing/modeler/
 share/qgis/python/plugins/processing/modeler/AddModelFromFileAction.py
 share/qgis/python/plugins/processing/modeler/CalculatorModelerAlgorithm.py
-share/qgis/python/plugins/processing/modeler/CalculatorModelerParametersDialog.py
 share/qgis/python/plugins/processing/modeler/CreateNewModelAction.py
 share/qgis/python/plugins/processing/modeler/DeleteModelAction.py
 share/qgis/python/plugins/processing/modeler/EditModelAction.py
@ -2562,59 +2652,10 @@ share/qgis/python/plugins/processing/modeler/ModelerParametersDialog.py
 share/qgis/python/plugins/processing/modeler/ModelerScene.py
 share/qgis/python/plugins/processing/modeler/ModelerUtils.py
 share/qgis/python/plugins/processing/modeler/MultilineTextPanel.py
-share/qgis/python/plugins/processing/modeler/Providers.py
 share/qgis/python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py
-share/qgis/python/plugins/processing/modeler/SaveAsPythonScriptAction.py
 share/qgis/python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py
 share/qgis/python/plugins/processing/modeler/WrongModelException.py
 share/qgis/python/plugins/processing/modeler/__init__.py
-share/qgis/python/plugins/processing/modeler/models/
-share/qgis/python/plugins/processing/modeler/models/Extract_raster_to_CSV.model
-share/qgis/python/plugins/processing/modeler/models/Extract_raster_to_shape.model
-share/qgis/python/plugins/processing/modeler/models/contours.model
-share/qgis/python/plugins/processing/modeler/models/emptystring.model
-share/qgis/python/plugins/processing/modeler/models/fieldautoextent.model
-share/qgis/python/plugins/processing/modeler/models/fieldextent.model
-share/qgis/python/plugins/processing/modeler/models/modelscript.model
-share/qgis/python/plugins/processing/modeler/models/noinputs.model
-share/qgis/python/plugins/processing/modeler/models/notinorder.model
-share/qgis/python/plugins/processing/modeler/models/numericaloutput.model
-share/qgis/python/plugins/processing/modeler/models/optionalfield.model
-share/qgis/python/plugins/processing/modeler/models/sagagrass.model
-share/qgis/python/plugins/processing/modeler/models/simplemodel.model
-share/qgis/python/plugins/processing/modeler/models/watersheds.model
-share/qgis/python/plugins/processing/outputs/
-share/qgis/python/plugins/processing/outputs/Output.py
-share/qgis/python/plugins/processing/outputs/OutputDirectory.py
-share/qgis/python/plugins/processing/outputs/OutputExtent.py
-share/qgis/python/plugins/processing/outputs/OutputFactory.py
-share/qgis/python/plugins/processing/outputs/OutputFile.py
-share/qgis/python/plugins/processing/outputs/OutputHTML.py
-share/qgis/python/plugins/processing/outputs/OutputNumber.py
-share/qgis/python/plugins/processing/outputs/OutputRaster.py
-share/qgis/python/plugins/processing/outputs/OutputString.py
-share/qgis/python/plugins/processing/outputs/OutputTable.py
-share/qgis/python/plugins/processing/outputs/OutputVector.py
-share/qgis/python/plugins/processing/outputs/__init__.py
-share/qgis/python/plugins/processing/parameters/
-share/qgis/python/plugins/processing/parameters/Parameter.py
-share/qgis/python/plugins/processing/parameters/ParameterBoolean.py
-share/qgis/python/plugins/processing/parameters/ParameterCrs.py
-share/qgis/python/plugins/processing/parameters/ParameterDataObject.py
-share/qgis/python/plugins/processing/parameters/ParameterExtent.py
-share/qgis/python/plugins/processing/parameters/ParameterFactory.py
-share/qgis/python/plugins/processing/parameters/ParameterFile.py
-share/qgis/python/plugins/processing/parameters/ParameterFixedTable.py
-share/qgis/python/plugins/processing/parameters/ParameterMultipleInput.py
-share/qgis/python/plugins/processing/parameters/ParameterNumber.py
-share/qgis/python/plugins/processing/parameters/ParameterRange.py
-share/qgis/python/plugins/processing/parameters/ParameterRaster.py
-share/qgis/python/plugins/processing/parameters/ParameterSelection.py
-share/qgis/python/plugins/processing/parameters/ParameterString.py
-share/qgis/python/plugins/processing/parameters/ParameterTable.py
-share/qgis/python/plugins/processing/parameters/ParameterTableField.py
-share/qgis/python/plugins/processing/parameters/ParameterVector.py
-share/qgis/python/plugins/processing/parameters/__init__.py
 share/qgis/python/plugins/processing/resources_rc.py
 share/qgis/python/plugins/processing/script/
 share/qgis/python/plugins/processing/script/AddScriptFromFileAction.py
@ -2623,22 +2664,6 @@ share/qgis/python/plugins/processing/script/ScriptAlgorithmProvider.py
 share/qgis/python/plugins/processing/script/ScriptUtils.py
 share/qgis/python/plugins/processing/script/WrongScriptException.py
 share/qgis/python/plugins/processing/script/__init__.py
-share/qgis/python/plugins/processing/script/scripts/
-share/qgis/python/plugins/processing/script/scripts/A_script_that_returns_a_number.py
-share/qgis/python/plugins/processing/script/scripts/Batch_replace_in_string_via_regex_dictionary.py
-share/qgis/python/plugins/processing/script/scripts/Chainage.py
-share/qgis/python/plugins/processing/script/scripts/Create_rasters_from_canvas_for_each_vector_layer_feature_extent.py
-share/qgis/python/plugins/processing/script/scripts/Create_tiling_from_vector_layer.py
-share/qgis/python/plugins/processing/script/scripts/Extract_raster_values_to_CSV.py
-share/qgis/python/plugins/processing/script/scripts/Extract_raster_values_to_shapefile.py
-share/qgis/python/plugins/processing/script/scripts/Hex_grid_from_layer_bounds.py
-share/qgis/python/plugins/processing/script/scripts/Load_test_data.py
-share/qgis/python/plugins/processing/script/scripts/Number_of_unique_values_in_classes.py
-share/qgis/python/plugins/processing/script/scripts/Points_from_vector.py
-share/qgis/python/plugins/processing/script/scripts/Save_selected_features.py
-share/qgis/python/plugins/processing/script/scripts/Split_vector_layer_by_attribute.py
-share/qgis/python/plugins/processing/script/scripts/Summarize.py
-share/qgis/python/plugins/processing/script/scripts/Unique_values_count.py
 share/qgis/python/plugins/processing/tests/
 share/qgis/python/plugins/processing/tests/GdalTest.py
 share/qgis/python/plugins/processing/tests/GeoAlgorithmTest.py
@ -3057,6 +3082,7 @@ share/qgis/python/pytz/zoneinfo/Antarctica/Palmer
 share/qgis/python/pytz/zoneinfo/Antarctica/Rothera
 share/qgis/python/pytz/zoneinfo/Antarctica/South_Pole
 share/qgis/python/pytz/zoneinfo/Antarctica/Syowa
+share/qgis/python/pytz/zoneinfo/Antarctica/Troll
 share/qgis/python/pytz/zoneinfo/Antarctica/Vostok
 share/qgis/python/pytz/zoneinfo/Arctic/
 share/qgis/python/pytz/zoneinfo/Arctic/Longyearbyen
@ -3077,6 +3103,7 @@ share/qgis/python/pytz/zoneinfo/Asia/Beirut
 share/qgis/python/pytz/zoneinfo/Asia/Bishkek
 share/qgis/python/pytz/zoneinfo/Asia/Brunei
 share/qgis/python/pytz/zoneinfo/Asia/Calcutta
+share/qgis/python/pytz/zoneinfo/Asia/Chita
 share/qgis/python/pytz/zoneinfo/Asia/Choibalsan
 share/qgis/python/pytz/zoneinfo/Asia/Chongqing
 share/qgis/python/pytz/zoneinfo/Asia/Chungking
@ -3134,6 +3161,7 @@ share/qgis/python/pytz/zoneinfo/Asia/Samarkand
 share/qgis/python/pytz/zoneinfo/Asia/Seoul
 share/qgis/python/pytz/zoneinfo/Asia/Shanghai
 share/qgis/python/pytz/zoneinfo/Asia/Singapore
+share/qgis/python/pytz/zoneinfo/Asia/Srednekolymsk
 share/qgis/python/pytz/zoneinfo/Asia/Taipei
 share/qgis/python/pytz/zoneinfo/Asia/Tashkent
 share/qgis/python/pytz/zoneinfo/Asia/Tbilisi
@ -3425,6 +3453,7 @@ share/qgis/python/pytz/zoneinfo/iso3166.tab
 share/qgis/python/pytz/zoneinfo/localtime
 share/qgis/python/pytz/zoneinfo/posixrules
 share/qgis/python/pytz/zoneinfo/zone.tab
+share/qgis/python/pytz/zoneinfo/zone1970.tab
 share/qgis/python/qgis/
 share/qgis/python/qgis/__init__.py
 share/qgis/python/qgis/_analysis.so