5 files changed, 37 insertions, 105 deletions

diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index d20b9eb9d101..6611521aa16b 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -2,21 +2,22 @@
 
 PORTNAME=	rtmpdump
 PORTVERSION=	2.4.20130923
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia net
 MASTER_SITES=	LOCAL/hrs
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	A tool to download RTMP streams
+COMMENT=	RTMP streams download utility
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+
 USES=		pkgconfig
-USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 MAKE_ENV=	THREADLIB="${PTHREAD_LIBS}"
 CFLAGS+=	${PTHREAD_CFLAGS} -I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
diff --git a/multimedia/rtmpdump/files/patch-Makefile b/multimedia/rtmpdump/files/patch-Makefile
index 84cc3b5a940e..ea86a39d0fbc 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-20 14:37:46.000000000 +0900
++++ Makefile	2013-10-30 15:30:57.000000000 +0900
 @@ -1,9 +1,9 @@
  VERSION=v2.4
  
@@ -25,7 +25,14 @@
  
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
-@@ -41,7 +42,7 @@
+@@ -35,13 +36,13 @@
+ LIBS_posix=
+ LIBS_darwin=
+ LIBS_mingw=-lws2_32 -lwinmm -lgdi32
+-LIB_RTMP=-Llibrtmp -lrtmp
++LIB_RTMP=-lrtmp
+ LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS)
+ 
  THREADLIB_posix=-lpthread
  THREADLIB_darwin=-lpthread
  THREADLIB_mingw=
@@ -34,3 +41,26 @@
  SLIBS=$(THREADLIB) $(LIBS)
  
  LIBRTMP=librtmp/librtmp.a
+@@ -54,9 +55,7 @@
+ 
+ PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck
+ 
+-all:	$(LIBRTMP) $(PROGS)
+-
+-$(PROGS): $(LIBRTMP)
++all:	$(PROGS)
+ 
+ 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
+-	@cd librtmp; $(MAKE) install
+ 
+ clean:
+ 	rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
+-	@cd librtmp; $(MAKE) clean
+ 
+ FORCE:
+ 
diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile
deleted file mode 100644
index 7a28f53efe31..000000000000
--- a/multimedia/rtmpdump/files/patch-librtmp-Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
---- librtmp/Makefile.orig	2013-10-07 03:52:05.000000000 +0900
-+++ librtmp/Makefile	2013-10-30 05:16:36.000000000 +0900
-@@ -1,19 +1,21 @@
- VERSION=v2.4
- 
--prefix=/usr/local
-+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
- 
- SYS=posix
- CRYPTO=OPENSSL
-@@ -23,14 +25,14 @@
- DEF_GNUTLS=-DUSE_GNUTLS
- DEF_=-DNO_CRYPTO
- 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 -lhogweed -lnettle -lgmp $(LIBZ)
--LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
-+LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ)
- LIB_POLARSSL=-lpolarssl $(LIBZ)
- PRIVATE_LIBS=$(LIBS_$(SYS))
- CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
-@@ -74,8 +76,9 @@
- 
- DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
- OPT=-O2
--CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
--LDFLAGS=$(XLDFLAGS)
-+#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
-+CFLAGS+=$(DEF) $(SO_DEF)
-+#LDFLAGS=$(XLDFLAGS)
- 
- 
- OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
-@@ -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 $(SODIR)
-+	-mkdir -p $(INCDIR) $(LIBDATADIR)/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)
diff --git a/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
deleted file mode 100644
index ce58268b4367..000000000000
--- a/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @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-plist b/multimedia/rtmpdump/pkg-plist
index 60c1247a31db..db1c2ad6b22b 100644
--- a/multimedia/rtmpdump/pkg-plist
+++ b/multimedia/rtmpdump/pkg-plist
@@ -3,15 +3,5 @@ bin/rtmpdump
 sbin/rtmpgw
 sbin/rtmpsrv
 sbin/rtmpsuck
-include/librtmp/amf.h
-include/librtmp/http.h
-include/librtmp/log.h
-include/librtmp/rtmp.h
-@dirrm include/librtmp
-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