- Update to a snapshot as of 20151223.

- Strip binaries.

8 files changed, 37 insertions, 28 deletions

diff --git a/multimedia/librtmp/Makefile b/multimedia/librtmp/Makefile
index 22ccc79b9cbb..10b806521470 100644
--- a/multimedia/librtmp/Makefile
+++ b/multimedia/librtmp/Makefile
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	librtmp
-PORTVERSION=	2.4.20130923
+PORTVERSION=	2.4.20151223
 CATEGORIES=	multimedia net
 MASTER_SITES=	LOCAL/hrs
-DISTNAME=	rtmpdump-${PORTVERSION}
+DISTNAME=	rtmpdump-2.4.fa8646da
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	RTMP stream library
 
 LICENSE=	GPLv2
 
-USES=		pkgconfig
+USES=		pkgconfig tar:bz2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 CFLAGS+=	-I${OPENSSLINC}
diff --git a/multimedia/librtmp/distinfo b/multimedia/librtmp/distinfo
index 543024b5446e..c51022dfef35 100644
--- a/multimedia/librtmp/distinfo
+++ b/multimedia/librtmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6
-SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065
+SHA256 (rtmpdump-2.4.fa8646da.tar.bz2) = 2d37a0db88477c580d3d7226bf8606444fdb130008ee5256bf0ddaf00c76d771
+SIZE (rtmpdump-2.4.fa8646da.tar.bz2) = 110969
diff --git a/multimedia/librtmp/files/patch-librtmp-Makefile b/multimedia/librtmp/files/patch-librtmp-Makefile
index 874063fc327e..3aad9a44af77 100644
--- a/multimedia/librtmp/files/patch-librtmp-Makefile
+++ b/multimedia/librtmp/files/patch-librtmp-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-10-07 03:52:05.000000000 +0900
-+++ Makefile	2013-10-30 05:16:36.000000000 +0900
+--- Makefile.orig	2016-02-29 01:15:13 UTC
++++ Makefile
 @@ -1,19 +1,21 @@
  VERSION=v2.4
  
@@ -26,7 +26,7 @@
  
  SYS=posix
  CRYPTO=OPENSSL
-@@ -23,14 +25,14 @@
+@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL
  DEF_GNUTLS=-DUSE_GNUTLS
  DEF_=-DNO_CRYPTO
  REQ_GNUTLS=gnutls,hogweed,nettle
@@ -43,7 +43,7 @@
  LIB_POLARSSL=-lpolarssl $(LIBZ)
  PRIVATE_LIBS=$(LIBS_$(SYS))
  CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
-@@ -74,8 +76,9 @@
+@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED))
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
@@ -55,7 +55,7 @@
  
  
  OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
-@@ -102,16 +105,18 @@
+@@ -102,20 +105,22 @@ librtmp.pc: librtmp.pc.in Makefile
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
  		-e "s;@VERSION@;$(VERSION);" \
  		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
@@ -76,3 +76,8 @@
  	cp librtmp.3 $(MANDIR)/man3
  
  install_so:	librtmp$(SO_EXT)
+-	cp librtmp$(SO_EXT) $(SODIR)
++	${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR)
+ 	$(INSTALL_IMPLIB)
+ 	cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX)
+ 
diff --git a/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in b/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in
index 9e304fc6c325..898d89162a9b 100644
--- a/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in
+++ b/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in
@@ -1,6 +1,6 @@
---- librtmp.pc.in.orig	2013-10-07 03:52:05.000000000 +0900
-+++ librtmp.pc.in	2013-10-07 04:00:16.000000000 +0900
-@@ -8,6 +8,6 @@
+--- librtmp.pc.in.orig	2016-02-29 01:15:13 UTC
++++ librtmp.pc.in
+@@ -8,6 +8,6 @@ Description: RTMP implementation
  Version: @VERSION@
  Requires: @CRYPTO_REQ@
  URL: http://rtmpdump.mplayerhq.hu
diff --git a/multimedia/librtmp/pkg-plist b/multimedia/librtmp/pkg-plist
index 6e7ccdf8761d..8c6e7dd7c06b 100644
--- a/multimedia/librtmp/pkg-plist
+++ b/multimedia/librtmp/pkg-plist
@@ -4,6 +4,6 @@ include/librtmp/log.h
 include/librtmp/rtmp.h
 lib/librtmp.a
 lib/librtmp.so
-lib/librtmp.so.0
+lib/librtmp.so.1
 libdata/pkgconfig/librtmp.pc
 man/man3/librtmp.3.gz
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index e7012460f298..d888eeac40e3 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	rtmpdump
-PORTVERSION=	2.4.20130923
-PORTREVISION=	2
+PORTVERSION=	2.4.20151223
 CATEGORIES=	multimedia net
 MASTER_SITES=	LOCAL/hrs
+DISTNAME=	${PORTNAME}-2.4.fa8646da
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	RTMP streams download utility
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
 
-USES=		pkgconfig
+USES=		pkgconfig tar:bz2
 USE_OPENSSL=	yes
 MAKE_ENV=	THREADLIB="-lpthread"
 CFLAGS+=	-I${OPENSSLINC}
diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo
index 543024b5446e..c51022dfef35 100644
--- a/multimedia/rtmpdump/distinfo
+++ b/multimedia/rtmpdump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6
-SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065
+SHA256 (rtmpdump-2.4.fa8646da.tar.bz2) = 2d37a0db88477c580d3d7226bf8606444fdb130008ee5256bf0ddaf00c76d771
+SIZE (rtmpdump-2.4.fa8646da.tar.bz2) = 110969
diff --git a/multimedia/rtmpdump/files/patch-Makefile b/multimedia/rtmpdump/files/patch-Makefile
index ea86a39d0fbc..1cb548753182 100644
--- a/multimedia/rtmpdump/files/patch-Makefile
+++ b/multimedia/rtmpdump/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-10-07 03:52:05.000000000 +0900
-+++ Makefile	2013-10-30 15:30:57.000000000 +0900
+--- Makefile.orig	2016-02-29 01:15:13 UTC
++++ Makefile
 @@ -1,9 +1,9 @@
  VERSION=v2.4
  
@@ -13,7 +13,7 @@
  
  SYS=posix
  #SYS=mingw
-@@ -21,8 +21,9 @@
+@@ -21,8 +21,9 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
@@ -25,7 +25,7 @@
  
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
-@@ -35,13 +36,13 @@
+@@ -35,13 +36,13 @@ MANDIR=$(DESTDIR)$(mandir)
  LIBS_posix=
  LIBS_darwin=
  LIBS_mingw=-lws2_32 -lwinmm -lgdi32
@@ -41,7 +41,7 @@
  SLIBS=$(THREADLIB) $(LIBS)
  
  LIBRTMP=librtmp/librtmp.a
-@@ -54,9 +55,7 @@
+@@ -54,21 +55,17 @@ EXT=$(EXT_$(SYS))
  
  PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck
  
@@ -52,11 +52,15 @@
  
  install:	$(PROGS)
  	-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
-@@ -64,11 +63,9 @@
- 	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
- 	cp rtmpdump.1 $(MANDIR)/man1
- 	cp rtmpgw.8 $(MANDIR)/man8
+-	cp rtmpdump$(EXT) $(BINDIR)
+-	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
+-	cp rtmpdump.1 $(MANDIR)/man1
+-	cp rtmpgw.8 $(MANDIR)/man8
 -	@cd librtmp; $(MAKE) install
++	${BSD_INSTALL_PROGRAM} rtmpdump$(EXT) $(BINDIR)
++	${BSD_INSTALL_PROGRAM} rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
++	${BSD_INSTALL_DATA} rtmpdump.1 $(MANDIR)/man1
++	${BSD_INSTALL_DATA} rtmpgw.8 $(MANDIR)/man8
  
  clean:
  	rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)