10 files changed, 8 insertions, 48 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index bb8a2b3c7d67..5de1b3a5bcf9 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.4.7
+PORTVERSION=	0.4.8
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ffmpeg
@@ -26,7 +26,7 @@ INSTALLS_SHLIB=	yes
 
 SHLIB_VERSION=	0
 #
-DOC_FILES=	COPYING Changelog README VERSION
+DOC_FILES=	COPYING Changelog README
 # under subdir doc
 DOC_DOCFILES=	TODO \
 		faq.html faq.texi \
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index 24516b0bdb1e..99c111904a70 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1 +1 @@
-MD5 (ffmpeg-0.4.7.tar.gz) = bd9ab3e27f6c92fa06286b8f40277994
+MD5 (ffmpeg-0.4.8.tar.gz) = e00d47614ba1afd99ad2ea387e782dd9
diff --git a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile
index a24d33a0ad45..25f7c23de3a0 100644
--- a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile
+++ b/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile
@@ -1,14 +1,5 @@
 --- libavformat/Makefile.orig	Wed Jan  1 21:00:22 2003
 +++ libavformat/Makefile	Wed Jan  1 21:01:27 2003
-@@ -6,7 +6,7 @@
- 
- VPATH=$(SRC_PATH)/libavformat
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS= $(OPTFLAGS) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= utils.o cutils.o allformats.o
- 
 @@ -21,7 +21,7 @@
  endif
  
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
index d760d0cee046..9c2edd0f9d68 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
@@ -1,16 +1,6 @@
 --- libavcodec/Makefile.orig	Sun Oct  6 12:26:38 2002
 +++ libavcodec/Makefile	Wed Oct  9 14:24:34 2002
-@@ -7,8 +7,7 @@
- VPATH=$(SRC_PATH)/libavcodec
- 
- # NOTE: -I.. is needed to include config.h
--CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
--LDFLAGS= -g
-+CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= common.o utils.o mem.o allcodecs.o \
-       mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
-@@ -167,8 +166,7 @@
+@@ -228,8 +228,7 @@
  install: all
  ifeq ($(BUILD_SHARED),yes)
  	install -d $(prefix)/lib
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index b5e9b552ee94..c4eabe8ebd3b 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -22,7 +22,6 @@ lib/libavformat.a
 %%PORTDOCS%%share/doc/ffmpeg/Changelog
 %%PORTDOCS%%share/doc/ffmpeg/README
 %%PORTDOCS%%share/doc/ffmpeg/TODO
-%%PORTDOCS%%share/doc/ffmpeg/VERSION
 %%PORTDOCS%%share/doc/ffmpeg/faq.html
 %%PORTDOCS%%share/doc/ffmpeg/faq.texi
 %%PORTDOCS%%share/doc/ffmpeg/ffmpeg-doc.html
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index bb8a2b3c7d67..5de1b3a5bcf9 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.4.7
+PORTVERSION=	0.4.8
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ffmpeg
@@ -26,7 +26,7 @@ INSTALLS_SHLIB=	yes
 
 SHLIB_VERSION=	0
 #
-DOC_FILES=	COPYING Changelog README VERSION
+DOC_FILES=	COPYING Changelog README
 # under subdir doc
 DOC_DOCFILES=	TODO \
 		faq.html faq.texi \
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 24516b0bdb1e..99c111904a70 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1 +1 @@
-MD5 (ffmpeg-0.4.7.tar.gz) = bd9ab3e27f6c92fa06286b8f40277994
+MD5 (ffmpeg-0.4.8.tar.gz) = e00d47614ba1afd99ad2ea387e782dd9
diff --git a/multimedia/ffmpeg/files/extra-bktr-patch-libavformat::Makefile b/multimedia/ffmpeg/files/extra-bktr-patch-libavformat::Makefile
index a24d33a0ad45..25f7c23de3a0 100644
--- a/multimedia/ffmpeg/files/extra-bktr-patch-libavformat::Makefile
+++ b/multimedia/ffmpeg/files/extra-bktr-patch-libavformat::Makefile
@@ -1,14 +1,5 @@
 --- libavformat/Makefile.orig	Wed Jan  1 21:00:22 2003
 +++ libavformat/Makefile	Wed Jan  1 21:01:27 2003
-@@ -6,7 +6,7 @@
- 
- VPATH=$(SRC_PATH)/libavformat
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS= $(OPTFLAGS) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= utils.o cutils.o allformats.o
- 
 @@ -21,7 +21,7 @@
  endif
  
diff --git a/multimedia/ffmpeg/files/patch-libavcodec::Makefile b/multimedia/ffmpeg/files/patch-libavcodec::Makefile
index d760d0cee046..9c2edd0f9d68 100644
--- a/multimedia/ffmpeg/files/patch-libavcodec::Makefile
+++ b/multimedia/ffmpeg/files/patch-libavcodec::Makefile
@@ -1,16 +1,6 @@
 --- libavcodec/Makefile.orig	Sun Oct  6 12:26:38 2002
 +++ libavcodec/Makefile	Wed Oct  9 14:24:34 2002
-@@ -7,8 +7,7 @@
- VPATH=$(SRC_PATH)/libavcodec
- 
- # NOTE: -I.. is needed to include config.h
--CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
--LDFLAGS= -g
-+CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= common.o utils.o mem.o allcodecs.o \
-       mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
-@@ -167,8 +166,7 @@
+@@ -228,8 +228,7 @@
  install: all
  ifeq ($(BUILD_SHARED),yes)
  	install -d $(prefix)/lib
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index b5e9b552ee94..c4eabe8ebd3b 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -22,7 +22,6 @@ lib/libavformat.a
 %%PORTDOCS%%share/doc/ffmpeg/Changelog
 %%PORTDOCS%%share/doc/ffmpeg/README
 %%PORTDOCS%%share/doc/ffmpeg/TODO
-%%PORTDOCS%%share/doc/ffmpeg/VERSION
 %%PORTDOCS%%share/doc/ffmpeg/faq.html
 %%PORTDOCS%%share/doc/ffmpeg/faq.texi
 %%PORTDOCS%%share/doc/ffmpeg/ffmpeg-doc.html