10 files changed, 42 insertions, 56 deletions

diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 40841a2c09c9..d3892063ac1b 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -49,7 +49,7 @@ INSTALLS_ICONS=	yes
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -pthread
 
 OPTIONS_DEFINE=		ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \
 			PULSEAUDIO
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 6ccd92ca7857..847e0afeb1c0 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora
 
 USES=		iconv pkgconfig scons tar:bzip2
-MAKE_ENV=	APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" CCFLAGS="${CPPFLAGS}"
+MAKE_ENV=	APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz
 
diff --git a/multimedia/ffmpeg2theora/files/patch-SConstruct b/multimedia/ffmpeg2theora/files/patch-SConstruct
index 9d37ce376f6b..3ea68362898d 100644
--- a/multimedia/ffmpeg2theora/files/patch-SConstruct
+++ b/multimedia/ffmpeg2theora/files/patch-SConstruct
@@ -5,7 +5,7 @@
    BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
  )
 -env = Environment(options = opts)
-+env = Environment(options = opts, CC = Split(os.environ['CC']), CCFLAGS = Split(os.environ['CCFLAGS']))
++env = Environment(options = opts, CC = Split(os.environ['CC']))
  Help(opts.GenerateHelpText(env))
  
  pkg_flags="--cflags --libs"
@@ -17,3 +17,11 @@
        "libavutil",
    ]
    if os.path.exists("./ffmpeg"):
+@@ -203,6 +202,7 @@
+       if conf.CheckLib('iconv'):
+           env.Append(LIBS=['iconv'])
+ 
++  env.Append(LIBS=['m'])
+   if env['crossmingw']:
+       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
+       env.Append(LIBS=['m'])
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 29938955c238..cc00202d0805 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 INSTALL_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs gtk+-x11-2.0`
+LIBS+=		-L${LOCALBASE}/lib
 
 INFO=		gmerlin
 
@@ -69,21 +69,21 @@ TIFF_CONFIGURE_OFF=	--disable-libtiff
 BROKEN=	Fails to build with new libcdio
 .endif
 
+.if !(${OPSYS} == FreeBSD && ${OSVERSION} < 900033)
+LDFLAGS+=	-Wl,--add-needed
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/LIBS/s|-ldl || ; \
-		 s|^LDFLAGS="|&$${LDFLAGS} | ; \
 		 s|-DGTK_DISABLE_DEPRECATED|| ; \
-		 s|-lpthread|-pthread| ; \
 		 s|-O3.*-ffast-math||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^texinfo_|#texinfo_|g' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|ln -sf $$(DESTDIR)|ln -sf |' ${WRKSRC}/icons/Makefile.in
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|-ldl||g ; \
-		 s|-lpthread|-pthread|g ; \
-		 /^LIBS = /s|$$| @LIBINTL@ -pthread|g'
+		's|-ldl||g'
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/multimedia/gmerlin/files/patch-configure b/multimedia/gmerlin/files/patch-configure
index 68fe98404f42..e57101f87781 100644
--- a/multimedia/gmerlin/files/patch-configure
+++ b/multimedia/gmerlin/files/patch-configure
@@ -8,42 +8,15 @@
  enable_libvisual
  enable_libcdio
  enable_musicbrainz
-@@ -6324,7 +6325,7 @@
-   rm -rf conftest*
-   ;;
+@@ -13247,7 +13248,7 @@
+   GMERLIN_DEP_RPATH=""
+ fi
+ 
+-LDFLAGS="$GMERLIN_DEP_RPATH"
++LDFLAGS="$LDFLAGS $GMERLIN_DEP_RPATH"
+ 
+ 
  
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+amd64-*freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -6336,7 +6337,7 @@
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
- 	case $host in
--	  x86_64-*kfreebsd*-gnu)
-+	  amd64-*freebsd*|x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_i386_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
-@@ -6355,7 +6356,7 @@
- 	;;
-       *64-bit*)
- 	case $host in
--	  x86_64-*kfreebsd*-gnu)
-+	  amd64-*freebsd*|x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_x86_64_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
-@@ -11240,7 +11241,7 @@
- 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
- 	 if test -n "$ac_prev"; then
- 	   case $ac_word in
--	     i?86 | x86_64 | ppc | ppc64)
-+	     amd64 | i?86 | x86_64 | ppc | ppc64)
- 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
- 		 ac_arch=$ac_word
- 	       else
 @@ -15396,9 +15397,9 @@
  V4LCONVERT_REQUIRED="0.5.7"
  have_v4lconvert=false
diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile
index 03246ba83abc..b876bcfd2dfc 100644
--- a/multimedia/imagination/Makefile
+++ b/multimedia/imagination/Makefile
@@ -19,8 +19,6 @@ USE_GNOME=	gtk20 intltool intlhack libxslt
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-LIBS+=		`pkg-config --libs gmodule-2.0`
-
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
@@ -28,5 +26,7 @@ NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} '/^imagination_LDADD =/s/$$/ -lm/' \
+		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/imagination/files/patch-configure b/multimedia/imagination/files/patch-configure
index 277c8dbbdd86..087578d6476c 100644
--- a/multimedia/imagination/files/patch-configure
+++ b/multimedia/imagination/files/patch-configure
@@ -1,5 +1,14 @@
 --- ./configure.orig	2011-03-06 20:06:44.000000000 +0000
 +++ ./configure	2014-03-14 15:08:46.000000000 +0000
+@@ -12499,7 +12499,7 @@
+ 
+ LIBTOOL="$LIBTOOL --silent"
+ 
+-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0"
++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0"
+ 
+ 
+ 
 @@ -13029,7 +13029,7 @@
  
      fi
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 9e2de8f6cf08..ed4f6192196a 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -132,9 +132,7 @@ pre-configure:
 		-e 's|api.mpt||' \
 		-e 's|^(install-man.*)install-manm|\1|' \
 		${WRKSRC}/doc/mp4v2/Makefile.in
-# objformat
-	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
-	@${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec0 -lswscale0|g' \
+	@${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec0 -lavutil0 -lswscale0|g' \
 		${WRKSRC}/configure
 
 # replace bundled mp4v2 with placeholder
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 6d5a65d9cfa1..e81ee5f26b04 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -44,7 +44,7 @@ post-patch:
 		-e 's,ffmpeg/avformat,libavformat/avformat,g' \
 		-e 's,lavcodec,lavcodec0,g' \
 		-e 's,lavformat,lavformat0,g' \
-		-e 's,lavswscale,lavswscale0,g' \
+		-e '/FFMPEG_LIBS=/s/"$$/ -lavutil0"/' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index cfdb4ddc692d..f42d876f511b 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -13,10 +13,8 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libcurl.so:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		liburiparser.so:${PORTSDIR}/net/uriparser
-
 RUN_DEPENDS=	dtv-scan-tables>=0:${PORTSDIR}/multimedia/dtv-scan-tables
 
 USE_GITHUB=	yes
@@ -24,7 +22,7 @@ GH_ACCOUNT=	${PORTNAME}
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	6d19440
 
-USES=		pkgconfig gmake shebangfix python
+USES=		execinfo gmake pkgconfig python shebangfix
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_RC_SUBR=	${PORTNAME}
@@ -47,7 +45,7 @@ SUB_LIST+=	TVHUSER="${TVHUSER}" \
 CONFIGURE_ENV+=	PLATFORM=freebsd
 CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
 CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
-LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lz
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
 
 OPTIONS_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV
 OPTIONS_DEFAULT=DVBCSA