CVS commit: pkgsrc/net/rtmpdump

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jun  7 17:30:05 UTC 2026

Modified Files:
        pkgsrc/net/rtmpdump: Makefile buildlink3.mk distinfo
        pkgsrc/net/rtmpdump/patches: patch-Makefile patch-librtmp_Makefile

Log Message:
rtmpdump: switch to openssl (which is the default) to fix problem building with nettle 4.0


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/rtmpdump/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/rtmpdump/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/rtmpdump/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/rtmpdump/patches/patch-Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rtmpdump/Makefile
diff -u pkgsrc/net/rtmpdump/Makefile:1.33 pkgsrc/net/rtmpdump/Makefile:1.34
--- pkgsrc/net/rtmpdump/Makefile:1.33   Thu May 14 16:41:50 2026
+++ pkgsrc/net/rtmpdump/Makefile        Sun Jun  7 17:30:05 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2026/05/14 16:41:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2026/06/07 17:30:05 adam Exp $
 
 DISTNAME=      rtmpdump-2.6-git-6f6bb1353fc84f4cc37138baa99f586750028a01
 PKGNAME=       ${DISTNAME:C/-git-.*/.0.0.20240301/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net multimedia
 #MASTER_SITES= # manually created tarball from https://git.ffmpeg.org/rtmpdump
 
@@ -18,11 +18,11 @@ MAKE_ENV+=  XCFLAGS=${CFLAGS:Q}
 MAKE_ENV+=     XLDFLAGS=${LDFLAGS:Q}
 
 WRKSRC=                ${WRKDIR}/rtmpdump
+
 PKGCONFIG_OVERRIDE+=   librtmp/librtmp.pc.in
 
 LDFLAGS.SunOS+=        -lnsl -lsocket
 
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/rtmpdump/buildlink3.mk
diff -u pkgsrc/net/rtmpdump/buildlink3.mk:1.26 pkgsrc/net/rtmpdump/buildlink3.mk:1.27
--- pkgsrc/net/rtmpdump/buildlink3.mk:1.26      Thu May 14 16:41:50 2026
+++ pkgsrc/net/rtmpdump/buildlink3.mk   Sun Jun  7 17:30:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2026/05/14 16:41:50 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2026/06/07 17:30:05 adam Exp $
 
 BUILDLINK_TREE+=       rtmpdump
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.rtmpdump+=      rtmpdum
 BUILDLINK_PKGSRCDIR.rtmpdump?=         ../../net/rtmpdump
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .endif # RTMPDUMP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -rtmpdump

Index: pkgsrc/net/rtmpdump/distinfo
diff -u pkgsrc/net/rtmpdump/distinfo:1.14 pkgsrc/net/rtmpdump/distinfo:1.15
--- pkgsrc/net/rtmpdump/distinfo:1.14   Fri Aug  8 08:13:08 2025
+++ pkgsrc/net/rtmpdump/distinfo        Sun Jun  7 17:30:05 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2025/08/08 08:13:08 wiz Exp $
+$NetBSD: distinfo,v 1.15 2026/06/07 17:30:05 adam Exp $
 
 BLAKE2s (rtmpdump-2.6-git-6f6bb1353fc84f4cc37138baa99f586750028a01.tar.gz) = 99dfb4780f9441cff105dbf9ee8d5bbf47822a6cd3c45256f2206adb44722ced
 SHA512 (rtmpdump-2.6-git-6f6bb1353fc84f4cc37138baa99f586750028a01.tar.gz) = 
dc1d804eb1cd56a5f2de50cc4989ebb465ddce53e2adfb69777560020655e244eb1a2d869307d44e3a8244327cbcfe8f8b60058b3ff33ae8cc0a4f05308f18a1
 Size (rtmpdump-2.6-git-6f6bb1353fc84f4cc37138baa99f586750028a01.tar.gz) = 1045281 bytes
-SHA1 (patch-Makefile) = ec766e2696498a36e80bcd8fef539b3a96679ce8
-SHA1 (patch-librtmp_Makefile) = 6826a406f3302699c5ff93fce6eb4ea2e6d56634
+SHA1 (patch-Makefile) = 46ba58f54860170ce3e7dbd3304da7b07edcb83e
+SHA1 (patch-librtmp_Makefile) = ddfd8e7efcfb3940e6a7cfc69e31aa55a51b8424
 SHA1 (patch-rtmpdump.c) = 7ab83af82e58270e46e75d0357df1f5cead248c4

Index: pkgsrc/net/rtmpdump/patches/patch-Makefile
diff -u pkgsrc/net/rtmpdump/patches/patch-Makefile:1.9 pkgsrc/net/rtmpdump/patches/patch-Makefile:1.10
--- pkgsrc/net/rtmpdump/patches/patch-Makefile:1.9      Fri Aug  8 08:13:08 2025
+++ pkgsrc/net/rtmpdump/patches/patch-Makefile  Sun Jun  7 17:30:05 2026
@@ -1,9 +1,8 @@
-$NetBSD: patch-Makefile,v 1.9 2025/08/08 08:13:08 wiz Exp $
+$NetBSD: patch-Makefile,v 1.10 2026/06/07 17:30:05 adam Exp $
 
 Use PREFIX and PKGMANDIR.
 Remove OPT.
 Libtoolize
-Choose gnutls.
 
 --- Makefile.orig      2025-08-08 08:05:50.000000000 +0000
 +++ Makefile
@@ -15,18 +14,6 @@ Choose gnutls.
  
  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))
  

Index: pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile
diff -u pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile:1.7 pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile:1.8
--- pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile:1.7      Fri Aug  8 08:13:08 2025
+++ pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile  Sun Jun  7 17:30:05 2026
@@ -1,9 +1,8 @@
-$NetBSD: patch-librtmp_Makefile,v 1.7 2025/08/08 08:13:08 wiz Exp $
+$NetBSD: patch-librtmp_Makefile,v 1.8 2026/06/07 17:30:05 adam Exp $
 
 Use PREFIX and PKGMANDIR.
 Remove OPT.
 Libtoolize
-Choose gnutls.
 
 --- librtmp/Makefile.orig      2025-08-08 08:05:50.000000000 +0000
 +++ librtmp/Makefile
@@ -21,17 +20,6 @@ Choose gnutls.
  BINDIR=$(DESTDIR)$(bindir)
  INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
-@@ -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))