Update to 0.2.1

Prompted by:	ijliao

7 files changed, 35 insertions, 81 deletions

diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index f98e110b7118..7d53d0118b96 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmpeg2
-PORTVERSION=	0.2.0
+PORTVERSION=	0.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 DISTNAME=	mpeg2dec-${PORTVERSION}
@@ -14,7 +14,6 @@ DISTNAME=	mpeg2dec-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 
 USE_XLIB=	yes
-USE_AUTOCONF=   yes
 USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS= --enable-shared
@@ -26,8 +25,7 @@ CONFIGURE_ARGS+=	--enable-mga
 .ifdef(WITH_SDL)
 LIB_DEPENDS+=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libvo::configure.incl \
-		${FILESDIR}/extra-patch-libvo::video_out_sdl.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libvo::configure.incl
 SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
 
 CONFIGURE_ENV+=  SDL_CONFIG="${SDL_CONFIG}"
@@ -46,11 +44,16 @@ pre-everything::
 .endif
 	@${ECHO_MSG} "====>"
 
+post-patch:
+	@${PERL} -pi -e 's|<SDL/|<SDL11/|' ${WRKSRC}/libvo/*
+	@${PERL} -pi -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure
+
 post-configure:
 	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
 # Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
 	@${PERL} -pi.orig \
-		-e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
+		-e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|; \
+		s|(install_ltlibs=)yes|\1no|' \
 		${WRKSRC}/libtool
 
 post-install:
diff --git a/multimedia/libmpeg2/distinfo b/multimedia/libmpeg2/distinfo
index 6050ce752da6..5cee8d734679 100644
--- a/multimedia/libmpeg2/distinfo
+++ b/multimedia/libmpeg2/distinfo
@@ -1 +1 @@
-MD5 (mpeg2dec-0.2.0.tar.gz) = 0a65956d36569a95e8e406e57a842bb0
+MD5 (mpeg2dec-0.2.1.tar.gz) = f63e94ed74b0b5f2d6e32baba2963b4a
diff --git a/multimedia/libmpeg2/files/extra-patch-libvo::configure.incl b/multimedia/libmpeg2/files/extra-patch-libvo::configure.incl
index c1c62d1ba38a..420ea51ffc73 100644
--- a/multimedia/libmpeg2/files/extra-patch-libvo::configure.incl
+++ b/multimedia/libmpeg2/files/extra-patch-libvo::configure.incl
@@ -1,17 +1,18 @@
---- libvo/configure.incl.orig	Fri Feb 16 00:48:05 2001
-+++ libvo/configure.incl	Tue Oct 16 12:55:25 2001
+--- libvo/configure.incl.orig	Wed Apr 24 16:24:31 2002
++++ libvo/configure.incl	Wed Apr 24 16:28:47 2002
 @@ -35,11 +35,11 @@
  dnl check for SDL
  AC_ARG_ENABLE([sdl],[  --disable-sdl           make a version not using SDL])
  if test x"$enable_sdl" != x"no"; then
 -    AC_CHECK_PROG([SDLCONFIG],[sdl-config],[yes])
-+    AC_CHECK_PROG([SDLCONFIG],[sdl11-config],[yes])
-     if test x"$SDLCONFIG" = x"yes"; then
+-    if test x"$SDLCONFIG" = x"yes"; then
++    AC_CHECK_PROGS([SDLCONFIG],[sdl-config sdl-config11],[no])
++    if test x"$SDLCONFIG" != x"no"; then
  	AC_DEFINE([LIBVO_SDL],,[libvo SDL support])
 -	LIBVO_CFLAGS="$LIBVO_CFLAGS `sdl-config --cflags`"
 -	LIBVO_LIBS="$LIBVO_LIBS `sdl-config --libs`"
-+	LIBVO_CFLAGS="$LIBVO_CFLAGS `${SDL_CONFIG} --cflags`"
-+	LIBVO_LIBS="$LIBVO_LIBS `${SDL_CONFIG} --libs`"
++	LIBVO_CFLAGS="$LIBVO_CFLAGS `$(SDLCONFIG) --cflags`"
++	LIBVO_LIBS="$LIBVO_LIBS `$(SDLCONFIG) --libs`"
      fi
  fi
  
diff --git a/multimedia/libmpeg2/files/extra-patch-libvo::video_out_sdl.c b/multimedia/libmpeg2/files/extra-patch-libvo::video_out_sdl.c
deleted file mode 100644
index a69f898eb258..000000000000
--- a/multimedia/libmpeg2/files/extra-patch-libvo::video_out_sdl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvo/video_out_sdl.c.orig	Tue Oct 16 13:00:54 2001
-+++ libvo/video_out_sdl.c	Tue Oct 16 13:01:07 2001
-@@ -31,7 +31,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <inttypes.h>
--#include <SDL/SDL.h>
-+#include <SDL11/SDL.h>
- 
- #include "video_out.h"
- #include "video_out_internal.h"
diff --git a/multimedia/libmpeg2/files/patch-configure b/multimedia/libmpeg2/files/patch-configure
new file mode 100644
index 000000000000..61f80ef9b1bd
--- /dev/null
+++ b/multimedia/libmpeg2/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Wed Apr 24 16:42:58 2002
++++ configure	Wed Apr 24 16:43:14 2002
+@@ -2546,13 +2546,6 @@
+ #define ARCH_X86
+ EOF
+ 
+-	case "$host_alias" 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";;
+-	esac
+ 	echo "$as_me:2556: checking if $CC supports $OPT_CFLAGS flags" >&5
+ echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+     SAVE_CFLAGS="$CFLAGS"
diff --git a/multimedia/libmpeg2/files/patch-configure.in b/multimedia/libmpeg2/files/patch-configure.in
deleted file mode 100644
index 5e52cbbe7b1f..000000000000
--- a/multimedia/libmpeg2/files/patch-configure.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- configure.in.orig	Fri Feb 16 02:08:30 2001
-+++ configure.in	Tue Oct 16 14:13:20 2001
-@@ -16,46 +16,15 @@
- 
-     dnl -Wall -Werror moved to the end to not disturb the configure script
- 
--    dnl -O3
-     changequote(<<,>>)
-     OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
-     changequote([,])
--    OPT_CFLAGS="$OPT_CFLAGS -O3"
-     AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
- 
-     dnl -fomit-frame-pointer
-     OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
-     AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
- 
--    dnl arch-specific flags
--    case "$host_alias" in
--    i?86-* | k?-*)
--	AC_DEFINE([ARCH_X86],,[x86 architecture])
--	case "$host_alias" 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";;
--	esac
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    sparc-*)
--	OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    mips-sgi-irix6.*)	dnl do we need to be that specific ?
--	OPT_CFLAGS="$CFLAGS -mabi=64"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--else
--    dnl non-gcc flags - we probably need exact configuration triplets here.
--    case "$host_alias" in
--    mips-sgi-irix6.*)
--	OPT_CFLAGS="$CFLAGS -64"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    sparc-sun-solaris*)
--	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
- fi
- 
- dnl Checks for libtool - this must be done after we set cflags
diff --git a/multimedia/libmpeg2/pkg-plist b/multimedia/libmpeg2/pkg-plist
index 2f30a954a64f..c0e0db6e8c66 100644
--- a/multimedia/libmpeg2/pkg-plist
+++ b/multimedia/libmpeg2/pkg-plist
@@ -5,18 +5,12 @@ include/mpeg2dec/mm_accel.h
 include/mpeg2dec/mmx.h
 include/mpeg2dec/mpeg2.h
 include/mpeg2dec/video_out.h
+lib/libcpuaccel.a
+lib/libcpuaccel.so
+lib/libcpuaccel.so.0
 lib/libmpeg2.a
-lib/libmpeg2.la
 lib/libmpeg2.so
 lib/libmpeg2.so.0
-lib/libmpeg2dec.a
-lib/libmpeg2dec.la
-lib/libmpeg2dec.so
-lib/libmpeg2dec.so.0
-lib/libvo.a
-lib/libvo.la
-lib/libvo.so
-lib/libvo.so.0
 %%PORTDOCS%%share/doc/libmpeg2/libvo.txt
 %%PORTDOCS%%@dirrm share/doc/libmpeg2
 @dirrm include/mpeg2dec