Update to 2.4.

3 files changed, 40 insertions, 39 deletions

diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index 989778f956e4..1b40fac1170f 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -5,26 +5,28 @@
 # $FreeBSD$
 
 PORTNAME=	rtmpdump
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.4
 CATEGORIES=	multimedia net
 MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A tool to download RTMP streams
 
-MAN1=		rtmpdump.1
-MAN3=		librtmp.3
-MAN8=		rtmpgw.8
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	pkgconfig
 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
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo
index 4a8873a953ed..dbb627d14700 100644
--- a/multimedia/rtmpdump/distinfo
+++ b/multimedia/rtmpdump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rtmpdump-2.3.tgz) = ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
-SIZE (rtmpdump-2.3.tgz) = 125103
+SHA256 (rtmpdump-2.4.tar.gz) = 0be975011d116bbdf1befad2a984ac83d09b1061c86550326a7ec496d2f188fc
+SIZE (rtmpdump-2.4.tar.gz) = 134558
diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile
index 906d084d6b80..edddc129b1a0 100644
--- a/multimedia/rtmpdump/files/patch-librtmp-Makefile
+++ b/multimedia/rtmpdump/files/patch-librtmp-Makefile
@@ -1,21 +1,32 @@
---- librtmp/Makefile.orig	2010-07-01 05:01:28.000000000 +0900
-+++ librtmp/Makefile	2011-01-05 23:18:28.000000000 +0900
-@@ -1,10 +1,10 @@
- VERSION=v2.3
+--- librtmp/Makefile.orig	2011-07-12 09:24:33.000000000 +0900
++++ librtmp/Makefile	2012-01-20 10:06:27.000000000 +0900
+@@ -1,19 +1,21 @@
+ VERSION=v2.4
  
 -prefix=/usr/local
-+prefix=${PREFIX}
++prefix=$(PREFIX)
+ 
+ incdir=$(prefix)/include/librtmp
+ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib
++libdatadir=$(prefix)/libdata
+ mandir=$(prefix)/man
+ BINDIR=$(DESTDIR)$(bindir)
+ INCDIR=$(DESTDIR)$(incdir)
+ LIBDIR=$(DESTDIR)$(libdir)
++LIBDATADIR=$(DESTDIR)$(libdatadir)
+ MANDIR=$(DESTDIR)$(mandir)
  
 -CC=$(CROSS_COMPILE)gcc
 -LD=$(CROSS_COMPILE)ld
 -AR=$(CROSS_COMPILE)ar
-+#CC=$(CROSS_COMPILE)gcc
-+#LD=$(CROSS_COMPILE)ld
-+#AR=$(CROSS_COMPILE)ar
++CC?=$(CROSS_COMPILE)gcc
++LD?=$(CROSS_COMPILE)ld
++AR?=$(CROSS_COMPILE)ar
  
  SYS=posix
  CRYPTO=OPENSSL
-@@ -14,7 +14,7 @@
+@@ -23,7 +25,7 @@
  DEF_GNUTLS=-DUSE_GNUTLS
  DEF_=-DNO_CRYPTO
  REQ_GNUTLS=gnutls
@@ -23,36 +34,24 @@
 +#REQ_OPENSSL=libssl,libcrypto
  LIBZ=-lz
  LIBS_posix=
- LIBS_mingw=-lws2_32 -lwinmm -lgdi32
-@@ -39,15 +39,18 @@
+ LIBS_darwin=
+@@ -67,7 +69,8 @@
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
 -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
 +#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
-+CFLAGS+= $(DEF) $(SO_DEF)
- 
- incdir=$(prefix)/include/librtmp
- bindir=$(prefix)/bin
- libdir=$(prefix)/lib
-+libdatadir=$(prefix)/libdata
- mandir=$(prefix)/man
- BINDIR=$(DESTDIR)$(bindir)
- INCDIR=$(DESTDIR)$(incdir)
- LIBDIR=$(DESTDIR)$(libdir)
-+LIBDATADIR=$(DESTDIR)$(libdatadir)
- MANDIR=$(DESTDIR)$(mandir)
++CFLAGS=$(DEF) $(OPT) $(SO_DEF)
+ LDFLAGS=$(XLDFLAGS)
  
- OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
-@@ -72,15 +75,18 @@
  
- librtmp.pc: librtmp.pc.in Makefile
- 	sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \
--		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@
-+		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
+@@ -95,15 +98,17 @@
+ 	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);" \
-+		librtmp.pc.in > $@
+ 		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
  
  install:	install_base $(SO_INST)
  
@@ -65,4 +64,4 @@
 +	cp librtmp.pc $(LIBDATADIR)/pkgconfig
  	cp librtmp.3 $(MANDIR)/man3
  
- install_so.0:	librtmp.so.0
+ install_so:	librtmp.$(SO_EXT)