ports/61010: upgrade ports/multimedia/libmpeg2 to 0.4.0

[Ying-Chieh Liao]

>Number:         61010
>Category:       ports
>Synopsis:       upgrade ports/multimedia/libmpeg2 to 0.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 07 00:30:14 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Liao
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD FreeBSD.csie.NCTU.edu.tw 4.9-STABLE FreeBSD 4.9-STABLE #8: Wed Oct 29 10:04:27 CST 2003 root at FreeBSD.csie.NCTU.edu.tw:/big/usr.obj/big/freebsd/pub/branches/4.0-stable/src/sys/FREEBSD i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- patch begins here ---
Index: libmpeg2/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/libmpeg2/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- libmpeg2/Makefile	8 Sep 2003 00:54:07 -0000	1.13
+++ libmpeg2/Makefile	7 Jan 2004 08:26:19 -0000
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	libmpeg2
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0
+PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 DISTNAME=	mpeg2dec-${PORTVERSION}
@@ -16,6 +16,7 @@
 COMMENT=	A free library for decoding mpeg-2 and mpeg-1 video streams
 
 USE_XLIB=	yes
+USE_GNOME=	gnomehack
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
@@ -65,13 +66,11 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|<SDL/|<SDL11/|' ${WRKSRC}/libvo/*
 	@${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/libmpeg2/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 \
Index: libmpeg2/distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/libmpeg2/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- libmpeg2/distinfo	2 Jan 2003 05:03:52 -0000	1.3
+++ libmpeg2/distinfo	7 Jan 2004 08:26:19 -0000
@@ -1 +1 @@
-MD5 (mpeg2dec-0.3.1.tar.gz) = e9f899d232eee5e7282c9c96ffde8016
+MD5 (mpeg2dec-0.4.0.tar.gz) = 49a70fef1b0f710ed7e64ed32ee82d4d
Index: libmpeg2/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/multimedia/libmpeg2/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- libmpeg2/pkg-plist	14 Jan 2003 15:54:22 -0000	1.5
+++ libmpeg2/pkg-plist	7 Jan 2004 08:26:19 -0000
@@ -1,15 +1,18 @@
+bin/corrupt_mpeg2
 bin/extract_mpeg2
 bin/mpeg2dec
-include/mpeg2dec/convert.h
+include/mpeg2dec/mpeg2convert.h
 include/mpeg2dec/mpeg2.h
 include/mpeg2dec/video_out.h
 lib/libmpeg2.a
-lib/libmpeg2.la
 lib/libmpeg2.so
 lib/libmpeg2.so.0
+lib/libmpeg2convert.a
+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
- at unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+libdata/pkgconfig/libmpeg2convert.pc
+%%PORTDOCS%%%%DOCSDIR%%/libmpeg2.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/mpeg2dec
Index: libmpeg2/files/patch-autotools:ltmain.sh
===================================================================
RCS file: libmpeg2/files/patch-autotools:ltmain.sh
diff -N libmpeg2/files/patch-autotools:ltmain.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libmpeg2/files/patch-autotools:ltmain.sh	7 Jan 2004 08:26:19 -0000
@@ -0,0 +1,15 @@
+--- autotools/ltmain.sh.orig	Wed Jan  7 16:20:53 2004
++++ autotools/ltmain.sh	Wed Jan  7 16:21:02 2004
+@@ -5493,10 +5493,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Index: libmpeg2/files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/multimedia/libmpeg2/files/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- libmpeg2/files/patch-configure	2 Jan 2003 05:03:52 -0000	1.2
+++ libmpeg2/files/patch-configure	7 Jan 2004 08:26:19 -0000
@@ -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	Wed Jan  7 16:13:06 2004
++++ configure	Wed Jan  7 16:13:26 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"
--- patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: