<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8cc58ecbffed1f5269c9f623d31bf2d1b5ca6749">https://github.com/macports/macports-ports/commit/8cc58ecbffed1f5269c9f623d31bf2d1b5ca6749</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8cc58ecbffed1f5269c9f623d31bf2d1b5ca6749
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 14 02:09:05 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> grok: Update to 1.20111028.1
</span>---
sysutils/grok/Portfile | 46 +++++++++++++++++++++++++-------------
sysutils/grok/files/Makefile.patch | 19 ++++++++++++++++
sysutils/grok/files/gperf3.1.patch | 26 +++++++++++++++++++++
sysutils/grok/files/pcre8.34.patch | 22 ++++++++++++++++++
4 files changed, 97 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/grok/Portfile b/sysutils/grok/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e50b833afd5..4d9edf9330f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/grok/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/grok/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,21 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name grok
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.20110708.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jordansissel grok 0.9.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/jordansissel/grok/issues/38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20111028.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8189edee8157fe42650357b15b6852005bc3b85d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 40edbdba488ff9145832c7adb04b27630ca2617384fbef2af014d0e5a76ef636 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 243554
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
description Easily parse logs and other files.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,26 +24,34 @@ long_description Grok is simple software that allows you to easily parse logs
</span> config file. Grok is a system for reacting to events - those events \
being log entries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.semicomplete.com/projects/grok/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://semicomplete.googlecode.com/files/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 99a79d67fbb5c163df58d68ce7b1903e7766c3e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3362857a03115029df76c3a3f0587b2ed1f9977f963bb1bd701e2bf59ad701c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
depends_build port:bison \
port:flex \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gperf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gperf
</span>
depends_lib port:libevent \
port:pcre \
port:tokyocabinet
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gperf3.1.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre8.34.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Without a VERSION file, it uses 1.YYYYMMDD.1 (of the build date)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as the version number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/jordansissel/grok/issues/38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${worksrcpath}/VERSION w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [split ${version} .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} "MAJOR=[lindex ${v} 0]\nRELEASE=[lindex ${v} 1]\nREVISION=[lindex ${v} 2]\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args PREFIX=${prefix} INSTALL_USER=${install.user} INSTALL_GROUP=${install.group}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "GPERF=${prefix}/bin/gperf"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/grok/files/Makefile.patch b/sysutils/grok/files/Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6edbfde748
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/grok/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't look in /usr/local. MacPorts will set the right -I and -L flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do set the right prefix for the library install_name. (The INSTALLLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variable was not set anywhere.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2011-10-28 02:17:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-01-14 01:26:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,11 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Sane includes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS+=-I/usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS+=-L/usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(PREFIX)/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Platform so we know what to dlopen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS+=-DPLATFORM_$(PLATFORM)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/grok/files/gperf3.1.patch b/sysutils/grok/files/gperf3.1.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1588e3069f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/grok/files/gperf3.1.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with gperf 3.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/jordansissel/grok/issues/28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/jordansissel/grok/issues/29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2011-10-28 02:17:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-01-14 01:26:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,10 +209,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rpcgen -h $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %.c: %.gperf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @if $(GPERF) --version | head -1 | egrep -v '3\.[0-9]+\.[0-9]+' ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "We require gperf version >= 3.0.3" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GPERF) $< > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.tab.c conf.tab.h: conf.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- grok_matchconf_macro.h.orig 2011-10-28 02:17:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ grok_matchconf_macro.h 2022-01-14 01:50:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* this function is generated by gperf */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct strmacro *patname2macro(const char *str, unsigned int len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++const struct strmacro *patname2macro(const char *str, size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* _GROK_MATCHCONF_MACRO_ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/grok/files/pcre8.34.patch b/sysutils/grok/files/pcre8.34.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ab8b203a7a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/grok/files/pcre8.34.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[fix] grok is not working anymore with PCRE >= 8.34 because the latter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+does not allow anymore a group name to start with digits (PCRE Changelog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.34, point 36)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+this commit fix the issue by prepending a '_' at the start of group
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name. It remains compatible with older versions of PCRE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/jordansissel/grok/pull/23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/jordansissel/grok/commit/ecb6f35854795242c3fd7b33a499ed8896af8de4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- grokre.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ grokre.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,8 +12,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* global, static variables */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CAPTURE_ID_LEN 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CAPTURE_FORMAT "%04x"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CAPTURE_ID_LEN 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CAPTURE_FORMAT "_%04x"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* internal functions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char *grok_pattern_expand(grok_t *grok); //, int offset, int length);
</span></pre><pre style='margin:0'>
</pre>