11 files changed, 123 insertions, 119 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index efade7538500..0eab951718e1 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	0.4.9.cvs.${RELEASE_DATE}
-PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 #		http://mplayerhq.hu/MPlayer/cvs/
@@ -21,7 +20,6 @@ COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 WANT_SDL=	yes
 CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--make="${GMAKE}" \
@@ -29,11 +27,13 @@ CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--enable-memalign-hack \
 		--enable-shared \
 		--source-path=${WRKSRC}
+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.. \
@@ -44,6 +44,7 @@ FFMPEG_LDFLAGS=	\
 		-L${WRKSRC}/libavcodec/libpostproc \
 		-L${WRKSRC}/libavcodec \
 		-L${WRKSRC}/libavformat \
+		-L${WRKSRC}/libavutil \
 		-L${LOCALBASE}/lib \
 		-L${X11BASE}/lib \
 		${LDFLAGS} \
@@ -57,7 +58,7 @@ INSTALLS_SHLIB=	yes
 NO_LATEST_LINK=	yes
 CONFLICTS=      ffmpeg-[0-9]*-*
 
-RELEASE_DATE=	2005122600
+RELEASE_DATE=	2006032300
 SHLIB_VERSION=	1
 
 MAN1=		ffmpeg.1
@@ -84,7 +85,7 @@ LIB_FILES=	libavcodec/libavcodec.a \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		"Does not compile on ${ARCH}"
+BROKEN=		Does not compile on ${ARCH}
 .endif
 
 ##
@@ -108,7 +109,7 @@ WITHOUT_MMX=	yes
 .else
 #EXTRA_PATCHES+=	${FILESDIR}/extra-bktr-patch-libavformat::Makefile
 .endif
-## sse hardware vector support 
+## sse hardware vector support
 .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
 WITH_BUILTIN_VECTOR=	yes
 .endif
@@ -227,13 +228,12 @@ CONFIGURE_ARGS+=	--enable-faad \
 .ifdef(WITHOUT_FFMPEG_FFSERVER)
 CONFIGURE_ARGS+=	--disable-ffserver
 .else
-USE_RC_SUBR=		yes
+USE_RC_SUBR=		ffserver
 
 MAN1+=			ffserver.1
 
 PLIST_FILES+=		bin/ffserver \
-			etc/ffserver.conf.sample \
-			etc/rc.d/ffserver.sh
+			etc/ffserver.conf.sample
 .endif
 ## gpl libs
 .ifdef(GPLLIBS)
@@ -265,8 +265,7 @@ CONFIGURE_ARGS+=	--enable-libogg
 .endif
 ## post processing
 .ifndef(WITHOUT_POSTPROCESS)
-CONFIGURE_ARGS+=	--enable-pp \
-			--enable-shared-pp
+CONFIGURE_ARGS+=	--enable-pp
 
 LIB_FILES+=		libavcodec/libpostproc/libpostproc.a
 PLIST_DIRS+=		include/ffmpeg/postproc
@@ -523,8 +522,6 @@ post-patch:
 		${WRKSRC}/libavcodec/liba52/a52.h
 .endif
 .ifndef(WITHOUT_FFMPEG_FFSERVER)
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%RC_SUBR%%|${RC_SUBR}|' \
-		${FILESDIR}/ffserver.sh >${WRKDIR}/ffserver.sh
 	@${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' \
@@ -599,7 +596,6 @@ post-install:
 .ifndef(WITHOUT_FFMPEG_FFSERVER)
 	@${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
 		${PREFIX}/etc/ffserver.conf.sample
-	@${INSTALL_SCRIPT} ${WRKDIR}/ffserver.sh ${PREFIX}/etc/rc.d
 .endif
 .for file in ${HEADER_FILES}
 # fix header references prior to installation
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index f93542b48798..b13546dbf4ba 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (FFMpeg-2005122600.tar.bz2) = 15dbea41624359a15c3464f8ea7ceeb3
-SHA256 (FFMpeg-2005122600.tar.bz2) = 9eec3b519116bfe1ef108be26e0998b47aae0821d68e404915bbf6ca57ad9224
-SIZE (FFMpeg-2005122600.tar.bz2) = 1692320
+MD5 (FFMpeg-2006032300.tar.bz2) = 09fc4f533b0c0a8cc004d1fd1761772d
+SHA256 (FFMpeg-2006032300.tar.bz2) = 782c61e789960c6fd6763cab7df46baa530a4c6e2fc4e8a7d0055b1fb6bc3e4f
+SIZE (FFMpeg-2006032300.tar.bz2) = 1767400
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile
new file mode 100644
index 000000000000..f09effb0797a
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-Makefile
@@ -0,0 +1,31 @@
+--- 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
new file mode 100644
index 000000000000..a8577f0de62a
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-common.mak
@@ -0,0 +1,36 @@
+--- 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 b1cbd2e12a79..cf8e48111ee5 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Dec 17 16:14:03 2005
-+++ configure	Tue Dec 20 03:13:45 2005
-@@ -1021,6 +1021,8 @@
+--- configure.orig	Sun Mar 19 03:31:32 2006
++++ configure	Thu Mar 23 15:15:34 2006
+@@ -1107,6 +1107,8 @@
  builtin_vector=no
  if $cc -msse -o $TMPO $TMPC 2> /dev/null ; then
    builtin_vector=yes
@@ -8,23 +8,32 @@
 +  builtin_vector=no
  fi
  
- # dlopen/dlfcn.h probing
-@@ -1457,13 +1459,13 @@
- if test "$lshared" = "yes" ; then
+ # test for mm3dnow.h
+@@ -1597,13 +1599,13 @@
+   echo "#define BUILD_SHARED_AV 1" >> $TMPH
    echo "BUILD_SHARED=yes" >> config.mak
    echo "PIC=-fPIC -DPIC" >> config.mak
--  echo "SPPMAJOR=${lavc_version/.*/}" >> config.mak
+-  echo "SPPMAJOR=${lavc_version%%.*}" >> config.mak
 -  echo "SPPVERSION=$lavc_version" >> config.mak
--  echo "LAVCMAJOR=${lavc_version/.*/}" >> config.mak
+-  echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
 +  echo "SPPMAJOR=1" >> config.mak
 +  echo "SPPVERSION=1" >> config.mak
 +  echo "LAVCMAJOR=1" >> config.mak
    echo "LAVCVERSION=$lavc_version" >> config.mak
--  echo "LAVFMAJOR=${lavf_version/.*/}" >> config.mak
+-  echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
 +  echo "LAVFMAJOR=1" >> config.mak
    echo "LAVFVERSION=$lavf_version" >> config.mak
--  echo "LAVUMAJOR=${lavu_version/.*/}" >> config.mak
+-  echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
 +  echo "LAVUMAJOR=1" >> config.mak
    echo "LAVUVERSION=$lavu_version" >> config.mak
- fi
- echo "EXTRALIBS=$extralibs" >> config.mak
+   echo "SLIBNAME=${SLIBNAME}" >> config.mak
+   echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
+@@ -2075,7 +2077,7 @@
+ Requires:
+ Conflicts:
+ Libs: -L\${libdir} -lpostproc
+-Cflags: -I\${includedir} -I\${includedir}/postproc
++Cflags: -I\${includedir} -I\${includedir}/ffmpeg/postproc
+ EOF
+ 
+ cat <<EOF >libpostproc-uninstalled.pc
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
deleted file mode 100644
index 8f943ff510c0..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- libavcodec/Makefile.orig	Mon Nov 28 22:57:22 2005
-+++ libavcodec/Makefile	Mon Nov 28 22:58:37 2005
-@@ -488,8 +488,7 @@
- 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
--	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
-+	${BSD_INSTALL_DATA} $(SLIBNAME) $(libdir)/libavcodec.so
- 	$(LDCONFIG) || true
- endif
- ifeq ($(CONFIG_PP),yes)
-@@ -504,10 +503,10 @@
- 
- install-headers:
- 	mkdir -p "$(prefix)/include/ffmpeg"
--	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
-+	${BSD_INSTALL_DATA} $(SRC_PATH)/libavcodec/avcodec.h \
-                 "$(prefix)/include/ffmpeg"
--	install -d "$(libdir)/pkgconfig"
--	install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig"
-+	install -d "$(prefix)/libdata/pkgconfig"
-+	${BSD_INSTALL_DATA} ../libavcodec.pc "$(prefix)/libdata/pkgconfig"
- 
- #
- # include dependency files if they exist
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
index 25dcebf493b0..58eaf0236fbe 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
@@ -1,24 +1,11 @@
---- libavcodec/libpostproc/Makefile.orig	Mon Nov 28 22:37:54 2005
-+++ libavcodec/libpostproc/Makefile	Mon Nov 28 22:47:35 2005
-@@ -62,16 +62,14 @@
- 	install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) $(libdir)/$(SPPLIB)
--	ln -sf $(SPPLIB) $(libdir)/$(SPPLIBNAME)
--	ln -sf $(SPPLIB) $(libdir)/$(SPPLIBMAJOR)
--	install -d $(libdir)/pkgconfig
--	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
-+	${BSD_INSTALL_DATA} $(SPPLIBNAME) $(libdir)/libpostproc.so
-+	install -d $(prefix)/libdata/pkgconfig
-+	${BSD_INSTALL_DATA} ../../libpostproc.pc $(prefix)/libdata/pkgconfig
- 	$(LDCONFIG) || true
- endif
- endif
--	mkdir -p $(prefix)/include/postproc
--	install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
-+	mkdir -p $(prefix)/include/ffmpeg/postproc
-+	${BSD_INSTALL_DATA} $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/ffmpeg/postproc/postprocess.h
+--- 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-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
deleted file mode 100644
index 7b7a6875c6fd..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- libavformat/Makefile.orig	Mon Nov 28 22:06:13 2005
-+++ libavformat/Makefile	Mon Nov 28 22:07:39 2005
-@@ -113,8 +113,7 @@
- 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF)
--	ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
-+	${BSD_INSTALL_DATA} $(SLIBNAME) $(libdir)/libavformat.so
- 	$(LDCONFIG) || true
- endif
- else
-@@ -126,12 +125,12 @@
- 
- install-headers:
- 	mkdir -p "$(prefix)/include/ffmpeg"
--	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
-+	${BSD_INSTALL_DATA} $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
-                 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
-                 $(SRC_PATH)/libavformat/rtspcodes.h \
-                 "$(prefix)/include/ffmpeg"
--	install -d "$(libdir)/pkgconfig"
--	install -m 644 ../libavformat.pc "$(libdir)/pkgconfig"
-+	install -d "$(prefix)/libdata/pkgconfig"
-+	${BSD_INSTALL_DATA} ../libavformat.pc "$(prefix)/libdata/pkgconfig"
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< 
diff --git a/multimedia/ffmpeg-devel/files/patch-libavutil__Makefile b/multimedia/ffmpeg-devel/files/patch-libavutil__Makefile
deleted file mode 100644
index e983e1dafb3a..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavutil__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- libavutil/Makefile.orig	Sun Dec  4 08:22:19 2005
-+++ libavutil/Makefile	Sun Dec  4 08:23:22 2005
-@@ -84,8 +84,8 @@
- 	               $(SRC_PATH)/libavutil/rational.h \
- 	               $(SRC_PATH)/libavutil/intfloat_readwrite.h \
-                 "$(prefix)/include/ffmpeg"
--	install -d "$(libdir)/pkgconfig"
--	install -m 644 ../libavutil.pc "$(libdir)/pkgconfig"
-+	install -d "$(prefix)/libdata/pkgconfig"
-+	install -m 644 ../libavutil.pc "$(prefix)/libdata/pkgconfig"
- 
- #
- # include dependency files if they exist
diff --git a/multimedia/ffmpeg-devel/files/patch-vhook__Makefile b/multimedia/ffmpeg-devel/files/patch-vhook__Makefile
new file mode 100644
index 000000000000..c831f960ec3b
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-vhook__Makefile
@@ -0,0 +1,13 @@
+--- 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 6a6133c87766..2af866958b50 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -18,10 +18,9 @@ lib/libavcodec.so.%%SHLIB_VERSION%%
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.%%SHLIB_VERSION%%
-lib/libavutil-CVS.so
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.%%SHLIB_VERSION%%
-libdata/pkgconfig/libavutil.pc
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavformat.pc
+libdata/pkgconfig/libavutil.pc