Update to 0.4.0b

PR:		63439
Submitted by:	lev

4 files changed, 26 insertions, 20 deletions

diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index adffa59..c9bf11b 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	libmpeg2
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0b
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 DISTNAME=	mpeg2dec-${PORTVERSION}
+WRKSRC=		${WRKDIR}/mpeg2dec-0.4.0
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A free library for decoding mpeg-2 and mpeg-1 video streams
@@ -18,7 +18,6 @@ COMMENT=	A free library for decoding mpeg-2 and mpeg-1 video streams
 USE_XLIB=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	--enable-shared \
@@ -26,6 +25,8 @@ CONFIGURE_ARGS=	--enable-shared \
 
 MAN1=	extract_mpeg2.1 mpeg2dec.1
 
+PORTDOCS=	libmpeg2.txt
+
 .ifdef(WITH_MGA)
 CONFIGURE_ARGS+=	--enable-mga
 .endif
@@ -75,11 +76,12 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/libmpeg2/Makefile.in
-
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/libmpeg2/convert/Makefile.in
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/libvo.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/libmpeg2.txt ${DOCSDIR}
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/libvo/libvo.a ${PREFIX}/lib
 	@${INSTALL_DATA} ${WRKSRC}/include/video_out.h \
diff --git a/multimedia/libmpeg2/distinfo b/multimedia/libmpeg2/distinfo
index 4347edf..4a33500 100644
--- a/multimedia/libmpeg2/distinfo
+++ b/multimedia/libmpeg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mpeg2dec-0.3.1.tar.gz) = e9f899d232eee5e7282c9c96ffde8016
-SIZE (mpeg2dec-0.3.1.tar.gz) = 325459
+MD5 (mpeg2dec-0.4.0b.tar.gz) = 52d10ea80595ec83d8557ba7ac6dc8e6
+SIZE (mpeg2dec-0.4.0b.tar.gz) = 473846
diff --git a/multimedia/libmpeg2/files/patch-configure b/multimedia/libmpeg2/files/patch-configure
index 82720ae..8b775e4 100644
--- a/multimedia/libmpeg2/files/patch-configure
+++ b/multimedia/libmpeg2/files/patch-configure
@@ -1,16 +1,16 @@
---- configure.orig	Wed Jan  1 17:05:17 2003
-+++ configure	Wed Jan  1 17:05:42 2003
-@@ -3281,13 +3281,6 @@
+--- configure.orig	Tue Dec 23 15:07:34 2003
++++ configure	Thu Feb 26 23:21:36 2004
+@@ -4048,13 +4048,6 @@
  #define ARCH_X86
  _ACEOF
  
 -	case "$host" in
--	i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
--	i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
--	i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
--	i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
--	k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
+-	i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";;
+-	i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";;
+-	i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";;
+-	i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";;
+-	k6-*)   TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";;
 -	esac
- 	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
- echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+ 	echo "$as_me:$LINENO: checking if $CC supports $TRY_CFLAGS $CFLAGS flags" >&5
+ echo $ECHO_N "checking if $CC supports $TRY_CFLAGS $CFLAGS flags... $ECHO_C" >&6
      SAVE_CFLAGS="$CFLAGS"
diff --git a/multimedia/libmpeg2/pkg-plist b/multimedia/libmpeg2/pkg-plist
index 15cf9e1..ac95fa1 100644
--- a/multimedia/libmpeg2/pkg-plist
+++ b/multimedia/libmpeg2/pkg-plist
@@ -1,15 +1,19 @@
+bin/corrupt_mpeg2
 bin/extract_mpeg2
 bin/mpeg2dec
-include/mpeg2dec/convert.h
 include/mpeg2dec/mpeg2.h
+include/mpeg2dec/mpeg2convert.h
 include/mpeg2dec/video_out.h
 lib/libmpeg2.a
 lib/libmpeg2.la
 lib/libmpeg2.so
 lib/libmpeg2.so.0
+lib/libmpeg2convert.a
+lib/libmpeg2convert.la
+lib/libmpeg2convert.so
+lib/libmpeg2convert.so.0
 lib/libvo.a
 libdata/pkgconfig/libmpeg2.pc
-%%PORTDOCS%%share/doc/libmpeg2/libvo.txt
-%%PORTDOCS%%@dirrm share/doc/libmpeg2
+libdata/pkgconfig/libmpeg2convert.pc
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @dirrm include/mpeg2dec