<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6354c30f3bf6ac6463959d8b834293272db0562">https://github.com/macports/macports-ports/commit/c6354c30f3bf6ac6463959d8b834293272db0562</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c6354c30f3bf6ac6463959d8b834293272db0562
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat Mar 9 09:00:12 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> rtmpdump: use gnutls rather than *ssl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> incompatable with openssl 1.1.x
</span>---
www/rtmpdump/Portfile | 4 +++-
www/rtmpdump/files/patch-Makefile.diff | 16 ++++++++++++++--
www/rtmpdump/files/patch-librtmp-Makefile.diff | 15 +++++++++++++--
3 files changed, 30 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/Portfile b/www/rtmpdump/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0232262..df56213 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/rtmpdump/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ set git_commit fa8646daeb19dfd12c181f7d19de708d623704c0
</span> set git_shortcommit [string range ${git_commit} 0 6]
set git_date 20151223
version 2.4-${git_date}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories www net
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +28,8 @@ distname ${git_commit}
</span> checksums rmd160 a79535b0e825b4069dc2be3dba73cedf43ec168c \
sha256 dba4d4d2e1c7de6884b01d98194b83cab6784669089fa3c919152087a3a38fd2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#path:lib/libssl.dylib:openssl
</span>
worksrcdir ${name}-${git_shortcommit}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/files/patch-Makefile.diff b/www/rtmpdump/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fe473a..b4b7614 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/rtmpdump/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2011-07-11 19:24:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2012-01-08 01:11:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2015-12-23 13:09:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2019-03-09 08:32:04.000000000 -0600
</span> @@ -1,4 +1,4 @@
-VERSION=v2.4
+VERSION=2.4
prefix=/usr/local
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,9 +8,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS=posix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #SYS=mingw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CRYPTO=OPENSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CRYPTO=OPENSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CRYPTO=POLARSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#CRYPTO=GNUTLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CRYPTO=GNUTLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBZ=-lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
</span> @@ -26,7 +26,7 @@
bindir=$(prefix)/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/rtmpdump/files/patch-librtmp-Makefile.diff b/www/rtmpdump/files/patch-librtmp-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3dc63d0..1900024 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/rtmpdump/files/patch-librtmp-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/rtmpdump/files/patch-librtmp-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- librtmp/Makefile.orig 2011-07-11 19:24:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ librtmp/Makefile 2012-01-08 01:14:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librtmp/Makefile.orig 2015-12-23 13:09:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librtmp/Makefile 2019-03-09 08:35:43.000000000 -0600
</span> @@ -1,11 +1,11 @@
-VERSION=v2.4
+VERSION=2.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,3 +14,14 @@
</span> BINDIR=$(DESTDIR)$(bindir)
INCDIR=$(DESTDIR)$(incdir)
LIBDIR=$(DESTDIR)$(libdir)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,8 +16,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AR=$(CROSS_COMPILE)ar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYS=posix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CRYPTO=OPENSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#CRYPTO=GNUTLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CRYPTO=OPENSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CRYPTO=GNUTLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_POLARSSL=-DUSE_POLARSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_OPENSSL=-DUSE_OPENSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_GNUTLS=-DUSE_GNUTLS
</span></pre><pre style='margin:0'>
</pre>