<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9075762d390f0de2f2bcf10429a5fd9fc759d7b8">https://github.com/macports/macports-ports/commit/9075762d390f0de2f2bcf10429a5fd9fc759d7b8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9075762d390f0de2f2bcf10429a5fd9fc759d7b8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu May 21 05:34:44 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> redis: use features from makefile PG
</span>---
databases/redis/Portfile | 22 +++++++---------------
databases/redis/files/patch-redis.conf.diff | 20 --------------------
2 files changed, 7 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/Portfile b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8db7335..eff5b9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,19 +29,12 @@ post-patch {
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/redis.conf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see ${worksrcpath}/deps/jemalloc/Makefile
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx-append -std=c++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++14
</span>
# https://trac.macports.org/ticket/59245
xcode_workaround.fixed_xcode_version 11.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode_workaround.type append_to_compiler_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# redis and dep makefiles have their own optflags
configure.optflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +62,11 @@ foreach mp_phase {build destroot} {
</span>
# enable TLS.
${mp_phase}.args-append BUILD_TLS=yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default values use /usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenSSL found with CPATH and LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${mp_phase}.args-append OPENSSL_CFLAGS= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENSSL_LDFLAGS=
</span> }
# more TLS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,13 +76,7 @@ destroot.keepdirs ${destroot}${prefix}/var/db/redis
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append PREFIX=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_args(${arch}) PREFIX=${destroot}-${arch}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.has_destdir no
</span>
post-destroot {
foreach conffile {redis.conf sentinel.conf} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/patch-redis.conf.diff b/databases/redis/files/patch-redis.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bfbec6..67bffb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/patch-redis.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/files/patch-redis.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,23 +27,3 @@
</span>
################################# REPLICATION #################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2020-05-14 12:03:25.183608552 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2020-05-14 12:03:51.752513404 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,8 +103,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(uname_S),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FINAL_LIBS+= -ldl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(uname_S),AIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # AIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,8 +180,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(BUILD_TLS),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FINAL_CFLAGS+=-DUSE_OPENSSL $(OPENSSL_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FINAL_LDFLAGS+=$(OPENSSL_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FINAL_CFLAGS+=-DUSE_OPENSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span></pre><pre style='margin:0'>
</pre>