pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/cre2 Updated devel/cr2 from 0.1b6 to 0.3.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/6dab93aa8631
branches: trunk
changeset: 362164:6dab93aa8631
user: mef <mef%pkgsrc.org@localhost>
date: Sun May 07 03:13:24 2017 +0000
description:
Updated devel/cr2 from 0.1b6 to 0.3.4
--------------------------------
0.3.4 2017-04-04
- bumped version number to 0.3.4, added credits
0.3.3 2016-09-15
- development of building infrastructure, better selection of C++11
0.3.2 2016-09-14
- udpated installation infrastructure to work with recent revision
of re2 under the autotools
0.3.1 2016-03-18
- bumped version number to 0.3.1
0.3.0 2016-03-17
- bumped version number to 0.3.0
0.2.0 2016-02-16
- documentation review
diffstat:
devel/cre2/Makefile | 8 +-
devel/cre2/distinfo | 11 +-
devel/cre2/patches/patch-src_cre2.cpp | 112 ----------------------------------
3 files changed, 9 insertions(+), 122 deletions(-)
diffs (150 lines):
diff -r 09509e98bc8b -r 6dab93aa8631 devel/cre2/Makefile
--- a/devel/cre2/Makefile Sun May 07 02:02:24 2017 +0000
+++ b/devel/cre2/Makefile Sun May 07 03:13:24 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2017/05/03 08:38:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2017/05/07 03:13:24 mef Exp $
-DISTNAME= cre2
-PKGNAME= cre2-0.1b6
+VERSION= 0.3.4
+DISTNAME= cre2-${VERSION}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=marcomaggi/}
-GITHUB_TAG= 0.1b6
+GITHUB_TAG= v${VERSION}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/google/re2
diff -r 09509e98bc8b -r 6dab93aa8631 devel/cre2/distinfo
--- a/devel/cre2/distinfo Sun May 07 02:02:24 2017 +0000
+++ b/devel/cre2/distinfo Sun May 07 03:13:24 2017 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/10/17 14:06:39 mef Exp $
+$NetBSD: distinfo,v 1.4 2017/05/07 03:13:24 mef Exp $
-SHA1 (cre2.tar.gz) = f5e9286a1829a5387984fbe3d01fe3bfe86bc6ac
-RMD160 (cre2.tar.gz) = e3fab4f0b994adbcf4b7cecc45640b2023fbbfec
-SHA512 (cre2.tar.gz) = 3180b99bdb68079b33e78dfbe9f943737510021ad2ea2144acb1014200d0e253317e6b52d268c3dae45ddd282c90bb49053fc43de607f8ff0c7f9a9ac9aeb2b7
-Size (cre2.tar.gz) = 38090 bytes
-SHA1 (patch-src_cre2.cpp) = 17ecaa1a3c44acd241f3d9e9ad906425bc9f8ea7
+SHA1 (cre2-0.3.4.tar.gz) = 64d2afca7411ba8144ce219bbc1c86b85ba5e9e7
+RMD160 (cre2-0.3.4.tar.gz) = 4fbc6bcf44fc5b3d42bdc65ea5de6d56825d3faa
+SHA512 (cre2-0.3.4.tar.gz) = 0c142f70042e363421e7e88a52e966286288b64918ac558c0c96ff901f47fcb439a3a4b8a91b8679b087cf290cbd6c70343cccf2191d8cfd1a6e678e4231acf4
+Size (cre2-0.3.4.tar.gz) = 45659 bytes
diff -r 09509e98bc8b -r 6dab93aa8631 devel/cre2/patches/patch-src_cre2.cpp
--- a/devel/cre2/patches/patch-src_cre2.cpp Sun May 07 02:02:24 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-$NetBSD: patch-src_cre2.cpp,v 1.2 2016/10/17 14:06:39 mef Exp $
-
-Don't depend on GCC's VLA of non-POD types extensions.
-
---- src/cre2.cpp.orig 2016-03-28 17:32:57.445282715 +0000
-+++ src/cre2.cpp
-@@ -17,6 +17,7 @@
-
- #include <cstdlib>
- #include <cstdio>
-+#include <vector>
-
-
- /** --------------------------------------------------------------------
-@@ -201,7 +202,7 @@ cre2_match (const cre2_regexp_t *re , co
- cre2_string_t *match, int nmatch)
- {
- re2::StringPiece text_re2(text, textlen);
-- re2::StringPiece match_re2[nmatch];
-+ std::vector<re2::StringPiece> match_re2(nmatch);
- RE2::Anchor anchor_re2 = RE2::UNANCHORED;
- bool retval; // 0 for no match
- // 1 for successful matching
-@@ -215,7 +216,7 @@ cre2_match (const cre2_regexp_t *re , co
- case CRE2_UNANCHORED:
- break;
- }
-- retval = TO_CONST_RE2(re)->Match(text_re2, startpos, endpos, anchor_re2, match_re2, nmatch);
-+ retval = TO_CONST_RE2(re)->Match(text_re2, startpos, endpos, anchor_re2, match_re2.data(), nmatch);
- if (retval) {
- for (int i=0; i<nmatch; i++) {
- match[i].data = match_re2[i].data();
-@@ -272,15 +273,15 @@ cre2_strings_to_ranges (const char * tex
- cre2_string_t * match, int nmatch) \
- { \
- re2::StringPiece input(text->data, text->length); \
-- re2::StringPiece strv[nmatch]; \
-- RE2::Arg argv[nmatch]; \
-- RE2::Arg * args[nmatch]; \
-+ std::vector<re2::StringPiece> strv(nmatch); \
-+ std::vector<RE2::Arg> argv(nmatch); \
-+ std::vector<RE2::Arg *> args(nmatch); \
- bool retval; \
- for (int i=0; i<nmatch; ++i) { \
- argv[i] = &strv[i]; \
- args[i] = &argv[i]; \
- } \
-- retval = RE2::FUN(input, pattern, args, nmatch); \
-+ retval = RE2::FUN(input, pattern, args.data(), nmatch); \
- if (retval) { \
- for (int i=0; i<nmatch; ++i) { \
- match[i].data = strv[i].data(); \
-@@ -301,15 +302,15 @@ DEFINE_MATCH_ZSTRING_FUN(cre2_partial_ma
- cre2_string_t * match, int nmatch) \
- { \
- re2::StringPiece input(text->data, text->length); \
-- re2::StringPiece strv[nmatch]; \
-- RE2::Arg argv[nmatch]; \
-- RE2::Arg * args[nmatch]; \
-+ std::vector<re2::StringPiece> strv(nmatch); \
-+ std::vector<RE2::Arg> argv(nmatch); \
-+ std::vector<RE2::Arg *> args(nmatch); \
- bool retval; \
- for (int i=0; i<nmatch; ++i) { \
- argv[i] = &strv[i]; \
- args[i] = &argv[i]; \
- } \
-- retval = RE2::FUN(&input, pattern, args, nmatch); \
-+ retval = RE2::FUN(&input, pattern, args.data(), nmatch); \
- if (retval) { \
- text->data = input.data(); \
- text->length = input.length(); \
-@@ -335,15 +336,15 @@ DEFINE_MATCH_ZSTRING_FUN2(cre2_find_and_
- cre2_string_t * match, int nmatch) \
- { \
- re2::StringPiece input(text->data, text->length); \
-- re2::StringPiece strv[nmatch]; \
-- RE2::Arg argv[nmatch]; \
-- RE2::Arg * args[nmatch]; \
-+ std::vector<re2::StringPiece> strv(nmatch); \
-+ std::vector<RE2::Arg> argv(nmatch); \
-+ std::vector<RE2::Arg *> args(nmatch); \
- bool retval; \
- for (int i=0; i<nmatch; ++i) { \
- argv[i] = &strv[i]; \
- args[i] = &argv[i]; \
- } \
-- retval = RE2::FUN(input, *TO_RE2(rex), args, nmatch); \
-+ retval = RE2::FUN(input, *TO_RE2(rex), args.data(), nmatch); \
- if (retval) { \
- for (int i=0; i<nmatch; ++i) { \
- match[i].data = strv[i].data(); \
-@@ -364,15 +365,15 @@ DEFINE_MATCH_REX_FUN(cre2_partial_match_
- cre2_string_t * match, int nmatch) \
- { \
- re2::StringPiece input(text->data, text->length); \
-- re2::StringPiece strv[nmatch]; \
-- RE2::Arg argv[nmatch]; \
-- RE2::Arg * args[nmatch]; \
-+ std::vector<re2::StringPiece> strv(nmatch); \
-+ std::vector<RE2::Arg> argv(nmatch); \
-+ std::vector<RE2::Arg *> args(nmatch); \
- bool retval; \
- for (int i=0; i<nmatch; ++i) { \
- argv[i] = &strv[i]; \
- args[i] = &argv[i]; \
- } \
-- retval = RE2::FUN(&input, *TO_RE2(rex), args, nmatch); \
-+ retval = RE2::FUN(&input, *TO_RE2(rex), args.data(), nmatch); \
- if (retval) { \
- text->data = input.data(); \
- text->length = input.length(); \
Home |
Main Index |
Thread Index |
Old Index