Update to 2007-03-31 snapshot

11 files changed, 119 insertions, 539 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 9da315707145..66b3afc4981a 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	0.4.9.cvs.${RELEASE_DATE}
-PORTREVISION=	5
+DISTVERSION=	2007-03-31
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-#		http://mplayerhq.hu/MPlayer/cvs/
-MASTER_SITE_SUBDIR=	lioux
+MASTER_SITE_SUBDIR=	ahze
 PKGNAMESUFFIX=	-devel
-DISTNAME=	FFMpeg-${RELEASE_DATE}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
@@ -27,40 +24,18 @@ CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--disable-debug \
 		--enable-memalign-hack \
 		--enable-shared \
-		--source-path=${WRKSRC}
+		--enable-pp \
+		--extra-cflags="-fPIC ${CFLAGS} -I${LOCALBASE}/include" \
+		--extra-ldflags="-L${LOCALBASE}/lib" \
+		--extra-libs="${PTHREAD_LIBS}" \
+		--disable-bktr \
+		--enable-gpl
 MAKE_ENV=	INSTALL="${INSTALL}"
-
-FFMPEG_CFLAGS=	\
-		-I${WRKSRC}/libavcodec \
-		-I${WRKSRC}/libavcodec/i386 \
-		-I${WRKSRC}/libavformat \
-		-I${WRKSRC}/libavutil \
-		-I${LOCALBASE}/include \
-		-I${X11BASE}/include \
-		-I. -I.. \
-		-L${LOCALBASE}/lib \
-		-L${X11BASE}/lib \
-		${CFLAGS}
-FFMPEG_LDFLAGS=	\
-		-L${WRKSRC}/libavcodec/libpostproc \
-		-L${WRKSRC}/libavcodec \
-		-L${WRKSRC}/libavformat \
-		-L${WRKSRC}/libavutil \
-		-L${LOCALBASE}/lib \
-		-L${X11BASE}/lib \
-		${LDFLAGS} \
-		-lm \
-		-fpie \
-		-fPIE
-
-PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
+SHLIB_VER=	1
+PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	yes
 
-NO_LATEST_LINK=	yes
-CONFLICTS=      ffmpeg-[0-9]*-*
-
-RELEASE_DATE=	2006032300
-SHLIB_VERSION=	1
+CONFLICTS=	ffmpeg-[0-9]*-*
 
 MAN1=		ffmpeg.1
 
@@ -70,111 +45,14 @@ DOC_FILES=	COPYING Changelog README
 DOC_DOCFILES=	TODO faq.html ffmpeg-doc.html \
 		ffplay-doc.html ffserver-doc.html \
 		hooks.html optimization.txt
-#
 PORTDOCS=	*
 
-## headers
-HEADER_FILES=	libavcodec/avcodec.h \
-		libavcodec/dsputil.h \
-		libavutil/common.h
-#
-# libraries
-LIB_FILES=	libavcodec/libavcodec.a \
-		libavformat/libavformat.a \
-		libavutil/libavutil.a
-
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64"
-BROKEN=		Does not compile on ${ARCH}
-.endif
-
-##
-## default options
-##
-GPLLIBS=yes
-WITHOUT_LIBA52=yes
-
-##
-## support detection
-##
-.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014
-WITH_IPV6=	yes
-.endif
-
-##
-## arch detection
-##
-.if ${ARCH} != "i386"
-WITHOUT_MMX=	yes
-.else
-#EXTRA_PATCHES+=	${FILESDIR}/extra-bktr-patch-libavformat::Makefile
-.endif
 ## sse hardware vector support
 .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
 WITH_BUILTIN_VECTOR=	yes
 .endif
-# !i386 does not like bktr
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+=	--disable-bktr
-.endif
-
-##
-## lib detection
-##
-## dts
-.if exists(${LOCALBASE}/lib/libdts.a)
-WITH_DTS=yes
-.endif
-## faac
-.if exists(${LOCALBASE}/lib/libfaac.so)
-WITH_FAAC=yes
-.endif
-## faad
-.if exists(${LOCALBASE}/lib/libfaad.so)
-WITH_FAAD=yes
-.endif
-## freetype2
-.if exists(${LOCALBASE}/lib/libfreetype.so)
-WITH_FREETYPE2=yes
-.endif
-## gsm
-.if exists(${LOCALBASE}/lib/libgsm.so)
-WITH_GSM=yes
-.endif
-## imlib2
-.if exists(${LOCALBASE}/lib/libImlib2.so)
-WITH_IMLIB2=yes
-.endif
-## lame mp3
-.if exists(${LOCALBASE}/lib/libmp3lame.so)
-WITH_MP3=yes
-.endif
-## ogg
-.if exists(${LOCALBASE}/lib/libogg.so)
-WITH_OGG=yes
-.endif
-## sdl
-.if ${HAVE_SDL:Msdl}
-WITH_SDL=yes
-.endif
-## theora
-.if exists(${LOCALBASE}/lib/libtheora.so)
-## XXX theora does not work for the time being
-WITH_THEORA=yes
-.endif
-## vorbis
-.if exists(${LOCALBASE}/lib/libvorbisenc.so)
-WITH_VORBIS=yes
-.endif
-# x264
-.if exists(${LOCALBASE}/lib/libx264.so)
-WITH_X264=yes
-.endif
-# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so)
-WITH_XVID=yes
-.endif
 
 ##
 ## support activation
@@ -183,107 +61,73 @@ WITH_XVID=yes
 .ifndef(NOPORTDOCS)
 BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
 .endif
-## optimization
-# breaks ffmpeg build if defined
-FFMPEG_CFLAGS+=		-fno-force-addr
 
 .ifdef(WITH_OPTIMIZED_CFLAGS)
 FFMPEG_CFLAGS+=		-O3 -ffast-math -fomit-frame-pointer
-. if ${OSVERSION} > 502124
-FFMPEG_CFLAGS+=		-fno-unit-at-a-time
-. endif
 .endif
 
 ## a52
-.ifndef(WITHOUT_LIBA52)
+.if !defined(WITHOUT_LIBA52) && !defined(WITHOUT_A52)
 LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
 
-CONFIGURE_ARGS+=	--enable-a52 \
-			--enable-a52bin
-
-# libavcodec needs it
+CONFIGURE_ARGS+=	--enable-liba52 \
+			--enable-liba52bin
 FFMPEG_LDFLAGS+=		-la52
 .else
-CONFIGURE_ARGS+=	--enable-a52
+CONFIGURE_ARGS+=	--enable-liba52
 .endif
 ## dts
-.ifdef(WITH_DTS)
+.ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdts.a)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
 
-CONFIGURE_ARGS+=	--enable-dts
+CONFIGURE_ARGS+=	--enable-libdts
 .endif
 ## faac
-.ifdef(WITH_FAAC)
+.ifdef(WITH_FAAC) || exists(${LOCALBASE}/lib/libfaac.so)
 LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
 
-CONFIGURE_ARGS+=	--enable-faac
+CONFIGURE_ARGS+=	--enable-libfaac
 .endif
 ## faad
-.ifdef(WITH_FAAD)
+.ifdef(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.so)
 LIB_DEPENDS+=		faad.0:${PORTSDIR}/audio/faad
 
-CONFIGURE_ARGS+=	--enable-faad \
-			--enable-faadbin
+CONFIGURE_ARGS+=	--enable-libfaad \
+			--enable-libfaadbin
 .endif
-## ffserver
-.ifdef(WITHOUT_FFMPEG_FFSERVER)
-CONFIGURE_ARGS+=	--disable-ffserver
-.else
 USE_RC_SUBR=		ffserver
-
 MAN1+=			ffserver.1
 
-PLIST_FILES+=		bin/ffserver \
-			etc/ffserver.conf.sample
-.endif
-## gpl libs
-.ifdef(GPLLIBS)
-CONFIGURE_ARGS+=	--enable-gpl
-.endif
-## disable mmx
-.ifdef(WITHOUT_MMX)
+#### BROKEN LIST #####
+WITHOUT_THEORA=	yes
+
+.if ${MACHINE_CPU:Mmmx}==""
 CONFIGURE_ARGS+=	--disable-mmx
 
 WITHOUT_BUILTIN_VECTOR=	yes
 .endif
 ## gsm
-.ifdef(WITH_GSM)
+.ifdef(WITH_GSM) || exists(${LOCALBASE}/lib/libgsm.so)
 LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
 
 CONFIGURE_ARGS+=	--enable-libgsm
 .endif
 ## mp3
-.ifdef(WITH_MP3)
+.ifdef(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.so) || defined(WITH_MP3)
 LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
 
-CONFIGURE_ARGS+=	--enable-mp3lame
+CONFIGURE_ARGS+=	--enable-libmp3lame
 .endif
 ## ogg
-.ifdef(WITH_OGG)
+.ifdef(WITH_OGG) || exists(${LOCALBASE}/lib/libogg.so)
 LIB_DEPENDS+=		ogg.5:${PORTSDIR}/audio/libogg
 
 CONFIGURE_ARGS+=	--enable-libogg
 .endif
-## post processing
-.ifndef(WITHOUT_POSTPROCESS)
-CONFIGURE_ARGS+=	--enable-pp
 
-LIB_FILES+=		libavcodec/libpostproc/libpostproc.a
-PLIST_DIRS+=		include/ffmpeg/postproc
-PLIST_FILES+=		include/ffmpeg/postproc/postprocess.h \
-			lib/libpostproc.a \
-			lib/libpostproc.so \
-			lib/libpostproc.so.0 \
-			lib/libpostproc.so.%%SHLIB_VERSION%% \
-			libdata/pkgconfig/libpostproc.pc
-.endif
-## pthreads
-.ifndef(WITHOUT_PTHREADS)
-CONFIGURE_ARGS+=		--enable-pthreads
-.endif
 ## SDL
-.ifdef(WITH_SDL)
-USE_SDL=	sdl
+.ifdef(WITH_SDL) || ${HAVE_SDL:Msdl}
+USE_SDL+=	sdl
 
 MAN1+=		ffplay.1
 
@@ -292,20 +136,22 @@ PLIST_FILES+=	bin/ffplay
 CONFIGURE_ARGS+=	--disable-ffplay
 .endif
 ## theora
-.ifdef(WITH_THEORA)
+.if !defined(WITHOUT_THEORA)
+WITH_OGG=	yes
 LIB_DEPENDS+=		theora.2:${PORTSDIR}/multimedia/libtheora
 
-CONFIGURE_ARGS+=	--enable-theora
+CONFIGURE_ARGS+=	--enable-libtheora
 .endif
 ## vorbis
-.ifdef(WITH_VORBIS)
+.if !defined(WITHOUT_VORBIS)
+WITH_OGG=	yes
 LIB_DEPENDS+=		vorbisenc.2:${PORTSDIR}/audio/libvorbis
 
-CONFIGURE_ARGS+=	--enable-vorbis
+CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .endif
 # x264
-.ifdef(WITH_X264)
+.ifdef(WITH_X264) || exists(${LOCALBASE}/lib/libx264.so)
 LIB_DEPENDS+=		x264.50:${PORTSDIR}/multimedia/x264
 
 CONFIGURE_ARGS+=	--enable-x264
@@ -314,24 +160,12 @@ CONFIGURE_ARGS+=	--enable-x264
 .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
 FFMPEG_CFLAGS+=		-msse
 .endif
-## vhook
-.ifndef(WITHOUT_VHOOK)
-PLIST_DIRS+=	lib/vhook
-PLIST_FILES+=	\
-		lib/vhook/fish.so \
-		lib/vhook/null.so \
-		lib/vhook/ppm.so \
-		lib/vhook/watermark.so
-
-# enable freetype2
-. ifdef(WITH_FREETYPE2)
+. ifdef(WITH_FREETYPE2) || exists(${LOCALBASE}/lib/libfreetype.so)
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 
 PLIST_FILES+=	lib/vhook/drawtext.so
 . endif # freetype2
-
-# enable imlib2
-. ifdef(WITH_IMLIB2)
+. ifdef(WITH_IMLIB2) || exists(${LOCALBASE}/lib/libImlib2.so)
 LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
 
 PLIST_FILES+=	lib/vhook/imlib2.so
@@ -339,31 +173,18 @@ PLIST_FILES+=	lib/vhook/imlib2.so
 WITHOUT_IMLIB2=	yes
 . endif # imlib2
 
-.else
-CONFIGURE_ARGS+=	--disable-vhook
-.endif ## WITHOUT_VHOOK
 ## xvid
-.ifdef(WITH_XVID)
+.ifdef(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so)
 LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
 
 CONFIGURE_ARGS+=	--enable-xvid
 .endif
 
-###
-### XXX - PLIST_DIRS come after PLIST entries so some aforementioned
-### entries breaks PLIST
-###
-PLIST_DIRS+=		include/ffmpeg
-
 pre-everything::
-.ifndef(WITHOUT_LIBA52)
+.ifndef(WITHOUT_A52)
 	@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
 	@${ECHO_MSG}
 .endif
-.if !defined(WITHOUT_BUILTIN_VECTOR) && !defined(WITH_BUILTIN_VECTOR)
-	@${ECHO_MSG} 'Define WITH_BUILTIN_VECTOR if your system supports SSE'
-	@${ECHO_MSG}
-.endif
 .ifndef(WITH_DTS)
 	@${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
 	@${ECHO_MSG}
@@ -376,10 +197,6 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITH_FAAD to enable FAAD codec'
 	@${ECHO_MSG}
 .endif
-.ifndef(WITHOUT_FFMPEG_FFSERVER)
-	@${ECHO_MSG} 'Define WITHOUT_FFMPEG_FFSERVER to disable ffserver build'
-	@${ECHO_MSG}
-.endif
 .ifndef(WITH_FREETYPE2)
 	@${ECHO_MSG} 'Define WITH_FREETYPE2 to enable VHOOK drawtext FREETYPE2 codec'
 	@${ECHO_MSG}
@@ -388,16 +205,8 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITHOUT_IPV6 to disable IPV6 network support'
 	@${ECHO_MSG}
 .endif
-.ifndef(WITH_GSM)
-	@${ECHO_MSG} 'Define WITH_GSM to enable GSM codec'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_MMX)
-	@${ECHO_MSG} 'Define WITHOUT_MMX if your system does not support MMX'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_MP3)
-	@${ECHO_MSG} 'Define WITH_MP3 to enable lame MP3 codec'
+.ifndef(WITH_LAME)
+	@${ECHO_MSG} 'Define WITH_LAME to enable lame MP3 codec'
 	@${ECHO_MSG}
 .endif
 .ifndef(WITH_OGG)
@@ -409,28 +218,6 @@ pre-everything::
 	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
 	@${ECHO_MSG}
 .endif
-.ifndef(WITHOUT_PTHREADS)
-	@${ECHO_MSG} 'Define WITHOUT_PTHREADS to disable threading support'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_POSTPROCESS)
-	@${ECHO_MSG} 'You can disable post process support by defining'
-	@${ECHO_MSG} 'WITHOUT_POSTPROCESS'
-	@${ECHO_MSG} 'Beware that this might break some ports that require it'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_SDL)
-	@${ECHO_MSG} 'Define WITH_SDL to enable ffplay SDL version'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITH_THEORA)
-	@${ECHO_MSG} 'Define WITH_THEORA to enable THEORA codec'
-	@${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_VHOOK)
-	@${ECHO_MSG} 'You can disable vhook support by defining WITHOUT_VHOOK'
-	@${ECHO_MSG}
-.endif
 .ifndef(WITH_VORBIS)
 	@${ECHO_MSG} 'Define WITH_VORBIS to enable libvorbisenc VORBIS codec'
 	@${ECHO_MSG}
@@ -443,45 +230,21 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
 	@${ECHO_MSG}
 .endif
-.if ${ARCH} == "i386"
-. ifndef(WITH_VIDEO_CAPTURE)
-	@${ECHO_MSG} 'Define WITH_VIDEO_CAPTURE to enable bktr(4) driver'
-	@${ECHO_MSG} 'video capture'
-	@${ECHO_MSG}
-. else
-.if !(defined(WITH_BKTR_FORMAT) && defined(WITH_BKTR_DEV))
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'If you want to capture from a bktr(4) supported card'
-	@${ECHO_MSG} 'you will probably need to set the input device and format'
-	@${ECHO_MSG} 'You can set WITH_BKTR_FORMAT to NTSC or PAL and you can set'
-	@${ECHO_MSG} 'WITH_BKTR_DEV to 0, 1, 2 or 3 (1 is usually the tuner)'
-	@${ECHO_MSG} 'so for a PAL tuner make WITH_BKTR_FORMAT=PAL WITH_BKTR_DEV=1'
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'Warning: invalid settings will probably dump cores'
-	@${ECHO_MSG}
-.endif
-. endif # WITH_VIDEO_CAPTURE
-.endif # ${ARCH} == i386
-
-post-extract:
-.if ${ARCH} == "i386"
-# install booktree extension
-#	@${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat/
-.endif # ${ARCH} == i386
 
 post-patch:
 # {C,LD}FLAGS safeness
-	@${FIND} ${WRKDIR} -type f -name "Makefile" -print0 | \
-		${XARGS} -0 -n 5 -x \
-			${REINPLACE_CMD} -E \
-			-e 's@^(CFLAGS.+)$$@\1 ${FFMPEG_CFLAGS}@' \
-			-e 's@^(FFLIBS|LDFLAGS)(.+)$$@\1\2 ${FFMPEG_LDFLAGS}@'
 # fix x264 math, use correct log base 2 from math(3)
+.if ${OSVERSION} <= 601000
 	@${REINPLACE_CMD} -E \
 		-e 's| log2| log|' \
 		${WRKSRC}/libavcodec/x264.c
+.endif
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/common.mak
 	@${REINPLACE_CMD} -E \
-		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g" \
+		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%SHLIB_VER%%|${SHLIB_VER}|g; \
+		s|-pthread|${PTHREAD_LIBS}|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # force detection of texi2html
 .ifndef(NOPORTDOCS)
@@ -489,45 +252,12 @@ post-patch:
 		-e 's|^(texi2html=)no|\1yes|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
-.if ${ARCH} == "i386"
-.ifdef(WITH_VIDEO_CAPTURE)
-# set proper audio device
-.ifdef(WITH_AUDIO_DEV)
-	@${REINPLACE_CMD} -E \
-		-e 's!/dev/dsp!${WITH_AUDIO_DEV:Q}!' \
-		${WRKSRC}/libavformat/audio.c
-.endif
-.ifdef(WITH_BKTR_DEV)
-#	@${REINPLACE_CMD} -E \
-#		-e "s!idev = 0!idev = ${WITH_BKTR_DEV}!" \
-#		${WRKSRC}/libavformat/grab_bsdbktr.c
-.endif
-.ifdef(WITH_BKTR_FORMAT)
-#	@${REINPLACE_CMD} -E \
-#		-e "s!VIDEO_FORMAT NTSC!VIDEO_FORMAT ${WITH_BKTR_FORMAT}!" \
-#		${WRKSRC}/libavformat/grab_bsdbktr.c
-.endif
-.endif # WITH_VIDEO_CAPTURE
-.endif # ${ARCH} == i386
-# malloc.h was deprecated in favor of stdlib.h
-# do not shadow fprintf(3) with bogus statement
 	@${FIND} ${WRKSRC} -type f -print0 | \
 		${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
 		-e 's|malloc\.h|stdlib\.h|' \
 		-e 's|^.*please_use_av_log.*$$||'
-.ifndef(WITHOUT_LIBA52)
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -E \
-		-e 's|../(avcodec.h)|\1|' \
-		${WRKSRC}/libavcodec/liba52/a52.h
-.endif
-.ifndef(WITHOUT_FFMPEG_FFSERVER)
-	@${REINPLACE_CMD} -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
-		${WRKSRC}/ffserver.c ${WRKSRC}/doc/ffserver-doc.texi
-	@${REINPLACE_CMD} -e 's!NoDaemon!# NoDaemon!g' \
-		${WRKSRC}/doc/ffserver.conf
-.endif
 .if defined(WITH_IMLIB2) && !defined(WITHOUT_IMLIB2)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(imlib2).*$$|\1=yes|' \
@@ -536,7 +266,7 @@ post-patch:
 		-e 's|(-lImlib2)|-L ${LOCALBASE}/lib \1|' \
 		${WRKSRC}/vhook/Makefile
 .endif
-.if defined(WITH_IPV6) && ${OSVERSION} >= 400014
+.if defined(WITH_IPV6)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(ipv6).*$$|\1=yes|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -549,10 +279,6 @@ post-patch:
 		${XARGS} -n 10 ${REINPLACE_CMD} -E \
 		-e 's|#include <SDL|#include <SDL/SDL|'
 .endif
-.ifndef(WITHOUT_POSTPROCESS)
-	@${LN} -sf libpostproc.so \
-		${WRKSRC}/libavcodec/libpostproc/libpostproc.so.${SHLIB_VERSION}
-.endif
 .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
 	@${REINPLACE_CMD} -E \
 		-e 's|^([[:space:]]+builtin_vector).*$$|\1=yes|' \
@@ -564,10 +290,6 @@ post-patch:
 .endif
 
 post-configure:
-# FreeBSD 5.4-STABLE and later have lrintf()
-.if ${OSVERSION} >= 504100
-	@${ECHO_CMD} '#define HAVE_LRINTF' >> ${WRKSRC}/config.h
-.endif
 .ifdef(WITH_DTS)
 	@${REINPLACE_CMD} -E \
 		-e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
@@ -594,32 +316,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
-.ifndef(WITHOUT_FFMPEG_FFSERVER)
-	@${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
-		${PREFIX}/etc/ffserver.conf.sample
-.endif
-.for file in ${HEADER_FILES}
-# fix header references prior to installation
-	@${REINPLACE_CMD} -e 's|"common.h"|<ffmpeg/common.h>|; \
-		s|"avcodec.h"|<ffmpeg/avcodec.h>|' \
-		${WRKSRC}/${file}
-	@${INSTALL_DATA} ${WRKSRC}/${file} \
-		${PREFIX}/include/ffmpeg/${file:T}
-# change headers back so reinstall target works
-	@${REINPLACE_CMD} -e 's|<ffmpeg/common.h>|"common.h"|; \
-		s|<ffmpeg/avcodec.h>|"avcodec.h"|' \
-		${WRKSRC}/${file}
-.endfor
-.for file in ${LIB_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/${file:T}
-	@${LN} -sf ${file:T:R}.so \
-		${PREFIX}/lib/${file:T:R}.so.${SHLIB_VERSION}
-.endfor
-.ifndef(WITHOUT_POSTPROCESS)
-# XXX - libavcodec.so needs libpostproc.so but looks for libpostproc.so.0
-# existence instead of libpostproc.so.${SHLIB_VERSION}
-	@${LN} -sf libpostproc.so \
-		${PREFIX}/lib/libpostproc.so.0
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index b13546dbf4ba..c753d3aa4d50 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (FFMpeg-2006032300.tar.bz2) = 09fc4f533b0c0a8cc004d1fd1761772d
-SHA256 (FFMpeg-2006032300.tar.bz2) = 782c61e789960c6fd6763cab7df46baa530a4c6e2fc4e8a7d0055b1fb6bc3e4f
-SIZE (FFMpeg-2006032300.tar.bz2) = 1767400
+MD5 (ffmpeg-2007-03-31.tar.bz2) = fbfa641b1d5ac22976e8d76cc8435fb0
+SHA256 (ffmpeg-2007-03-31.tar.bz2) = e548cf6c87618853f2f74f8c09a0d9389c60fd96657773d02f0c6a8faf8c248c
+SIZE (ffmpeg-2007-03-31.tar.bz2) = 2188500
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile
deleted file mode 100644
index f09effb0797a..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	Wed Mar 15 21:15:07 2006
-+++ Makefile	Thu Mar 23 14:49:50 2006
-@@ -59,7 +59,7 @@
- 
- OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
- SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
--FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
-+FFLIBS = -L./libavutil -lavutil$(BUILDSUF) -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF)
- 
- all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
- 
-@@ -118,8 +118,7 @@
- else
- install-progs: $(PROG)
- endif
--	install -d "$(bindir)"
--	install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
-+	${BSD_INSTALL_PROGRAM} $(PROG) "$(bindir)"
- 
- # create the window installer
- wininstaller: all install
-@@ -129,8 +128,7 @@
- install-man:
- ifneq ($(CONFIG_WIN32),yes)
- 	if [ -f doc/ffmpeg.1 ] ; then \
--	    install -d "$(mandir)/man1" ; \
--	    install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
-+	    ${BSD_INSTALL_MAN} $(MANPAGE) "${MANPREFIX}/man/man1" ; \
- 	fi
- endif
- 
diff --git a/multimedia/ffmpeg-devel/files/patch-common.mak b/multimedia/ffmpeg-devel/files/patch-common.mak
deleted file mode 100644
index a8577f0de62a..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-common.mak
+++ /dev/null
@@ -1,36 +0,0 @@
---- common.mak.orig	Thu Mar 23 14:55:10 2006
-+++ common.mak	Thu Mar 23 15:01:13 2006
-@@ -71,27 +71,20 @@
- install-libs: $(INSTLIBTARGETS)
- 
- install-lib-shared: $(SLIBNAME)
--	install -d "$(libdir)"
- ifeq ($(CONFIG_WIN32),yes)
- 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
--	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
--		$(libdir)/$(SLIBNAME_WITH_VERSION)
--	ln -sf $(SLIBNAME_WITH_VERSION) \
--		$(libdir)/$(SLIBNAME_WITH_MAJOR)
--	ln -sf $(SLIBNAME_WITH_VERSION) \
--		$(libdir)/$(SLIBNAME)
-+	${BSD_INSTALL_DATA} $(SLIBNAME) \
-+		$(libdir)
- endif
- 
- install-lib-static: $(LIB)
--	install -d "$(libdir)"
--	install -m 644 $(LIB) "$(libdir)"
-+	${BSD_INSTALL_DATA} $(LIB) "$(libdir)"
- 
- install-headers:
--	install -d "$(incdir)"
--	install -d "$(libdir)/pkgconfig"
--	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
--	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
-+	${INSTALL} -d "$(incdir)"
-+	${BSD_INSTALL_DATA} $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
-+	${BSD_INSTALL_DATA} $(BUILD_ROOT)/lib$(NAME).pc "$(prefix)/libdata/pkgconfig"
- 
- #
- # include dependency files if they exist
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index 55f22248f1c5..6987610be7e8 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,48 +1,44 @@
---- configure.orig	Sun Mar 19 01:31:55 2006
-+++ configure	Thu Sep 28 20:27:49 2006
-@@ -138,7 +138,7 @@
-     cpu="x86"
-   ;;
-   x86_64|amd64)
--    cpu="x86"
-+    cpu="x86_64"
-     canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
-     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
-       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-@@ -1107,6 +1107,8 @@
- builtin_vector=no
- if $cc -msse -o $TMPO $TMPC 2> /dev/null ; then
-   builtin_vector=yes
-+else
-+  builtin_vector=no
- fi
- 
- # test for mm3dnow.h
-@@ -1597,13 +1599,13 @@
-   echo "#define BUILD_SHARED_AV 1" >> $TMPH
+--- configure.orig	Sat Mar 31 00:25:05 2007
++++ configure	Sun Apr  1 18:59:07 2007
+@@ -1966,15 +1966,15 @@
+ if enabled shared; then
    echo "BUILD_SHARED=yes" >> config.mak
    echo "PIC=-fPIC -DPIC" >> config.mak
--  echo "SPPMAJOR=${lavc_version%%.*}" >> config.mak
--  echo "SPPVERSION=$lavc_version" >> config.mak
--  echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
+-  echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
 +  echo "SPPMAJOR=1" >> config.mak
-+  echo "SPPVERSION=1" >> config.mak
-+  echo "LAVCMAJOR=1" >> config.mak
+   echo "SPPVERSION=$pp_version" >> config.mak
+-  echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
++  echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
    echo "LAVCVERSION=$lavc_version" >> config.mak
 -  echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
-+  echo "LAVFMAJOR=1" >> config.mak
++  echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
    echo "LAVFVERSION=$lavf_version" >> config.mak
 -  echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
-+  echo "LAVUMAJOR=1" >> config.mak
++  echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
    echo "LAVUVERSION=$lavu_version" >> config.mak
+-  echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
++  echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
+   echo "SWSVERSION=$sws_version" >> config.mak
    echo "SLIBNAME=${SLIBNAME}" >> config.mak
    echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -2075,7 +2077,7 @@
- Requires:
+@@ -2103,8 +2103,8 @@
+ Version: $version
+ Requires: $requires
+ Conflicts:
+-Libs: -L\${libdir} $libs
+-Cflags: -I\${includedir} -I\${includedir}/$include
++Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
++Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include
+ EOF
+ }
+ 
+@@ -2127,7 +2127,8 @@
+ Requires: $requires
  Conflicts:
- Libs: -L\${libdir} -lpostproc
--Cflags: -I\${includedir} -I\${includedir}/postproc
-+Cflags: -I\${includedir} -I\${includedir}/ffmpeg/postproc
+ Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
+-Cflags: -I\${includedir}
++Ldflags: -L%%LOCALBASE%%/lib
++Cflags: -I\${includedir} -I%%LOCALBASE%%/include
  EOF
+ }
  
- cat <<EOF >libpostproc-uninstalled.pc
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
deleted file mode 100644
index 58eaf0236fbe..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/libpostproc/Makefile.orig	Thu Mar 23 15:07:08 2006
-+++ libavcodec/libpostproc/Makefile	Thu Mar 23 15:07:13 2006
-@@ -2,7 +2,7 @@
- include ../../config.mak
- 
- # Overload incdir, postproc include files go in a different directory.
--incdir=$(prefix)/include/postproc
-+incdir=$(prefix)/include/ffmpeg/postproc
- 
- NAME=postproc
- SUBDIR=libavcodec/libpostproc
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c
deleted file mode 100644
index b9b40c2c54c3..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libavcodec/x264.c.orig	Mon Feb 20 14:01:29 2006
-+++ libavcodec/x264.c	Mon Nov 13 10:29:53 2006
-@@ -142,13 +142,17 @@
-     x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
-     if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
-     else{
--        if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
-+#if X264_BUILD >= 54
-+        if(avctx->crf) x4->params.rc.f_rf_constant = avctx->crf;
-+#else
-+	if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
-+#endif
-         else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp;
-     }
- 
-     // if neither crf nor cqp modes are selected we have to enable the RC
-     // we do it this way because we cannot check if the bitrate has been set
--    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1;
-+    if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = 1;
- 
-     x4->params.i_bframe = avctx->max_b_frames;
-     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::udp.c b/multimedia/ffmpeg-devel/files/patch-libavformat::udp.c
deleted file mode 100644
index 11bd9641d541..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::udp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libavformat/udp.c.orig	Tue May 10 01:08:33 2005
-+++ libavformat/udp.c	Tue May 10 01:09:27 2005
-@@ -27,6 +27,10 @@
- # include "barpainet.h"
- #endif
- #include <netdb.h>
-+#ifndef IPV6_ADD_MEMBERSHIP
-+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
-+#endif
- 
- typedef struct {
-     int udp_fd;
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c b/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c
deleted file mode 100644
index c814b06d11f4..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libavformat/movenc.c.orig	Wed Mar 22 16:49:05 2006
-+++ libavformat/movenc.c	Wed Aug 23 12:37:33 2006
-@@ -22,6 +22,10 @@
- #include "avio.h"
- #include "mov.h"
- 
-+#ifndef UINT32_MAX
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- #undef NDEBUG
- #include <assert.h>
- 
diff --git a/multimedia/ffmpeg-devel/files/patch-vhook__Makefile b/multimedia/ffmpeg-devel/files/patch-vhook__Makefile
deleted file mode 100644
index c831f960ec3b..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-vhook__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- vhook/Makefile.orig	Thu Mar 23 14:34:08 2006
-+++ vhook/Makefile	Thu Mar 23 14:35:12 2006
-@@ -27,8 +27,8 @@
- 	$(CC) -MM $(CFLAGS) $^ 1>.depend
- 
- install:
--	install -d "$(libdir)/vhook"
--	install -m 755 $(HOOKS) "$(libdir)/vhook"
-+	${INSTALL} -d "$(libdir)/vhook"
-+	${BSD_INSTALL_DATA} $(HOOKS) "$(libdir)/vhook"
- 
- imlib2$(SLIBSUF): imlib2.o
- 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -L /usr/local/lib -lImlib2
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index 2af866958b50..8c4e440ad397 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -1,26 +1,54 @@
 bin/ffmpeg
+bin/ffserver
+include/ffmpeg/adler32.h
 include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
 include/ffmpeg/avutil.h
+include/ffmpeg/base64.h
 include/ffmpeg/common.h
-include/ffmpeg/dsputil.h
+include/ffmpeg/fifo.h
 include/ffmpeg/integer.h
 include/ffmpeg/intfloat_readwrite.h
+include/ffmpeg/log.h
+include/ffmpeg/lzo.h
 include/ffmpeg/mathematics.h
+include/ffmpeg/md5.h
+include/ffmpeg/mem.h
+include/ffmpeg/opt.h
+include/ffmpeg/random.h
 include/ffmpeg/rational.h
+include/ffmpeg/rgb2rgb.h
 include/ffmpeg/rtp.h
 include/ffmpeg/rtsp.h
 include/ffmpeg/rtspcodes.h
+include/ffmpeg/swscale.h
+include/postproc/postprocess.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.%%SHLIB_VERSION%%
+lib/libavcodec.so.%%SHLIB_VER%%
+lib/libavcodec.so.51.40.2
 lib/libavformat.a
 lib/libavformat.so
-lib/libavformat.so.%%SHLIB_VERSION%%
+lib/libavformat.so.%%SHLIB_VER%%
+lib/libavformat.so.51.11.0
 lib/libavutil.a
 lib/libavutil.so
-lib/libavutil.so.%%SHLIB_VERSION%%
+lib/libavutil.so.%%SHLIB_VER%%
+lib/libavutil.so.49.4.0
+lib/libpostproc.a
+lib/libpostproc.so
+lib/libpostproc.so.%%SHLIB_VER%%
+lib/libpostproc.so.51.1.0
+lib/vhook/fish.so
+lib/vhook/null.so
+lib/vhook/ppm.so
+lib/vhook/watermark.so
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavformat.pc
 libdata/pkgconfig/libavutil.pc
+libdata/pkgconfig/libpostproc.pc
+libdata/pkgconfig/libswscale.pc
+@dirrm lib/vhook
+@dirrm include/postproc
+@dirrm include/ffmpeg