[143133] trunk/dports/textproc/zorba

[devans at macports.org]

Revision: 143133
          https://trac.macports.org/changeset/143133
Author:   devans at macports.org
Date:     2015-12-04 12:33:02 -0800 (Fri, 04 Dec 2015)
Log Message:
-----------
zorba: update to version 3.1, dependencies, now uses github.

Modified Paths:
--------------
    trunk/dports/textproc/zorba/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/zorba/files/patch-bison-3.0.diff

Modified: trunk/dports/textproc/zorba/Portfile
===================================================================
--- trunk/dports/textproc/zorba/Portfile	2015-12-04 19:27:59 UTC (rev 143132)
+++ trunk/dports/textproc/zorba/Portfile	2015-12-04 20:33:02 UTC (rev 143133)
@@ -3,11 +3,9 @@
 
 PortSystem      1.0
 PortGroup       cmake 1.0
+PortGroup       github 1.0
 
-name            zorba
-version         3.0
-revision        3
-set branch      [join [lrange [split ${version} .] 0 1] .]
+github.setup    28msec zorba 3.1
 license         Apache-2
 categories      textproc devel
 platforms       darwin
@@ -25,24 +23,20 @@
     of the query processor allows a pluggable XML store (e.g. main memory, DOM \
     stores, persistent disk-based large stores, S3 stores).
 
-homepage        http://www.zorba-xquery.com/
-master_sites    https://launchpad.net/zorba/trunk/${branch}/+download
-distfiles       ${name}-${version}${extract.suffix} \
-                ${name}_modules-${version}${extract.suffix}
+homepage        http://www.zorba.io/home
 
-checksums       ${name}-${version}${extract.suffix} \
-                    rmd160  f6add7764e6c538c76f538fa3e2cc226ba36a6f7 \
-                    sha256  8ae73ce11ed522d40f20dc2d7c907176ee5dd9e26bde5a40b8a02dbca9558dfe \
-                ${name}_modules-${version}${extract.suffix} \
-                    rmd160  fb9cac7f26cf0351b7a73f279002d0cda09fdd66 \
-                    sha256  5fc68381f2ffde43f705010b2055df7067a8d8740815805750ab73b602a1957d
+checksums       rmd160  b2bbc7dc718473eccb4f3f03fced5802a15ca827 \
+                sha256  536b5949346c2623be1f068b7cca27e94efcc8df7dc807b61c4b085082f5675b
 
 # In-source builds are not allowed
 cmake.out_of_source yes
 
 patchfiles      patch-src-types-schema-SchemaValidatorFilter.h.diff
-patchfiles-append   patch-bison-3.0.diff
 
+depends_build-append \
+    port:bison \
+    port:flex
+
 depends_lib \
     port:boost \
     port:curl \
@@ -74,12 +68,7 @@
     -DCURL_FOUND=YES \
     -DCURL_INCLUDE_DIR=${prefix}/include \
     -DCURL_LIBRARY=${prefix}/lib/libcurl.dylib \
-    -DZORBA_SUPPRESS_SWIG=YES \
     -DZORBA_XQUERYX=YES
 
 test.env DYLD_LIBRARY_PATH=${worksrcpath}/src
 test.run yes
-
-livecheck.type  regex
-livecheck.url   https://launchpad.net/zorba/+download
-livecheck.regex zorba-(\[0-9.\]+)${extract.suffix}

Deleted: trunk/dports/textproc/zorba/files/patch-bison-3.0.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-bison-3.0.diff	2015-12-04 19:27:59 UTC (rev 143132)
+++ trunk/dports/textproc/zorba/files/patch-bison-3.0.diff	2015-12-04 20:33:02 UTC (rev 143133)
@@ -1,51 +0,0 @@
-Fix build with bison 3
-https://bugs.launchpad.net/zorba/+bug/1227047
---- src/compiler/parser/parser.y.orig	2013-11-06 01:20:44.000000000 -0600
-+++ src/compiler/parser/parser.y	2015-04-13 06:51:08.000000000 -0500
-@@ -31,8 +31,7 @@
- %skeleton "lalr1.cc"  /*  -*- C++ -*- */
- %require "2.4"
- %defines
--%name-prefix="zorba"
--%pure-parser
-+%name-prefix "zorba"
- %error-verbose
- 
- 
-@@ -45,9 +44,9 @@
- 
- 
- #ifdef XQUERY_PARSER
--%define "parser_class_name" "xquery_parser"
-+%define "parser_class_name" { xquery_parser }
- #else
--%define "parser_class_name" "jsoniq_parser"
-+%define "parser_class_name" { jsoniq_parser }
- #endif
- 
- 
-@@ -4635,21 +4634,21 @@
-             $$ = NumericLiteral::new_literal(
-                 LOC(@$), ParseConstants::num_decimal, *$1
-             );
--            delete yylval.decval;
-+            delete yylhs.value.decval;
-         }
-     |   INTEGER_LITERAL
-         {
-             $$ = NumericLiteral::new_literal(
-                 LOC(@$), ParseConstants::num_integer, *$1
-             );
--            delete yylval.ival;
-+            delete yylhs.value.ival;
-         }
-     |   DOUBLE_LITERAL
-         {
-             $$ = NumericLiteral::new_literal(
-                 LOC(@$), ParseConstants::num_double, *$1
-             );
--            delete yylval.dval;
-+            delete yylhs.value.dval;
-         }
-     ;
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/4f288ceb/attachment.html>