rtmpdump: update to 2.4.0.0.fa8646daeb19dfd12c181f7d19de708d623704c0.

This is the latest git version of the program (from 2015 though).

Switch the build to use gnutls for the command line program,
since openssl 1.1 is not supported.

Various changes since the last released version, but only git log
available. Mostly bugfixes.

Update bl3.mk file: neither zlib nor openssl nor gnutls headers/libraries
are used by the library, so remove all bl3.mk includes.

5 files changed, 54 insertions, 27 deletions

diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile
index 5bd7b691e06..f0ea36dae84 100644
--- a/net/rtmpdump/Makefile
+++ b/net/rtmpdump/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2017/09/20 06:47:56 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/09/23 21:09:32 wiz Exp $
 
-DISTNAME=	rtmpdump-2.4
-PKGREVISION=	3
+DISTNAME=	rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0
+PKGNAME=	${DISTNAME:S/-git-/.0.0./}
 CATEGORIES=	net multimedia
-MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
+#MASTER_SITES=
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://rtmpdump.mplayerhq.hu/
@@ -21,6 +21,7 @@ PKGCONFIG_OVERRIDE+=	librtmp/librtmp.pc.in
 
 LDFLAGS.SunOS+=	-lnsl -lsocket
 
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rtmpdump/buildlink3.mk b/net/rtmpdump/buildlink3.mk
index a7b04da2160..3a47b81e982 100644
--- a/net/rtmpdump/buildlink3.mk
+++ b/net/rtmpdump/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/09/20 06:47:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/09/23 21:09:32 wiz Exp $
 
 BUILDLINK_TREE+=	rtmpdump
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.rtmpdump+=	rtmpdump>=2.3
 BUILDLINK_ABI_DEPENDS.rtmpdump+=	rtmpdump>=2.4nb3
 BUILDLINK_PKGSRCDIR.rtmpdump?=		../../net/rtmpdump
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .endif	# RTMPDUMP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-rtmpdump
diff --git a/net/rtmpdump/distinfo b/net/rtmpdump/distinfo
index 4b8425d5e3a..eedd5c0f9ea 100644
--- a/net/rtmpdump/distinfo
+++ b/net/rtmpdump/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2017/09/20 06:47:56 adam Exp $
+$NetBSD: distinfo,v 1.10 2018/09/23 21:09:32 wiz Exp $
 
-SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac
-RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff
-SHA512 (rtmpdump-2.4.tar.gz) = a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609
-Size (rtmpdump-2.4.tar.gz) = 134558 bytes
-SHA1 (patch-Makefile) = 1e1012b62ce372a3512f61aa10e876b22e96996b
-SHA1 (patch-librtmp_Makefile) = 0b32ab60020786ecfd42495e357d7845f4415bad
+SHA1 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 245de43e34fa8cf7c06a3604cd32cfafa981f8c0
+RMD160 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = c11b59337d7b9dd6c8136cc331ee6ade8ed4bc9e
+SHA512 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 05a55c7170fa4e9b132166deddf7ff78f9b02880a22420ffd7af891f95172a293315b323d40bf6e0b891c2b8874dfa678c28b8671b0c09fe33c100dcf7d680b4
+Size (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 1030982 bytes
+SHA1 (patch-Makefile) = 0001b2c1745f4ee6eae36e780d256ff584631ab9
+SHA1 (patch-librtmp_Makefile) = 90a076de219dcf7ba6840913cb6101e007f549cf
diff --git a/net/rtmpdump/patches/patch-Makefile b/net/rtmpdump/patches/patch-Makefile
index dba561609de..1ee30f62211 100644
--- a/net/rtmpdump/patches/patch-Makefile
+++ b/net/rtmpdump/patches/patch-Makefile
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile,v 1.7 2017/09/20 06:47:56 adam Exp $
+$NetBSD: patch-Makefile,v 1.8 2018/09/23 21:09:33 wiz Exp $
 
 Use PREFIX and PKGMANDIR.
 Remove OPT.
 Libtoolize
+Choose gnutls.
 
---- Makefile.orig	2011-07-12 00:24:33.000000000 +0000
+--- Makefile.orig	2018-09-23 10:40:58.000000000 +0000
 +++ Makefile
 @@ -1,6 +1,6 @@
  VERSION=v2.4
@@ -14,6 +15,18 @@ Libtoolize
  
  CC=$(CROSS_COMPILE)gcc
  LD=$(CROSS_COMPILE)ld
+@@ -8,9 +8,9 @@ LD=$(CROSS_COMPILE)ld
+ SYS=posix
+ #SYS=mingw
+ 
+-CRYPTO=OPENSSL
++#CRYPTO=OPENSSL
+ #CRYPTO=POLARSSL
+-#CRYPTO=GNUTLS
++CRYPTO=GNUTLS
+ LIBZ=-lz
+ LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
+ LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
 @@ -20,13 +20,12 @@ DEF_=-DNO_CRYPTO
  CRYPTO_DEF=$(DEF_$(CRYPTO))
  
diff --git a/net/rtmpdump/patches/patch-librtmp_Makefile b/net/rtmpdump/patches/patch-librtmp_Makefile
index a58ac4296db..1d78d9677dd 100644
--- a/net/rtmpdump/patches/patch-librtmp_Makefile
+++ b/net/rtmpdump/patches/patch-librtmp_Makefile
@@ -1,10 +1,11 @@
-$NetBSD: patch-librtmp_Makefile,v 1.5 2017/09/20 06:47:56 adam Exp $
+$NetBSD: patch-librtmp_Makefile,v 1.6 2018/09/23 21:09:33 wiz Exp $
 
 Use PREFIX and PKGMANDIR.
 Remove OPT.
 Libtoolize
+Choose gnutls.
 
---- librtmp/Makefile.orig	2011-07-12 00:24:33.000000000 +0000
+--- librtmp/Makefile.orig	2018-09-23 10:40:58.000000000 +0000
 +++ librtmp/Makefile
 @@ -1,11 +1,11 @@
  VERSION=v2.4
@@ -20,7 +21,18 @@ Libtoolize
  BINDIR=$(DESTDIR)$(bindir)
  INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
-@@ -66,30 +66,41 @@ SO_LIB=$(SOLIB_$(SHARED))
+@@ -16,8 +16,8 @@ LD=$(CROSS_COMPILE)ld
+ AR=$(CROSS_COMPILE)ar
+ 
+ SYS=posix
+-CRYPTO=OPENSSL
+-#CRYPTO=GNUTLS
++#CRYPTO=OPENSSL
++CRYPTO=GNUTLS
+ DEF_POLARSSL=-DUSE_POLARSSL
+ DEF_OPENSSL=-DUSE_OPENSSL
+ DEF_GNUTLS=-DUSE_GNUTLS
+@@ -73,30 +73,42 @@ SO_LIB=$(SOLIB_$(SHARED))
  SO_INST=$(SOINST_$(SHARED))
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
@@ -35,18 +47,20 @@ Libtoolize
 +all:	librtmp.la
  
  clean:
- 	rm -f *.o *.a *.$(SOX) *.$(SO_EXT)
+ 	rm -f *.o *.a *.$(SOX) *$(SO_EXT) librtmp.pc
  
 -librtmp.a: $(OBJS)
 -	$(AR) rs $@ $?
+-
+-librtmp$(SO_EXT): $(OBJS)
+-	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
 +librtmp.la: $(OBJS)
 +	${LIBTOOL} --mode=link --tag=CC \
 +		${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \
 +			${OBJS:.o=.lo} \
 +			-rpath ${PREFIX}/lib
- 
- librtmp.$(SO_EXT): $(OBJS)
--	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
++
++librtmp.$(SO_EXT): $(OBJS)
 +	${LIBTOOL} --mode=link --tag=CC \
 +		${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \
 +		${OBJS:.o=.lo} \
@@ -64,11 +78,12 @@ Libtoolize
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c
  parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c parseurl.c
++
  
  librtmp.pc: librtmp.pc.in Makefile
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
-@@ -97,12 +108,12 @@ librtmp.pc: librtmp.pc.in Makefile
- 		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
+@@ -105,12 +117,12 @@ librtmp.pc: librtmp.pc.in Makefile
+ 		-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
  		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
  
 -install:	install_base $(SO_INST)
@@ -76,7 +91,7 @@ Libtoolize
  
 -install_base:	librtmp.a librtmp.pc
 +install_base:	librtmp.la librtmp.pc
- 	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
+ 	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
  	cp amf.h http.h log.h rtmp.h $(INCDIR)
 -	cp librtmp.a $(LIBDIR)
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} librtmp.la $(LIBDIR)