- Update to 2.4.20130923 snapshot.

- Add STAGEDIR support.

6 files changed, 27 insertions, 29 deletions

diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index edecf9efd504..6f04930b64b6 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	rtmpdump
-PORTVERSION=	2.4
-PORTREVISION=	2
+PORTVERSION=	2.4.20130923
 CATEGORIES=	multimedia net
-MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
+MASTER_SITES=	LOCAL/hrs
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A tool to download RTMP streams
@@ -16,16 +15,10 @@ USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 MAKE_ENV=	THREADLIB="${PTHREAD_LIBS}"
 CFLAGS+=	${PTHREAD_CFLAGS}
-WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	ChangeLog README
 
-MAN1=		rtmpdump.1
-MAN3=		librtmp.3
-MAN8=		rtmpgw.8
-
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OPENSSLBASE} != "/usr"
@@ -35,8 +28,8 @@ LDFLAGS+=	-L${OPENSSLLIB}
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo
index dbb627d14700..543024b5446e 100644
--- a/multimedia/rtmpdump/distinfo
+++ b/multimedia/rtmpdump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rtmpdump-2.4.tar.gz) = 0be975011d116bbdf1befad2a984ac83d09b1061c86550326a7ec496d2f188fc
-SIZE (rtmpdump-2.4.tar.gz) = 134558
+SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6
+SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065
diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile
index b5cfaabc7023..009d21a55bc6 100644
--- a/multimedia/rtmpdump/files/patch-librtmp-Makefile
+++ b/multimedia/rtmpdump/files/patch-librtmp-Makefile
@@ -1,5 +1,5 @@
---- librtmp/Makefile.orig	2011-07-12 09:24:33.000000000 +0900
-+++ librtmp/Makefile	2013-07-05 11:19:02.000000000 +0900
+--- librtmp/Makefile.orig	2013-10-07 03:52:05.000000000 +0900
++++ librtmp/Makefile	2013-10-07 03:59:04.000000000 +0900
 @@ -1,19 +1,21 @@
  VERSION=v2.4
  
@@ -26,23 +26,24 @@
  
  SYS=posix
  CRYPTO=OPENSSL
-@@ -23,13 +25,13 @@
+@@ -23,14 +25,14 @@
  DEF_GNUTLS=-DUSE_GNUTLS
  DEF_=-DNO_CRYPTO
- REQ_GNUTLS=gnutls
+ REQ_GNUTLS=gnutls,hogweed,nettle
 -REQ_OPENSSL=libssl,libcrypto
 +#REQ_OPENSSL=libssl,libcrypto
+ PUB_GNUTLS=-lgmp
  LIBZ=-lz
  LIBS_posix=
  LIBS_darwin=
  LIBS_mingw=-lws2_32 -lwinmm -lgdi32
- LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
+ LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
 -LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
-+LIB_OPENSSL=-L${OPENSSLLIB} -lssl -lcrypto $(LIBZ)
++LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ)
  LIB_POLARSSL=-lpolarssl $(LIBZ)
  PRIVATE_LIBS=$(LIBS_$(SYS))
  CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
-@@ -67,7 +69,8 @@
+@@ -74,7 +76,8 @@
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
@@ -52,23 +53,24 @@
  LDFLAGS=$(XLDFLAGS)
  
  
-@@ -95,15 +98,17 @@
+@@ -102,16 +105,18 @@
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
  		-e "s;@VERSION@;$(VERSION);" \
  		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
 +		-e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \
 +		-e "s;@OPENSSLINC@;$(OPENSSLINC);" \
+ 		-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
  		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
  
  install:	install_base $(SO_INST)
  
  install_base:	librtmp.a librtmp.pc
--	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
-+	-mkdir -p $(INCDIR) $(LIBDATADIR)/pkgconfig $(MANDIR)/man3
+-	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
++	-mkdir -p $(INCDIR) $(LIBDATADIRDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
  	cp amf.h http.h log.h rtmp.h $(INCDIR)
  	cp librtmp.a $(LIBDIR)
 -	cp librtmp.pc $(LIBDIR)/pkgconfig
 +	cp librtmp.pc $(LIBDATADIR)/pkgconfig
  	cp librtmp.3 $(MANDIR)/man3
  
- install_so:	librtmp.$(SO_EXT)
+ install_so:	librtmp$(SO_EXT)
diff --git a/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
index 7b460e03c1f7..ce58268b4367 100644
--- a/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
+++ b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
@@ -1,11 +1,11 @@
---- librtmp/librtmp.pc.in.orig	2011-07-12 09:24:33.000000000 +0900
-+++ librtmp/librtmp.pc.in	2012-01-26 10:58:43.000000000 +0900
+--- librtmp/librtmp.pc.in.orig	2013-10-07 03:52:05.000000000 +0900
++++ librtmp/librtmp.pc.in	2013-10-07 04:00:16.000000000 +0900
 @@ -8,6 +8,6 @@
  Version: @VERSION@
  Requires: @CRYPTO_REQ@
  URL: http://rtmpdump.mplayerhq.hu
--Libs: -L${libdir} -lrtmp -lz
-+Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz -lssl -lcrypto
+-Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@
++Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz @PUBLIC_LIBS@
  Libs.private: @PRIVATE_LIBS@
 -Cflags: -I${incdir}
 +Cflags: -I${incdir} -I@OPENSSLINC@
diff --git a/multimedia/rtmpdump/pkg-descr b/multimedia/rtmpdump/pkg-descr
index 0b3baa598827..aa6de63690f7 100644
--- a/multimedia/rtmpdump/pkg-descr
+++ b/multimedia/rtmpdump/pkg-descr
@@ -1,4 +1,4 @@
 rtmpdump is a tool to download RTMP streams. All forms of RTMP are supported,
 including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
 
-WWW:	http://rtmpdump.mplayerhq.hu/
+WWW: http://rtmpdump.mplayerhq.hu/
diff --git a/multimedia/rtmpdump/pkg-plist b/multimedia/rtmpdump/pkg-plist
index 34323800fa96..60c1247a31db 100644
--- a/multimedia/rtmpdump/pkg-plist
+++ b/multimedia/rtmpdump/pkg-plist
@@ -12,3 +12,6 @@ lib/librtmp.a
 lib/librtmp.so
 lib/librtmp.so.0
 libdata/pkgconfig/librtmp.pc
+man/man1/rtmpdump.1.gz
+man/man3/librtmp.3.gz
+man/man8/rtmpgw.8.gz