25 files changed, 29 insertions, 29 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index 436fdb641f1..d0f13efb554 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.319 2004/06/26 18:10:20 grant Exp $
+# $NetBSD: Makefile,v 1.320 2004/06/26 18:27:23 grant Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -154,7 +154,6 @@ SUBDIR+=	ljpeg
 SUBDIR+=	magicpoint
 SUBDIR+=	mgl
 SUBDIR+=	mng
-SUBDIR+=	mpeg-lib
 SUBDIR+=	mpeg2codec
 SUBDIR+=	mpgtx
 SUBDIR+=	mtv
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 31702093924..7d87fcfc9d8 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
+# $NetBSD: Makefile,v 1.4 2004/06/26 18:27:23 grant Exp $
 #
 
 DISTNAME=		gimp-1.2.5
@@ -71,7 +71,7 @@ post-install:
 			${LOCALBASE}/share/aclocal/gimp.m4
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/mpeg-lib/buildlink3.mk"
+.include "../../multimedia/mpeg-lib/buildlink3.mk"
 .if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
 PLIST_SUBST+=	HELPBROWSER=""
 .include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 111874d5cb4..aa06fe5c1d5 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 02:26:41 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/06/26 18:27:23 grant Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GIMP_BASE_BUILDLINK3_MK:=	${GIMP_BASE_BUILDLINK3_MK}+
@@ -17,10 +17,10 @@ BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/mpeg-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../multimedia/mpeg-lib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/Makefile b/multimedia/Makefile
index d4d1f22074c..773716c1739 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/06/26 18:10:20 grant Exp $
+# $NetBSD: Makefile,v 1.55 2004/06/26 18:27:23 grant Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -53,6 +53,7 @@ SUBDIR+=	moz-flash
 SUBDIR+=	moz-mplayer
 SUBDIR+=	mpeg_encode
 SUBDIR+=	mpeg_play
+SUBDIR+=	mpeg-lib
 SUBDIR+=	mplayer
 SUBDIR+=	mplayer-share
 SUBDIR+=	mplex
diff --git a/graphics/mpeg-lib/DESCR b/multimedia/mpeg-lib/DESCR
index 7c6d4e25b07..7c6d4e25b07 100644
--- a/graphics/mpeg-lib/DESCR
+++ b/multimedia/mpeg-lib/DESCR
diff --git a/graphics/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile
index df83bb9075c..3d8139f5028 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/multimedia/mpeg-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2004/04/24 00:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2004/06/26 18:27:23 grant Exp $
 #
 
 DISTNAME=	mpeg_lib-1.3.1
 PKGNAME=	mpeg-1.3.1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 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/
diff --git a/graphics/mpeg-lib/PLIST b/multimedia/mpeg-lib/PLIST
index 555a1221b83..bfbc9fe1095 100644
--- a/graphics/mpeg-lib/PLIST
+++ b/multimedia/mpeg-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:05 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/06/26 18:27:23 grant Exp $
 include/mpeg.h
 lib/libmpeg_lib.a
 lib/libmpeg_lib.la
diff --git a/graphics/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk
index 852c1e179d8..90f921e304f 100644
--- a/graphics/mpeg-lib/buildlink3.mk
+++ b/multimedia/mpeg-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/24 00:49:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MPEG_BUILDLINK3_MK:=	${MPEG_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mpeg
 
 .if !empty(MPEG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mpeg+=	mpeg>=1.3.1
-BUILDLINK_PKGSRCDIR.mpeg?=	../../graphics/mpeg-lib
+BUILDLINK_PKGSRCDIR.mpeg?=	../../multimedia/mpeg-lib
 .endif	# MPEG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/mpeg-lib/distinfo b/multimedia/mpeg-lib/distinfo
index 255c3ca71f9..19aab741628 100644
--- a/graphics/mpeg-lib/distinfo
+++ b/multimedia/mpeg-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/04/24 00:49:45 wiz Exp $
+$NetBSD: distinfo,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 SHA1 (mpeg_lib-1.3.1.tar.gz) = 0ea4f8b31e4f316d99c2034d76619988f75147dc
 Size (mpeg_lib-1.3.1.tar.gz) = 152092 bytes
diff --git a/graphics/mpeg-lib/patches/patch-aa b/multimedia/mpeg-lib/patches/patch-aa
index e22e87ef3ab..7992e3aa633 100644
--- a/graphics/mpeg-lib/patches/patch-aa
+++ b/multimedia/mpeg-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-aa,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- wrapper.c.orig	Sun Aug  8 20:22:14 1999
 +++ wrapper.c	Mon Sep 15 22:50:34 2003
diff --git a/graphics/mpeg-lib/patches/patch-ab b/multimedia/mpeg-lib/patches/patch-ab
index 4188c44ea62..ae5a7d9a21a 100644
--- a/graphics/mpeg-lib/patches/patch-ab
+++ b/multimedia/mpeg-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ab,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- globals.c.orig	Sat Jul 31 20:17:20 1999
 +++ globals.c
diff --git a/graphics/mpeg-lib/patches/patch-ac b/multimedia/mpeg-lib/patches/patch-ac
index b96c56423e7..fea118f46f5 100644
--- a/graphics/mpeg-lib/patches/patch-ac
+++ b/multimedia/mpeg-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ac,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- 24bit.c.orig	Fri Jul 23 23:59:25 1999
 +++ 24bit.c	Mon Sep 15 22:49:14 2003
diff --git a/graphics/mpeg-lib/patches/patch-ad b/multimedia/mpeg-lib/patches/patch-ad
index 09e4794d532..a07403c7329 100644
--- a/graphics/mpeg-lib/patches/patch-ad
+++ b/multimedia/mpeg-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ad,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- gdith.c.orig	Sat Jul 24 00:04:42 1999
 +++ gdith.c	Mon Sep 15 22:49:55 2003
diff --git a/graphics/mpeg-lib/patches/patch-ae b/multimedia/mpeg-lib/patches/patch-ae
index 21a13d980e6..423c0f5669e 100644
--- a/graphics/mpeg-lib/patches/patch-ae
+++ b/multimedia/mpeg-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ae,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- fs2.c.orig	Fri Jul 23 23:40:17 1999
 +++ fs2.c	Mon Sep 15 22:49:38 2003
diff --git a/graphics/mpeg-lib/patches/patch-af b/multimedia/mpeg-lib/patches/patch-af
index dd0fe8276e0..b062d62eb9b 100644
--- a/graphics/mpeg-lib/patches/patch-af
+++ b/multimedia/mpeg-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-af,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- fs2fast.c.orig	Fri Jul 23 23:59:24 1999
 +++ fs2fast.c	Mon Sep 15 22:49:44 2003
diff --git a/graphics/mpeg-lib/patches/patch-ag b/multimedia/mpeg-lib/patches/patch-ag
index b272edf2188..eeb84b078bd 100644
--- a/graphics/mpeg-lib/patches/patch-ag
+++ b/multimedia/mpeg-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ag,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- fs4.c.orig	Fri Jul 23 23:59:24 1999
 +++ fs4.c	Mon Sep 15 22:49:49 2003
diff --git a/graphics/mpeg-lib/patches/patch-ah b/multimedia/mpeg-lib/patches/patch-ah
index ec475c7bfce..ccd292e7b8a 100644
--- a/graphics/mpeg-lib/patches/patch-ah
+++ b/multimedia/mpeg-lib/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ah,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- hybrid.c.orig	Fri Jul 23 23:50:51 1999
 +++ hybrid.c	Mon Sep 15 22:50:01 2003
diff --git a/graphics/mpeg-lib/patches/patch-ai b/multimedia/mpeg-lib/patches/patch-ai
index 0bbeae2cfbb..ce12be8142d 100644
--- a/graphics/mpeg-lib/patches/patch-ai
+++ b/multimedia/mpeg-lib/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ai,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- hybriderr.c.orig	Sat Jul 31 20:05:24 1999
 +++ hybriderr.c	Mon Sep 15 22:50:05 2003
diff --git a/graphics/mpeg-lib/patches/patch-aj b/multimedia/mpeg-lib/patches/patch-aj
index 4b5cf7e1cd9..43d2203dfd4 100644
--- a/graphics/mpeg-lib/patches/patch-aj
+++ b/multimedia/mpeg-lib/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-aj,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- 2x2.c.orig	Sat Jul 24 00:06:22 1999
 +++ 2x2.c	Mon Sep 15 22:49:32 2003
diff --git a/graphics/mpeg-lib/patches/patch-ak b/multimedia/mpeg-lib/patches/patch-ak
index c527a996629..6f66cb53ca7 100644
--- a/graphics/mpeg-lib/patches/patch-ak
+++ b/multimedia/mpeg-lib/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-ak,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- mono.c.orig	Fri Jul 23 23:59:22 1999
 +++ mono.c	Mon Sep 15 22:50:16 2003
diff --git a/graphics/mpeg-lib/patches/patch-al b/multimedia/mpeg-lib/patches/patch-al
index a1da9c1fd7e..3b7536ca9bd 100644
--- a/graphics/mpeg-lib/patches/patch-al
+++ b/multimedia/mpeg-lib/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-al,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- ordered.c.orig	Fri Jul 23 23:53:40 1999
 +++ ordered.c	Mon Sep 15 22:50:21 2003
diff --git a/graphics/mpeg-lib/patches/patch-am b/multimedia/mpeg-lib/patches/patch-am
index f83d7980826..d6b1259e0c5 100644
--- a/graphics/mpeg-lib/patches/patch-am
+++ b/multimedia/mpeg-lib/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-am,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- ordered2.c.orig	Fri Jul 23 23:54:01 1999
 +++ ordered2.c	Mon Sep 15 22:50:25 2003
diff --git a/graphics/mpeg-lib/patches/patch-an b/multimedia/mpeg-lib/patches/patch-an
index fab06e9e3e9..8ebfa240891 100644
--- a/graphics/mpeg-lib/patches/patch-an
+++ b/multimedia/mpeg-lib/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.4 2003/10/04 15:54:39 danw Exp $
+$NetBSD: patch-an,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- mb_ordered.c.orig	Fri Jul 23 23:53:08 1999
 +++ mb_ordered.c	Mon Sep 15 22:50:11 2003
diff --git a/graphics/mpeg-lib/patches/patch-ao b/multimedia/mpeg-lib/patches/patch-ao
index 403cf267cee..4d21db9560f 100644
--- a/graphics/mpeg-lib/patches/patch-ao
+++ b/multimedia/mpeg-lib/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.3 2001/08/02 13:28:47 jlam Exp $
+$NetBSD: patch-ao,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- mpeg.h.orig	Sat Jul 24 00:32:06 1999
 +++ mpeg.h
diff --git a/graphics/mpeg-lib/patches/patch-ap b/multimedia/mpeg-lib/patches/patch-ap
index 54257878b3c..90c429c44c0 100644
--- a/graphics/mpeg-lib/patches/patch-ap
+++ b/multimedia/mpeg-lib/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.7 2004/04/24 00:49:45 wiz Exp $
+$NetBSD: patch-ap,v 1.1 2004/06/26 18:27:23 grant Exp $
 
 --- Makefile.in.orig	Thu Nov 26 17:03:29 1998
 +++ Makefile.in	Mon Aug  6 16:54:52 2001