Update to rtmpdump version 2.4:

11 July 2011, v2.4
- add RTMPE type 9 handshake support

4 files changed, 45 insertions, 46 deletions

diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile
index fab788ebb8f..3da118826f6 100644
--- a/net/rtmpdump/Makefile
+++ b/net/rtmpdump/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/10/05 21:41:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/08 06:09:33 dsainty Exp $
 #
 
-DISTNAME=	rtmpdump-2.3
-PKGREVISION=	1
+DISTNAME=	rtmpdump-2.4
 CATEGORIES=	net multimedia
 MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ryo_on@yk.rim.or.jp
 HOMEPAGE=	http://rtmpdump.mplayerhq.hu/
@@ -20,6 +18,7 @@ USE_TOOLS+=	pkg-config
 USE_LIBTOOL=	yes
 BUILD_DIRS=	. librtmp
 
+WRKSRC=		${WRKDIR}/rtmpdump
 PKGCONFIG_OVERRIDE+=	librtmp/librtmp.pc.in
 
 SUBST_CLASSES+=			fix-paths
diff --git a/net/rtmpdump/distinfo b/net/rtmpdump/distinfo
index 6f898d9df49..5793b27e1b2 100644
--- a/net/rtmpdump/distinfo
+++ b/net/rtmpdump/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/10/05 21:41:25 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2011/10/08 06:09:34 dsainty Exp $
 
-SHA1 (rtmpdump-2.3.tgz) = b65ce7708ae79adb51d1f43dd0b6d987076d7c42
-RMD160 (rtmpdump-2.3.tgz) = 1d48925e6567783806fa68819d6a695cd06138bc
-Size (rtmpdump-2.3.tgz) = 125103 bytes
-SHA1 (patch-Makefile) = cfc0de0ef2bb26fb1db1bdae0f90158abed29d16
-SHA1 (patch-librtmp_Makefile) = 4df3c8741198cd13d8e507b8e8033cddeb0410ae
+SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac
+RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff
+Size (rtmpdump-2.4.tar.gz) = 134558 bytes
+SHA1 (patch-Makefile) = 9d00398399cccc77637abe432d6164299a749951
+SHA1 (patch-librtmp_Makefile) = cc20d2cd853734f719b085e74767543c5b36af69
diff --git a/net/rtmpdump/patches/patch-Makefile b/net/rtmpdump/patches/patch-Makefile
index d1c3dc357d7..6019fb689c4 100644
--- a/net/rtmpdump/patches/patch-Makefile
+++ b/net/rtmpdump/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2011/10/05 21:41:25 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.2 2011/10/08 06:09:34 dsainty Exp $
 
 Libtoolize
 
---- Makefile.orig	2010-06-30 19:58:35.000000000 +0000
-+++ Makefile
-@@ -40,7 +40,7 @@ THREADLIB_mingw=
+--- Makefile	2011-07-12 12:24:33.000000000 +1200
++++ Makefile	2011-10-08 18:30:51.525361883 +1300
+@@ -44,7 +44,7 @@
  THREADLIB=$(THREADLIB_$(SYS))
  SLIBS=$(THREADLIB) $(LIBS)
  
@@ -13,9 +13,9 @@ Libtoolize
  INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
  
  EXT_posix=
-@@ -53,8 +53,9 @@ progs:	rtmpdump rtmpgw rtmpsrv rtmpsuck
+@@ -60,11 +60,11 @@
  
- install:	progs
+ install:	$(PROGS)
  	-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
 -	cp rtmpdump$(EXT) $(BINDIR)
 -	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
@@ -24,24 +24,27 @@ Libtoolize
 +	$(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
  	cp rtmpdump.1 $(MANDIR)/man1
  	cp rtmpgw.8 $(MANDIR)/man8
- 	@cd librtmp; $(MAKE) install
-@@ -72,19 +73,16 @@ $(LIBRTMP): FORCE
- # we use both since either make will ignore the one it doesn't recognize
+-	@cd librtmp; $(MAKE) install
  
- rtmpdump: rtmpdump.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
+ clean:
+ 	rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
+@@ -76,19 +76,16 @@
+ 	@cd librtmp; $(MAKE) all
+ 
+ rtmpdump: rtmpdump.o
+-	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS)
 +	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
  
- rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
+ rtmpsrv: rtmpsrv.o thread.o
+-	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
 +	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
  
- rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
+ rtmpsuck: rtmpsuck.o thread.o
+-	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
 +	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
  
- rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
+ rtmpgw: rtmpgw.o thread.o
+-	$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
 +	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
  
 -rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
diff --git a/net/rtmpdump/patches/patch-librtmp_Makefile b/net/rtmpdump/patches/patch-librtmp_Makefile
index dfe5852a0a7..ada27a389d3 100644
--- a/net/rtmpdump/patches/patch-librtmp_Makefile
+++ b/net/rtmpdump/patches/patch-librtmp_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-librtmp_Makefile,v 1.1 2011/10/05 21:41:25 ryoon Exp $
+$NetBSD: patch-librtmp_Makefile,v 1.2 2011/10/08 06:09:34 dsainty Exp $
 
 Libtoolize
 
---- librtmp/Makefile.orig	2010-06-30 20:01:28.000000000 +0000
-+++ librtmp/Makefile
-@@ -52,34 +52,46 @@ MANDIR=$(DESTDIR)$(mandir)
+--- librtmp/Makefile	2011-07-12 12:24:33.000000000 +1200
++++ librtmp/Makefile	2011-10-08 17:59:54.713362187 +1300
+@@ -73,23 +73,35 @@
  
  OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
  
@@ -12,7 +12,7 @@ Libtoolize
 +all:	librtmp.la
  
  clean:
- 	rm -f *.o *.a *.so *.$(SO_EXT)
+ 	rm -f *.o *.a *.$(SOX) *.$(SO_EXT)
  
 -librtmp.a: $(OBJS)
 -	$(AR) rs $@ $?
@@ -23,33 +23,30 @@ Libtoolize
 +			-rpath ${PREFIX}/lib
  
  librtmp.$(SO_EXT): $(OBJS)
--	$(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
+-	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
 +	${LIBTOOL} --mode=link --tag=CC \
 +		${CC} -o ${.TARGET:.a=.la} \
 +		${OBJS:.o=.lo} \
 +		-rpath ${PREFIX}/lib \
 +		-version-info 0:0
- 	ln -sf $@ librtmp.so
+ 	ln -sf $@ librtmp.$(SOX)
  
--log.o: log.c log.h Makefile
--rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile
--amf.o: amf.c amf.h bytes.h log.h Makefile
--hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile
--parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile
-+log.o:
+ log.o: log.c log.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c log.c
-+rtmp.o:
+ rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c rtmp.c
-+amf.o:
+ amf.o: amf.c amf.h bytes.h log.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c amf.c
-+hashswf.o:
+ hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c
-+parseurl.o:
+ 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;@VERSION@;$(VERSION);" \
- 		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@
+ 	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
+@@ -97,12 +109,12 @@
+ 		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
+ 		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
  
 -install:	install_base $(SO_INST)
 +install:	install_base