Update mpeg-lib to 1.3.1. The only relevant changes from version 1.2.1

are "some small, but glaring, bug fixes".  Also add a HOMEPAGE to the
package.  Most of the changes to the files in the patches directory are
just fuzz- or offset-related.  Change the name of the installed library
from libmpeg to libmpeg_lib to avoid conflicting with audio/kdemultimedia2
(pkg/13589 by Matthias Scheler <tron@colwyn.zhadum.de>).

20 files changed, 224 insertions, 153 deletions

diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index f816dce10cc..46ed27aea4f 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -1,25 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2001/06/29 21:38:24 zuntum Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/02 13:28:44 jlam Exp $
 
-DISTNAME=	mpeg_lib-1.2.1
-PKGNAME=	mpeg-1.2.1
+DISTNAME=	mpeg_lib-1.3.1
+PKGNAME=	mpeg-1.3.1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
 		ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/libs/ \
 		ftp://ftp.gimp.org/pub/gimp/libs/
 
 MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://starship.python.net/~gward/mpeglib/
 COMMENT=	Library for decoding MPEG movies
 
-USE_BUILDLINK_ONLY=	YES
-USE_LIBTOOL=	# defined
-GNU_CONFIGURE=	# defined
-ALL_TARGET=	libmpeg.la
-
-WRKSRC=		${WRKDIR}/mpeg_lib
-
-do-install:
-	cd ${WRKSRC} && \
-		${LIBTOOL} ${INSTALL_DATA} libmpeg.la ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/mpeg.h ${PREFIX}/include/
+USE_BUILDLINK_ONLY=	# defined
+USE_LIBTOOL=		# defined
+GNU_CONFIGURE=		# defined
+ALL_TARGET=		libmpeg_lib.la
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg-lib/buildlink.mk b/graphics/mpeg-lib/buildlink.mk
index 6f5d64418f5..ab2ed29e0ef 100644
--- a/graphics/mpeg-lib/buildlink.mk
+++ b/graphics/mpeg-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/27 13:33:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/08/02 13:28:44 jlam Exp $
 #
 # This Makefile fragment is included by packages that use mpeg.
 #
@@ -17,16 +17,16 @@ MPEG_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.mpeg?=	mpeg>=1.2.1
+BUILDLINK_DEPENDS.mpeg?=	mpeg>=1.3.1
 DEPENDS+=	${BUILDLINK_DEPENDS.mpeg}:../../graphics/mpeg-lib
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.mpeg=mpeg
 BUILDLINK_PREFIX.mpeg_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.mpeg=		include/mpeg.h
-BUILDLINK_FILES.mpeg+=		lib/libmpeg.*
+BUILDLINK_FILES.mpeg+=		lib/libmpeg_lib.*
 
 BUILDLINK_TARGETS.mpeg=		mpeg-buildlink
-BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.mpeg}
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.mpeg}
 
 pre-configure: ${BUILDLINK_TARGETS.mpeg}
 mpeg-buildlink: _BUILDLINK_USE
diff --git a/graphics/mpeg-lib/distinfo b/graphics/mpeg-lib/distinfo
index 59acaf8c53f..3324ce94f2b 100644
--- a/graphics/mpeg-lib/distinfo
+++ b/graphics/mpeg-lib/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.3 2001/07/01 22:00:52 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/02 13:28:44 jlam Exp $
 
-SHA1 (mpeg_lib-1.2.1.tar.gz) = 2c3bde100f45f73025f9ba14b8360c7d26b41785
-Size (mpeg_lib-1.2.1.tar.gz) = 139026 bytes
-SHA1 (patch-aa) = 18c3c7531d13a1a62126a16088510b8fcd7117ba
-SHA1 (patch-ab) = df10f9868d7a0e3a5b84d4fd87ebc714cde8bf03
-SHA1 (patch-ac) = 704fd74c0816c321b27b8c0dcefea81216e97e43
-SHA1 (patch-ad) = e02601d4e1669cc2b0746a7fe8a0643d2f4bb262
-SHA1 (patch-ae) = 09c2a8bb2104a0e125d7ee043eede9cf4554dc73
-SHA1 (patch-af) = 77fbadc4811ae6898a5d5d80b5fe67aae29d1c82
-SHA1 (patch-ag) = 34b55886d8889bd2ad0fb19959395fd8acf74352
-SHA1 (patch-ah) = 554d2efd513d9d6dece176370fcc88d191788be7
-SHA1 (patch-ai) = ffb93079e7f57646bcbfb581faea2a90e27eca0f
-SHA1 (patch-aj) = 3ca2e16482675933ee17dc01b6ae66c53633dc5d
-SHA1 (patch-ak) = 75e22576b48ac4f41a3deaccb9027fc99ed87680
-SHA1 (patch-al) = 2ed1237a6d02ea536d36f2dde8a29ce45c6cbc5a
-SHA1 (patch-am) = 772d476a8e7f41bc9f0986b1296b9303adeefa9f
-SHA1 (patch-an) = 567fd1b8439ce9d2d4125dcaafee6fd0f64b4811
-SHA1 (patch-ao) = 8b3d5a99876f22fa24158ab8b292c91d9a85204b
-SHA1 (patch-ap) = c1f12bbe1648f8810c95c25b8dc1d625d8be7ed0
+SHA1 (mpeg_lib-1.3.1.tar.gz) = 0ea4f8b31e4f316d99c2034d76619988f75147dc
+Size (mpeg_lib-1.3.1.tar.gz) = 152092 bytes
+SHA1 (patch-aa) = 1dc0008ccba4ea2db49b5d42ffde588b19e376c2
+SHA1 (patch-ab) = f81f1e71ae709f98663470a61cbe05e9fb1f387f
+SHA1 (patch-ac) = 520581e27188602d833ff6b379a9a6cbbff84bb2
+SHA1 (patch-ad) = eebb31fcb51c20eee42078ea361e907030948c87
+SHA1 (patch-ae) = af6a9886fa0b6152831ccb34419ebe049332d688
+SHA1 (patch-af) = 3c79a7425fa62372530ea129f0e1f782c1ab4614
+SHA1 (patch-ag) = 5d3fa43eb1fff3d0b9178bf5e00dad22e139739a
+SHA1 (patch-ah) = 80436c19f6e097c853f4926a65779058dbbe5c36
+SHA1 (patch-ai) = 91cc6cfc73d6938a187c02aa606248ea81007fab
+SHA1 (patch-aj) = d89264c70cae7debf08cceb38e19ada642391a11
+SHA1 (patch-ak) = 213af68860c8dd8901555cb04aa9359a77666cf3
+SHA1 (patch-al) = 5d5c793a18d34327fce2edf544c10a3fd94c9e80
+SHA1 (patch-am) = 67b3bbe3bab8354b853bdf99535a2e11501500f9
+SHA1 (patch-an) = 59149da95dc7a6c85b4e219714fd8e0bfa5de1c2
+SHA1 (patch-ao) = 84caaa6c7b9cb5eb7f7455323767aa6753e92ff7
+SHA1 (patch-ap) = 3a6a6d43eb137f75ad314fb47120a616db0402b3
diff --git a/graphics/mpeg-lib/patches/patch-aa b/graphics/mpeg-lib/patches/patch-aa
index e7e8e656d98..fbd9d43e402 100644
--- a/graphics/mpeg-lib/patches/patch-aa
+++ b/graphics/mpeg-lib/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/02 13:28:45 jlam Exp $
 
---- wrapper.c.orig	Tue Oct 10 14:08:39 1995
-+++ wrapper.c	Sat Jun 20 00:48:55 1998
-@@ -54,2 +54,7 @@
+--- wrapper.c.orig	Sun Aug  8 20:22:14 1999
++++ wrapper.c
+@@ -55,6 +55,11 @@
+ #include "globals.h"
+ #include "my_dmalloc.h"
  
 +#ifdef __NetBSD__
 +#include <stdlib.h>
@@ -10,8 +12,14 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:48 agc Exp $
 +#endif
 +
  #define BUF_LENGTH 80000
-@@ -327,3 +332,3 @@
+ 
+ 
+@@ -341,7 +346,7 @@
+ @CREATED    : 94/6/17, Greg Ward.
+ @MODIFIED   : 95/3/18, GW: added MPEG_CMAP_INDEX option.
  ---------------------------------------------------------------------------- */
 -void SetMPEGOption (MPEGOptionEnum Option, int Value)
 +void SetMPEGOption (MPEGOptionEnum Option, long Value)
  {
+    switch (Option)
+    {
diff --git a/graphics/mpeg-lib/patches/patch-ab b/graphics/mpeg-lib/patches/patch-ab
index a3b12616372..4827ac42512 100644
--- a/graphics/mpeg-lib/patches/patch-ab
+++ b/graphics/mpeg-lib/patches/patch-ab
@@ -1,10 +1,14 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/02 13:28:45 jlam Exp $
 
---- globals.c.orig	Mon Sep 25 10:22:06 1995
-+++ globals.c	Sat Jun 20 00:33:26 1998
-@@ -64,2 +64,5 @@
+--- globals.c.orig	Sat Jul 31 20:17:20 1999
++++ globals.c
+@@ -63,6 +63,9 @@
+ #include "globals.h"
+ #include "my_dmalloc.h"
  
 +#ifdef __NetBSD__
 +#include <string.h>
 +#endif
  
+ /* Universal global variables -- those needed by the decoding engine: */
+ 
diff --git a/graphics/mpeg-lib/patches/patch-ac b/graphics/mpeg-lib/patches/patch-ac
index 4645fe4206d..c97c9add1f0 100644
--- a/graphics/mpeg-lib/patches/patch-ac
+++ b/graphics/mpeg-lib/patches/patch-ac
@@ -1,11 +1,15 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- 24bit.c.orig	Mon Sep 25 10:22:04 1995
-+++ 24bit.c	Sat Jun 20 00:33:26 1998
-@@ -32,2 +32,6 @@
+--- 24bit.c.orig	Fri Jul 23 23:59:25 1999
++++ 24bit.c
+@@ -30,6 +30,10 @@
+ #include "dither.h"
+ #include "proto.h"
  #include <time.h>
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
 +
+ #include <malloc.h>
+ #include "my_dmalloc.h"
  
diff --git a/graphics/mpeg-lib/patches/patch-ad b/graphics/mpeg-lib/patches/patch-ad
index 77dc0f6ad51..89639069552 100644
--- a/graphics/mpeg-lib/patches/patch-ad
+++ b/graphics/mpeg-lib/patches/patch-ad
@@ -1,10 +1,14 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-ad,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- gdith.c.orig	Mon Sep 25 10:22:06 1995
-+++ gdith.c	Sat Jun 20 00:33:27 1998
-@@ -25,2 +25,5 @@
- #include "globals.h"		/* for global variable ditherType */
+--- gdith.c.orig	Sat Jul 24 00:04:42 1999
++++ gdith.c
+@@ -23,6 +23,9 @@
+ #include <config.h>
+ #include <malloc.h>
+ #include <memory.h>
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "mpeg.h"
+ #include "dither.h"
+ #include "video.h"
diff --git a/graphics/mpeg-lib/patches/patch-ae b/graphics/mpeg-lib/patches/patch-ae
index 9810535f194..c555b178150 100644
--- a/graphics/mpeg-lib/patches/patch-ae
+++ b/graphics/mpeg-lib/patches/patch-ae
@@ -1,10 +1,14 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-ae,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- fs2.c.orig	Mon Sep 25 10:22:05 1995
-+++ fs2.c	Sat Jun 20 00:33:27 1998
-@@ -25,2 +25,5 @@
- #include "proto.h"
+--- fs2.c.orig	Fri Jul 23 23:40:17 1999
++++ fs2.c
+@@ -23,6 +23,9 @@
+ #include <memory.h>
+ #include "video.h"
+ #include "dither.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "fs2.h"
+ #include "proto.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-af b/graphics/mpeg-lib/patches/patch-af
index 85589615d25..25b528064ce 100644
--- a/graphics/mpeg-lib/patches/patch-af
+++ b/graphics/mpeg-lib/patches/patch-af
@@ -1,10 +1,14 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-af,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- fs2fast.c.orig	Mon Sep 25 10:22:05 1995
-+++ fs2fast.c	Sat Jun 20 00:33:28 1998
-@@ -24,2 +24,5 @@
- #include "dither.h"
+--- fs2fast.c.orig	Fri Jul 23 23:59:24 1999
++++ fs2fast.c
+@@ -22,6 +22,9 @@
+ #include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ag b/graphics/mpeg-lib/patches/patch-ag
index 14fc0943532..f4a48913fd3 100644
--- a/graphics/mpeg-lib/patches/patch-ag
+++ b/graphics/mpeg-lib/patches/patch-ag
@@ -1,10 +1,14 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-ag,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- fs4.c.orig	Mon Sep 25 10:22:06 1995
-+++ fs4.c	Sat Jun 20 00:33:28 1998
-@@ -27,2 +27,5 @@
- #include "dither.h"
+--- fs4.c.orig	Fri Jul 23 23:59:24 1999
++++ fs4.c
+@@ -25,6 +25,9 @@
+ #include <memory.h>
+ #include "fs4.h"
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ah b/graphics/mpeg-lib/patches/patch-ah
index c302debea95..b7f06b98699 100644
--- a/graphics/mpeg-lib/patches/patch-ah
+++ b/graphics/mpeg-lib/patches/patch-ah
@@ -1,10 +1,14 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-ah,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- hybrid.c.orig	Mon Sep 25 10:22:07 1995
-+++ hybrid.c	Sat Jun 20 00:33:28 1998
-@@ -26,2 +26,5 @@
- #include "dither.h"
+--- hybrid.c.orig	Fri Jul 23 23:50:51 1999
++++ hybrid.c
+@@ -24,6 +24,9 @@
+ #include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ai b/graphics/mpeg-lib/patches/patch-ai
index d0cb0f04add..e0147496ccb 100644
--- a/graphics/mpeg-lib/patches/patch-ai
+++ b/graphics/mpeg-lib/patches/patch-ai
@@ -1,10 +1,14 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-ai,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- hybriderr.c.orig	Mon Sep 25 10:22:08 1995
-+++ hybriderr.c	Sat Jun 20 00:33:29 1998
-@@ -28,2 +28,5 @@
- #include "dither.h"
+--- hybriderr.c.orig	Sat Jul 31 20:05:24 1999
++++ hybriderr.c
+@@ -26,6 +26,9 @@
+ #include <memory.h>
+ #include <malloc.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-aj b/graphics/mpeg-lib/patches/patch-aj
index bf72cfbdc9f..5b1ddf446b5 100644
--- a/graphics/mpeg-lib/patches/patch-aj
+++ b/graphics/mpeg-lib/patches/patch-aj
@@ -1,10 +1,14 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-aj,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- 2x2.c.orig	Mon Sep 25 10:16:06 1995
-+++ 2x2.c	Sat Jun 20 00:33:29 1998
-@@ -25,2 +25,5 @@
- #include "proto.h"
+--- 2x2.c.orig	Sat Jul 24 00:06:22 1999
++++ 2x2.c
+@@ -23,6 +23,9 @@
+ #include <stdlib.h>
+ #include <malloc.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "dither.h"
+ #include "proto.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ak b/graphics/mpeg-lib/patches/patch-ak
index ae3819f19b5..b8d04454454 100644
--- a/graphics/mpeg-lib/patches/patch-ak
+++ b/graphics/mpeg-lib/patches/patch-ak
@@ -1,10 +1,14 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-ak,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- mono.c.orig	Mon Sep 25 10:22:08 1995
-+++ mono.c	Sat Jun 20 00:33:29 1998
-@@ -29,2 +29,5 @@
- #include "dither.h"
+--- mono.c.orig	Fri Jul 23 23:59:22 1999
++++ mono.c
+@@ -27,6 +27,9 @@
+ #include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-al b/graphics/mpeg-lib/patches/patch-al
index 575d422dbaf..00d2c1a6860 100644
--- a/graphics/mpeg-lib/patches/patch-al
+++ b/graphics/mpeg-lib/patches/patch-al
@@ -1,10 +1,14 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-al,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- ordered.c.orig	Mon Sep 25 10:22:09 1995
-+++ ordered.c	Sat Jun 20 00:33:30 1998
-@@ -26,2 +26,5 @@
- #include "dither.h"
+--- ordered.c.orig	Fri Jul 23 23:53:40 1999
++++ ordered.c
+@@ -24,6 +24,9 @@
+ #include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-am b/graphics/mpeg-lib/patches/patch-am
index 591ec2cd214..70df3427880 100644
--- a/graphics/mpeg-lib/patches/patch-am
+++ b/graphics/mpeg-lib/patches/patch-am
@@ -1,10 +1,14 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-am,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- ordered2.c.orig	Mon Sep 25 10:22:09 1995
-+++ ordered2.c	Sat Jun 20 00:33:30 1998
-@@ -26,2 +26,5 @@
- #include "dither.h"
+--- ordered2.c.orig	Fri Jul 23 23:54:01 1999
++++ ordered2.c
+@@ -24,6 +24,9 @@
+ #include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-an b/graphics/mpeg-lib/patches/patch-an
index e6b015e4489..c0e57181e50 100644
--- a/graphics/mpeg-lib/patches/patch-an
+++ b/graphics/mpeg-lib/patches/patch-an
@@ -1,10 +1,14 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-an,v 1.3 2001/08/02 13:28:46 jlam Exp $
 
---- mb_ordered.c.orig	Mon Sep 25 10:22:08 1995
-+++ mb_ordered.c	Sat Jun 20 00:33:30 1998
-@@ -26,2 +26,5 @@
- #include "dither.h"
+--- mb_ordered.c.orig	Fri Jul 23 23:53:08 1999
++++ mb_ordered.c
+@@ -24,6 +24,9 @@
+ #include <malloc.h>
+ #include <memory.h>
+ #include "video.h"
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
- 
+ #include "proto.h"
+ #include "dither.h"
+ #include "my_dmalloc.h"
diff --git a/graphics/mpeg-lib/patches/patch-ao b/graphics/mpeg-lib/patches/patch-ao
index 68ac07d8426..403cf267cee 100644
--- a/graphics/mpeg-lib/patches/patch-ao
+++ b/graphics/mpeg-lib/patches/patch-ao
@@ -1,9 +1,13 @@
-$NetBSD: patch-ao,v 1.2 1998/08/07 10:40:49 agc Exp $
+$NetBSD: patch-ao,v 1.3 2001/08/02 13:28:47 jlam Exp $
 
---- mpeg.h.orig	Sat Jun 20 00:49:18 1998
-+++ mpeg.h	Sat Jun 20 00:49:29 1998
-@@ -103,3 +103,3 @@
+--- mpeg.h.orig	Sat Jul 24 00:32:06 1999
++++ mpeg.h
+@@ -109,7 +109,7 @@
+ Boolean OpenMPEG PROTO((FILE *MPEGfile, ImageDesc *ImgInfo));
+ void    CloseMPEG PROTO((void));
  Boolean RewindMPEG PROTO((FILE *MPEGfile, ImageDesc *Image));
 -void    SetMPEGOption PROTO((MPEGOptionEnum Option, int value));
 +void    SetMPEGOption PROTO((MPEGOptionEnum Option, long value));
  Boolean GetMPEGFrame PROTO((char *Frame));
+ 
+ #ifdef __cplusplus
diff --git a/graphics/mpeg-lib/patches/patch-ap b/graphics/mpeg-lib/patches/patch-ap
index 98b200d7cbf..8d562227f16 100644
--- a/graphics/mpeg-lib/patches/patch-ap
+++ b/graphics/mpeg-lib/patches/patch-ap
@@ -1,38 +1,51 @@
-$NetBSD: patch-ap,v 1.4 2001/07/01 22:00:53 jlam Exp $
+$NetBSD: patch-ap,v 1.5 2001/08/02 13:28:47 jlam Exp $
 
---- Makefile.in.orig	Mon Feb 26 13:12:54 1996
+--- Makefile.in.orig	Thu Nov 26 11:03:29 1998
 +++ Makefile.in
-@@ -6,11 +6,11 @@
- 
- # Various programs and their options
- 
--CC            = @CC@
-+CC            = ${LIBTOOL} @CC@
- OPT           = @OPT@
- DEFS          = @DEFS@
- INCLUDES      = -I.
--CFLAGS        = $(OPT) $(DEFS) $(INCLUDES)
-+CFLAGS        += $(OPT) $(DEFS) $(INCLUDES)
- AR            = @AR@
- ARFLAGS       = ru
- RANLIB        = @RANLIB@
-@@ -31,7 +31,7 @@
+@@ -11,7 +11,7 @@
+ EXTRA_CFLAGS  = @EXTRA_CFLAGS@
+ INCLUDE_DIRS  = -I. @INCLUDE_DIRS@
+ DEFINES       = @DEFINES@
+-CFLAGS        = $(OPTIMIZE) $(EXTRA_CFLAGS)
++CFLAGS        += $(OPTIMIZE) $(EXTRA_CFLAGS)
+ CPPFLAGS      = $(INCLUDE_DIRS) $(DEFINES)
+ 
+ # Installation directories (and install program)
+@@ -41,14 +41,14 @@
  
  # Other files of interest
  
 -LIBRARY       = libmpeg.a
-+LIBRARY       = libmpeg.la
- MPEGTEST      = mpegtest
++LIBRARY       = libmpeg_lib.la
+ SHLIB         = libmpeg.so
+ HEADER        = mpeg.h
+ EXTRAS        = @extras@
+ 
+ # Implicit targets
+ .c.o:
+-		$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
++		${LIBTOOL} $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
+ 
  
- # Targets for all platforms
-@@ -39,8 +39,8 @@
- all:		$(LIBRARY) @extras@
+ # Library/cleanup targets: 
+@@ -60,8 +60,9 @@
+ shlib:          $(SHLIB)
  
  $(LIBRARY):	$(LIBOBJ)
 -		$(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ)
 -		$(RANLIB) $(LIBRARY)
-+		${CC} -o ${LIBRARY} ${LIBOBJ:.o=.lo} -rpath ${PREFIX}/lib \
-+			-version-info 1:2
- 
- $(LIBOBJ):	Makefile
- 
++		${LIBTOOL} $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo)		\
++			-rpath ${PREFIX}/lib -version-info 1:3
++
+ 
+ $(SHLIB):	$(LIBOBJ)
+ 		$(CC) -shared -o $(SHLIB) $(LIBOBJ)
+@@ -69,7 +70,7 @@
+ install:	$(LIBRARY)
+ 		$(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY)
+ 		$(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER)
+-		$(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
++		${LIBTOOL} $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
+ 		@if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi
+ 
+ clean:
diff --git a/graphics/mpeg-lib/pkg/PLIST b/graphics/mpeg-lib/pkg/PLIST
index 8a5234a9447..68e157cb6b1 100644
--- a/graphics/mpeg-lib/pkg/PLIST
+++ b/graphics/mpeg-lib/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:43 agc Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/08/02 13:28:47 jlam Exp $
 include/mpeg.h
-lib/libmpeg.a
-lib/libmpeg.la
-lib/libmpeg.so
-lib/libmpeg.so.1
-lib/libmpeg.so.1.2
+lib/libmpeg_lib.a
+lib/libmpeg_lib.la
+lib/libmpeg_lib.so
+lib/libmpeg_lib.so.1
+lib/libmpeg_lib.so.1.3