Fix an implicit library dependency issue.

Discussed with:	Jan Henrik Sylvester and Thomas Zander
Feature safe:	yes

8 files changed, 64 insertions, 10 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 8876a6c286b8..c58559a318d2 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 COMMENT=	Convenient video file and movie encoder
 RESTRICTED=	Port has restricted dependencies
 
@@ -46,6 +46,7 @@ OPTIONS+=	LIBCDIO "Enable libcdio support" off
 OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
 OPTIONS+=	LIBLZO "Enable external liblzo library" off
 OPTIONS+=	V4L "Enable Video4Linux TV support" off
+OPTIONS+=	LIBRTMP "Enable RTMPDump Streaming Media support" off
 
 MAN1=		mencoder.1
 
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index c4561b21b443..820948f11090 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -61,6 +61,7 @@ OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
 OPTIONS+=	LIBLZO "Enable external liblzo library" off
 OPTIONS+=	JOYSTICK "Enable joystick support" off
 OPTIONS+=	V4L "Enable Video4Linux TV support" off
+OPTIONS+=	LIBRTMP "Enable RTMPDump Streaming Media support" off
 
 MAN1=		mplayer.1
 MANCOMPRESSED=	no
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 40f06d5e658b..da1a056ef918 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -218,6 +218,13 @@ CONFIGURE_ARGS+=	--disable-tv-v4l1 \
 			--disable-tv-v4l2
 .endif
 
+.if defined(WITH_LIBRTMP)
+LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
+CONFIGURE_ARGS+=	--enable-librtmp
+.else
+CONFIGURE_ARGS+=	--disable-librtmp
+.endif
+
 .if defined(WITH_MNG)
 LIB_DEPENDS+=		mng.1:${PORTSDIR}/graphics/libmng
 .else
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index 461674805094..6d3ac192f2ad 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2010-11-03 09:12:22.000000000 +0100
-+++ configure	2010-11-06 18:21:38.162592186 +0100
+--- configure.orig	2010-11-03 17:12:22.000000000 +0900
++++ configure	2011-01-05 23:58:07.000000000 +0900
 @@ -565,7 +565,7 @@
  _iwmmxt=auto
  _mtrr=auto
@@ -63,7 +63,24 @@
  EOF
  _vsscanf=no
  cc_check && _vsscanf=yes
-@@ -7283,7 +7270,7 @@
+@@ -6912,6 +6899,16 @@
+   nolibrtmp=no
+   def_librtmp='#define CONFIG_LIBRTMP 1'
+   inputmodules="librtmp $inputmodules"
++
++  if $_pkg_config --exists librtmp; then
++	_inc_tmp=$($_pkg_config --cflags librtmp)
++	_ld_tmp=$($_pkg_config --libs librtmp)
++  else
++	_inc_tmp="-I${LOCALBASE}/include"
++	_ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
++  fi
++  extra_ldflags="$extra_ldflags $_ld_tmp"
++  extra_cflags="$extra_cflags $_inc_tmp"
+ else
+   nolibrtmp=yes
+   _librtmp=no
+@@ -7283,7 +7280,7 @@
    def_muxers='#define CONFIG_MUXERS 1'
  else
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -72,7 +89,7 @@
    libavmuxers=""
    def_muxers='#define CONFIG_MUXERS 0'
  fi
-@@ -7645,8 +7632,11 @@
+@@ -7645,8 +7642,11 @@
  if test "$_gui" = yes ; then
  
    # Required libraries
@@ -86,7 +103,7 @@
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no && \
-@@ -8034,7 +8024,7 @@
+@@ -8034,7 +8034,7 @@
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index ab30aed41f10..1ca48998ba38 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	rtmpdump
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo
index 511a4c22c821..4a8873a953ed 100644
--- a/multimedia/rtmpdump/distinfo
+++ b/multimedia/rtmpdump/distinfo
@@ -1,3 +1,2 @@
-MD5 (rtmpdump-2.3.tgz) = eb961f31cd55f0acf5aad1a7b900ef59
 SHA256 (rtmpdump-2.3.tgz) = ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
 SIZE (rtmpdump-2.3.tgz) = 125103
diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile
index 9c54876dd8fa..906d084d6b80 100644
--- a/multimedia/rtmpdump/files/patch-librtmp-Makefile
+++ b/multimedia/rtmpdump/files/patch-librtmp-Makefile
@@ -1,5 +1,5 @@
 --- librtmp/Makefile.orig	2010-07-01 05:01:28.000000000 +0900
-+++ librtmp/Makefile	2010-08-01 01:18:35.000000000 +0900
++++ librtmp/Makefile	2011-01-05 23:18:28.000000000 +0900
 @@ -1,10 +1,10 @@
  VERSION=v2.3
  
@@ -15,6 +15,15 @@
  
  SYS=posix
  CRYPTO=OPENSSL
+@@ -14,7 +14,7 @@
+ DEF_GNUTLS=-DUSE_GNUTLS
+ DEF_=-DNO_CRYPTO
+ REQ_GNUTLS=gnutls
+-REQ_OPENSSL=libssl,libcrypto
++#REQ_OPENSSL=libssl,libcrypto
+ LIBZ=-lz
+ LIBS_posix=
+ LIBS_mingw=-lws2_32 -lwinmm -lgdi32
 @@ -39,15 +39,18 @@
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
@@ -35,7 +44,16 @@
  MANDIR=$(DESTDIR)$(mandir)
  
  OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
-@@ -77,10 +80,10 @@
+@@ -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);" \
++		-e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \
++		-e "s;@OPENSSLINC@;$(OPENSSLINC);" \
++		librtmp.pc.in > $@
+ 
  install:	install_base $(SO_INST)
  
  install_base:	librtmp.a librtmp.pc
diff --git a/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
new file mode 100644
index 000000000000..de5de1b0c29e
--- /dev/null
+++ b/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in
@@ -0,0 +1,10 @@
+--- librtmp/librtmp.pc.in.orig	2010-07-01 04:58:34.000000000 +0900
++++ librtmp/librtmp.pc.in	2011-01-05 23:29:34.000000000 +0900
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Requires: @CRYPTO_REQ@
+ URL: http://rtmpdump.mplayerhq.hu
+-Libs: -L${libdir} -lrtmp -lz
+-Cflags: -I${incdir}
++Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz -lssl -lcrypto
++Cflags: -I${incdir} -I@OPENSSLINC@