multimedia/librtmp: Moved man to share/man

- Refresh patches Approved by: portmgr (blanket)
freebsd · Jan 28, 2024 · ed4539d · ed4539d
1 parent 47419ad
commit ed4539d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/multimedia/librtmp/Makefile b/multimedia/librtmp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	librtmp
 PORTVERSION=	2.4.20190330
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz?/
 DISTNAME=	rtmpdump-${PORTVERSION}

diff --git a/multimedia/librtmp/files/patch-librtmp-Makefile b/multimedia/librtmp/files/patch-librtmp-Makefile
@@ -1,6 +1,6 @@
---- librtmp/Makefile.orig	2016-02-29 01:15:13 UTC
+--- librtmp/Makefile.orig	2019-03-30 21:33:00 UTC
 +++ librtmp/Makefile
-@@ -1,19 +1,21 @@
+@@ -1,19 +1,21 @@ VERSION=v2.4
  VERSION=v2.4
 
 -prefix=/usr/local
@@ -9,8 +9,9 @@
  incdir=$(prefix)/include/librtmp
  bindir=$(prefix)/bin
  libdir=$(prefix)/lib
+-mandir=$(prefix)/man
 +libdatadir=$(prefix)/libdata
- mandir=$(prefix)/man
++mandir=$(prefix)/share/man
  BINDIR=$(DESTDIR)$(bindir)
  INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
@@ -26,7 +27,7 @@
 
  SYS=posix
  CRYPTO=OPENSSL
-@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL
+@@ -23,14 +25,14 @@ REQ_GNUTLS=gnutls,hogweed,nettle
  DEF_GNUTLS=-DUSE_GNUTLS
  DEF_=-DNO_CRYPTO
  REQ_GNUTLS=gnutls,hogweed,nettle
@@ -43,7 +44,7 @@
  LIB_POLARSSL=-lpolarssl $(LIBZ)
  PRIVATE_LIBS=$(LIBS_$(SYS))
  CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
-@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED))
+@@ -74,8 +76,9 @@ OPT=-O2
 
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2

diff --git a/multimedia/librtmp/files/patch-librtmp-hashswf.c b/multimedia/librtmp/files/patch-librtmp-hashswf.c
@@ -1,4 +1,4 @@
---- librtmp/hashswf.c.orig	2016-02-29 01:15:13 UTC
+--- librtmp/hashswf.c.orig	2019-03-30 21:33:00 UTC
 +++ librtmp/hashswf.c
 @@ -37,10 +37,17 @@
  #define SHA256_DIGEST_LENGTH	32
@@ -22,7 +22,7 @@
  #elif defined(USE_GNUTLS)
  #include <nettle/hmac.h>
  #ifndef SHA256_DIGEST_LENGTH
-@@ -48,19 +55,51 @@
+@@ -48,20 +55,52 @@
  #endif
  #undef HMAC_CTX
  #define HMAC_CTX	struct hmac_sha256_ctx
@@ -63,7 +63,7 @@
 +			ctx = HMAC_CTX_new(); \
 +		HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0); \
 +	} while (0);
-+#endif
+ #endif
 +#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, (unsigned char *)buf, len)
 +#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, (unsigned char *)dig, &dlen);
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
@@ -79,10 +79,11 @@
 +		ctx = NULL; \
 +	} while (0)
 +#endif
- #endif
++#endif
 
  extern void RTMP_TLS_Init();
-@@ -289,7 +328,7 @@ leave:
+ extern TLS_CTX RTMP_TLS_ctx;
+@@ -298,7 +337,7 @@ struct info
  struct info
  {
    z_stream *zs;

diff --git a/multimedia/librtmp/pkg-plist b/multimedia/librtmp/pkg-plist
@@ -6,4 +6,4 @@ lib/librtmp.a
 lib/librtmp.so
 lib/librtmp.so.1
 libdata/pkgconfig/librtmp.pc
-man/man3/librtmp.3.gz
+share/man/man3/librtmp.3.gz