o Update to 0.4.9.p1

o SHLIB version bump: a trick to help detect the problem that ffmpeg
  will not build with the previous ffmpeg library installed

PR:		69210 [1],
		74225 [2]
Submitted by:	ahze [1],
		Frank Mayhar <frank@exit.com> [2]

9 files changed, 156 insertions, 122 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 96a7eb99b34f..b359b1756ac9 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.4.8
-PORTREVISION=	5
 CATEGORIES=	multimedia audio net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	ffmpeg
+DISTVERSION=	0.4.9-pre1
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
@@ -19,33 +18,35 @@ USE_GETOPT_LONG=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 WANT_SDL=	yes
 CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--make="${GMAKE}" --enable-shared \
 		--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		--extra-libs"-lm" \
 		--disable-debug
-MAKE_ENV+=	LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
 PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
 INSTALLS_SHLIB=	yes
 
-SHLIB_VERSION=	0
+SHLIB_VERSION=	1
 #
 DOC_FILES=	COPYING Changelog README
 # under subdir doc
-DOC_DOCFILES=	TODO \
-		faq.html faq.texi \
-		ffmpeg-doc.html ffmpeg-doc.texi \
-		ffserver-doc.html ffserver-doc.texi
+DOC_DOCFILES=	TODO faq.html ffmpeg-doc.html \
+		ffplay-doc.html ffserver-doc.html \
+		hooks.html optimization.txt
+PORTDOCS=	${DOC_FILES} ${DOC_DOCFILES}
 HEADER_FILES=	libavcodec/avcodec.h libavcodec/common.h \
 		libavcodec/dsputil.h
 LIB_FILES=	libavcodec/libavcodec.a libavformat/libavformat.a
-MAN1=		ffmpeg.1 ffplay.1 ffserver.1
+MAN1=		ffmpeg.1 ffplay.1
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libavformat.so.0)
+BROKEN=		Please remove previous version of ${PORTNAME} to continue build
+.endif
+
 ##
 ## arch detection
 ##
@@ -54,9 +55,10 @@ WITHOUT_MMX=	yes
 .else
 # only for i386
 EXTRA_PATCHES+=	${FILESDIR}/extra-bktr-patch-libavformat::Makefile
-. if ${OSVERSION} >= 502000 && !defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+=	-fomit-frame-pointer
-. endif
+#. if ${OSVERSION} >= 502000 && !defined(WITH_OPTIMIZED_CFLAGS)
+#CFLAGS+=-fomit-frame-pointer
+#WITH_OPTIMIZED_CFLAGS=yes
+#. endif
 .endif
 
 ## lib detection
@@ -66,6 +68,10 @@ CFLAGS+=	-fomit-frame-pointer
 .if ${HAVE_SDL:Msdl}
 WITH_SDL=yes
 .endif
+## faac
+.if exists(${LOCALBASE}/lib/libfaac.so.0)
+WITH_FAAC=yes
+.endif
 ## freetype2
 .if exists(${LOCALBASE}/lib/libfreetype.so)
 WITH_FREETYPE2=yes
@@ -88,16 +94,23 @@ WITH_FAAD=yes
 
 ## support activation
 ##
-## disable a52
-.ifndef(WITHOUT_LIBA52)
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
-
-CONFIGURE_ARGS+=	--enable-a52 \
-			--enable-a52bin
-.else
-CONFIGURE_ARGS+=	--enable-a52 \
-			--disable-a52bin
+## PORTDOCS
+.ifndef(NOPORTDOCS)
+BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
 .endif
+## disable a52
+#.ifndef(WITHOUT_LIBA52)
+#LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+#
+#CONFIGURE_ARGS+=	--enable-a52 \
+#			--enable-a52bin
+#.else
+#CONFIGURE_ARGS+=	--enable-a52 \
+#			--disable-a52bin
+#.endif
+GPLLIBS=	yes
+# --enable-a52bin breaks build
+CONFIGURE_ARGS+=	--enable-a52
 ## enable freetype2
 .if defined(WITH_FREETYPE2)
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
@@ -141,9 +154,10 @@ CONFIGURE_ARGS+=	--extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \
 			--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"
 .	else
 CONFIGURE_ARGS+=	--extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \
-			-I${X11BASE}/include -fno-unit-at-a-time" \
-			--disable-opts \
+			-I${X11BASE}/include \
+			-fomit-frame-pointer -fno-unit-at-a-time" \
 			--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm "
+#			--disable-opts 
 .	endif
 .else
 CONFIGURE_ARGS+=	--extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \
@@ -153,8 +167,7 @@ CONFIGURE_ARGS+=	--extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \
 .	else
 CONFIGURE_ARGS+=	--extra-cflags="-fPIC -DPIC -I${LOCALBASE}/include \
 			-I${X11BASE}/include" \
-			--disable-opts \
-			--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm "
+			--extra-ldflags="-L${WRKSRC}/libavcodec -L${LOCALBASE}/lib -L${X11BASE}/lib -lm "
 .endif
 
 ## vhook
@@ -171,11 +184,22 @@ LIB_DEPENDS+=		vorbisenc.2:${PORTSDIR}/audio/libvorbis
 
 CONFIGURE_ARGS+=	--enable-vorbis
 .endif
+## faac
+.ifdef(WITH_FAAC)
+LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
+
+CONFIGURE_ARGS+=	--enable-faac
+.endif
 ## faad
 .ifdef(WITH_FAAD)
 LIB_DEPENDS+=		faad.0:${PORTSDIR}/audio/faad
 
-CONFIGURE_ARGS+=	--enable-faad
+CONFIGURE_ARGS+=	--enable-faad --enable-faadbin
+GPLLIBS=	yes
+.endif
+## GPLLIBS
+.ifdef(GPLLIBS)
+CONFIGURE_ARGS+=	--enable-gpl
 .endif
 ## post processing
 .ifndef(WITHOUT_POSTPROCESS)
@@ -183,6 +207,17 @@ CONFIGURE_ARGS+=	--enable-shared-pp
 PLIST_FILES+=		include/ffmpeg/postproc/postprocess.h
 PLIST_DIRS+=		include/ffmpeg/postproc
 .endif
+## ffserver
+.ifdef(WITHOUT_FFMPEG_FFSERVER)
+CONFIGURE_ARGS+=	--disable-ffserver
+
+PLIST_SUB+=		FFSERVER="@comment "
+.else
+USE_RC_SUBR=		yes
+MAN1+=			ffserver.1
+
+PLIST_SUB+=		FFSERVER=""
+.endif
 PLIST_DIRS+=		include/ffmpeg
 
 pre-everything::
@@ -225,10 +260,18 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITH_VORBIS to enable libvorbisenc VORBIS codec'
 	@${ECHO_MSG}
 .endif
+.ifndef(WITH_FAAC)
+	@${ECHO_MSG} 'Define WITH_FAAC to enable libfaac'
+	@${ECHO_MSG}
+.endif
 .ifndef(WITH_FAAD)
 	@${ECHO_MSG} 'Define WITH_FAAD to enable libfaad codec'
 	@${ECHO_MSG}
 .endif
+.ifndef(WITHOUT_FFMPEG_FFSERVER)
+	@${ECHO_MSG} 'Define WITHOUT_FFMPEG_FFSERVER to disable ffserver build'
+	@${ECHO_MSG}
+.endif
 .if ${ARCH} == "i386"
 .if !(defined(WITH_BKTR_FORMAT) && defined(WITH_BKTR_DEV))
 	@${ECHO_MSG}
@@ -250,8 +293,14 @@ post-extract:
 .endif # ${ARCH} == i386
 
 post-patch:
+.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}/ffserver.c ${WRKSRC}/doc/ffserver-doc.texi
+	@${REINPLACE_CMD} -e 's!NoDaemon!# NoDaemon!g' \
+		${WRKSRC}/doc/ffserver.conf
+.endif
 .if ${ARCH} == "i386"
 # we support "v4l" per default through Steve O'Hara-Smith's bktr(4)
 # patch
@@ -296,8 +345,11 @@ 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
+	@${INSTALL_SCRIPT} ${WRKDIR}/ffserver.sh ${PREFIX}/etc/rc.d
+.endif
 .for file in ${HEADER_FILES}
 # fix header references prior to installation
 	@${REINPLACE_CMD} -e 's|"common.h"|<ffmpeg/common.h>|; \
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index af03ef25e3c6..81f3247203c6 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (ffmpeg-0.4.8.tar.gz) = e00d47614ba1afd99ad2ea387e782dd9
-SIZE (ffmpeg-0.4.8.tar.gz) = 1352874
+MD5 (ffmpeg-0.4.9-pre1.tar.gz) = ea5587e3c66d50b1503b82ac4179c303
+SIZE (ffmpeg-0.4.9-pre1.tar.gz) = 1611332
diff --git a/multimedia/ffmpeg-devel/files/ffserver.sh b/multimedia/ffmpeg-devel/files/ffserver.sh
new file mode 100644
index 000000000000..0ec0f5b65cf6
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/ffserver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.1 2004-12-05 18:12:41 lioux Exp $
+#
+
+# PROVIDE: ffserver
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable  ffserver:
+#
+#ffserver_enable="YES"
+#
+ffserver_enable="NO"
+
+. %%RC_SUBR%%
+
+name=ffserver
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+required_files=%%PREFIX%%/etc/ffserver.conf
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile
index dbf623acdec4..a04053123a5f 100644
--- a/multimedia/ffmpeg-devel/files/patch-Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-Makefile
@@ -1,36 +1,14 @@
---- Makefile.orig	Sun Dec 28 09:52:46 2003
-+++ Makefile	Sun Dec 28 10:00:38 2003
-@@ -6,8 +6,7 @@
- 
- VPATH=$(SRC_PATH)
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
--LDFLAGS+= -g 
-+CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(TARGET_GPROF),yes)
- CFLAGS+=-p
-@@ -33,10 +32,11 @@
- DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
- else
- DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
-+endif
-+
- ifeq ($(CONFIG_MP3LAME),yes)
- EXTRALIBS+=-lmp3lame
- endif
--endif
- 
- ifeq ($(CONFIG_VORBIS),yes)
- EXTRALIBS+=-logg -lvorbis -lvorbisenc
-@@ -69,8 +69,8 @@
- all: lib $(PROG) $(PROGTEST) $(VHOOK)
+--- Makefile.orig	Sat Jul 17 11:05:15 2004
++++ Makefile	Sat Jul 17 11:04:42 2004
+@@ -81,8 +81,9 @@
+ all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
  
  lib:
 -	$(MAKE) -C libavcodec all
 -	$(MAKE) -C libavformat all
 +	$(MAKE) LDFLAGS="$(LDFLAGS)" -C libavcodec all
 +	$(MAKE) LDFLAGS="$(LDFLAGS)" -C libavformat all
++ 
  
  ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
  	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index 08c90a8527c6..8aa0caaa7940 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Sep 28 17:26:39 2003
-+++ configure	Sat Dec  6 03:41:29 2003
-@@ -22,7 +22,7 @@
+--- configure.orig	Mon Jul  5 15:05:54 2004
++++ configure	Sun Dec  5 15:49:57 2004
+@@ -88,7 +88,7 @@
  mandir=""
  bindir=""
  cross_prefix=""
@@ -9,47 +9,21 @@
  ar="ar"
  ranlib="ranlib"
  make="make"
-@@ -111,7 +111,7 @@
+@@ -187,7 +187,7 @@
  BeOS)
  prefix="/boot/home/config"
  # helps building libavcodec
 -CFLAGS="-DPIC -fomit-frame-pointer"
 +CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer"
  # 3 gcc releases known for BeOS, each with ugly bugs
- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
+ gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
  case "$gcc_version" in
-@@ -177,13 +177,13 @@
- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
- case "$gcc_version" in
- *2.95*) 
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
- ;;
- *3.3*) 
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
- ;;
- *) 
--CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
-+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
- ;;
- esac
- ;;
-@@ -276,7 +276,7 @@
-   ;;
-   --make=*) make=`echo $opt | cut -d '=' -f 2`
-   ;;
--  --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
-+  --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
-   ;;
-   --extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=}
-   ;;
-@@ -682,7 +682,7 @@
+@@ -857,7 +857,7 @@
  EOF
  
  imlib2=no
--if $cc -o $TMPE $TMPC -lImlib2 2> /dev/null  ; then
-+if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lImlib2 2> /dev/null  ; then
+-if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1  ; then
++if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1  ; then
  imlib2=yes
  fi
  
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
index 04fe848c9d33..4ed42ea46e9d 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
@@ -1,22 +1,22 @@
---- libavcodec/Makefile.orig	Sat Dec  6 02:32:47 2003
-+++ libavcodec/Makefile	Sat Dec  6 03:00:14 2003
-@@ -162,7 +162,7 @@
+--- libavcodec/Makefile.orig	Sat Jul 17 11:07:57 2004
++++ libavcodec/Makefile	Sat Jul 17 11:09:21 2004
+@@ -197,7 +197,7 @@
  	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
  	-lib /machine:i386 /def:$(@:.dll=.def)
  else
--	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
 +	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
  endif
  
  dsputil.o: dsputil.c dsputil.h
-@@ -230,8 +230,8 @@
+@@ -269,8 +269,8 @@
  	install -s -m 755 $(SLIB) "$(prefix)"
  else
  	install -d $(prefix)/lib
 -	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
 -	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-+	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0
-+	cd $(prefix)/lib && ln -s libavcodec.so.0 libavcodec.so
++	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.1
++	cd $(prefix)/lib && ln -s libavcodec.so.1 libavcodec.so	
  	ldconfig || true
  endif
  else
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h b/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
index 7205d7e7a87b..8bef16c36abc 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
@@ -1,6 +1,6 @@
---- libavcodec/bswap.h.orig	Sun Nov  3 04:51:51 2002
-+++ libavcodec/bswap.h	Sun Nov  3 04:53:30 2002
-@@ -5,6 +5,14 @@
+--- libavcodec/bswap.h.orig	Sun Dec  5 16:03:35 2004
++++ libavcodec/bswap.h	Sun Dec  5 16:06:48 2004
+@@ -10,6 +10,14 @@
  #include <byteswap.h>
  #else
  
@@ -13,9 +13,9 @@
 +#endif
 +
  #ifdef ARCH_X86
- inline static unsigned short ByteSwap16(unsigned short x)
+ static inline unsigned short ByteSwap16(unsigned short x)
  {
-@@ -13,7 +21,11 @@
+@@ -18,7 +26,11 @@
          "0" (x));
      return x;
  }
@@ -25,9 +25,9 @@
  #define bswap_16(x) ByteSwap16(x)
 +#endif
  
- inline static unsigned int ByteSwap32(unsigned int x)
+ static inline unsigned int ByteSwap32(unsigned int x)
  {
-@@ -29,7 +41,11 @@
+@@ -34,7 +46,11 @@
        "0" (x));
    return x;
  }
@@ -37,5 +37,17 @@
  #define bswap_32(x) ByteSwap32(x)
 +#endif
  
- inline static unsigned long long int ByteSwap64(unsigned long long int x)
+ static inline unsigned long long int ByteSwap64(unsigned long long int x)
  {
+@@ -45,7 +61,11 @@
+       "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
+   return __x.__ll;
+ }
++#if defined(__FreeBSD__) && __FreeBSD_version >= 510000
++#define bswap_64(x) (be64toh(x))
++#else
+ #define bswap_64(x) ByteSwap64(x)
++#endif
+ 
+ #elif defined(ARCH_SH4)
+ 
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
index 49134edfe3b8..36a7674c28e5 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
@@ -6,8 +6,8 @@
  	install -d $(prefix)/lib
 -	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
 -	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
-+	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0
-+	ln -sf libavformat.so.0 $(prefix)/lib/libavformat.so
++	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.1
++	ln -sf libavformat.so.1 $(prefix)/lib/libavformat.so
  	ldconfig || true
  	mkdir -p $(prefix)/include/ffmpeg
  	install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index cc48bd0c86d8..6bad3c0fbd6c 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -1,12 +1,14 @@
 bin/ffmpeg
 %%SDL%%bin/ffplay
-bin/ffserver
-etc/ffserver.conf.sample
+%%FFSERVER%%bin/ffserver
+%%FFSERVER%%etc/ffserver.conf.sample
+%%FFSERVER%%etc/rc.d/ffserver.sh
 include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
 include/ffmpeg/common.h
 include/ffmpeg/dsputil.h
+include/ffmpeg/rational.h
 include/ffmpeg/rtp.h
 include/ffmpeg/rtsp.h
 include/ffmpeg/rtspcodes.h
@@ -20,15 +22,5 @@ lib/libavformat.so.%%SHLIB_VERSION%%
 %%VHOOK%%lib/vhook/fish.so
 %%VHOOK%%%%IMLIB2%%lib/vhook/imlib2.so
 %%VHOOK%%lib/vhook/null.so
-%%PORTDOCS%%share/doc/ffmpeg/COPYING
-%%PORTDOCS%%share/doc/ffmpeg/Changelog
-%%PORTDOCS%%share/doc/ffmpeg/README
-%%PORTDOCS%%share/doc/ffmpeg/TODO
-%%PORTDOCS%%share/doc/ffmpeg/faq.html
-%%PORTDOCS%%share/doc/ffmpeg/faq.texi
-%%PORTDOCS%%share/doc/ffmpeg/ffmpeg-doc.html
-%%PORTDOCS%%share/doc/ffmpeg/ffmpeg-doc.texi
-%%PORTDOCS%%share/doc/ffmpeg/ffserver-doc.html
-%%PORTDOCS%%share/doc/ffmpeg/ffserver-doc.texi
-%%PORTDOCS%%@dirrm share/doc/ffmpeg
+%%VHOOK%%lib/vhook/ppm.so
 %%VHOOK%%@dirrm lib/vhook