move libmpeg3 to multimedia/

16 files changed, 19 insertions, 19 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 7ff57cf2ca7..ff1643ee731 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.508 2004/06/26 09:16:10 grant Exp $
+# $NetBSD: Makefile,v 1.509 2004/06/26 18:00:21 grant Exp $
 #
 
 COMMENT=	Development utilities
@@ -209,7 +209,6 @@ SUBDIR+=	libidn
 SUBDIR+=	libjit
 SUBDIR+=	libmemmgr
 SUBDIR+=	libmm
-SUBDIR+=	libmpeg3
 SUBDIR+=	libnet
 SUBDIR+=	libntlm
 SUBDIR+=	libole2
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 7b1d6c816ae..8af4e1e4952 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2004/06/26 17:48:56 grant Exp $
+# $NetBSD: Makefile,v 1.52 2004/06/26 18:00:21 grant Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -39,6 +39,7 @@ SUBDIR+=	libdvdread
 SUBDIR+=	libflash
 SUBDIR+=	libmatroska
 SUBDIR+=	libmpeg2
+SUBDIR+=	libmpeg3
 SUBDIR+=	libogg
 SUBDIR+=	libtheora
 SUBDIR+=	lsdvd
diff --git a/devel/libmpeg3/DESCR b/multimedia/libmpeg3/DESCR
index ca31a820815..ca31a820815 100644
--- a/devel/libmpeg3/DESCR
+++ b/multimedia/libmpeg3/DESCR
diff --git a/devel/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index bc216206ca2..b5cc6eb3bdb 100644
--- a/devel/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2004/06/12 04:34:49 grant Exp $
+# $NetBSD: Makefile,v 1.1 2004/06/26 18:00:21 grant Exp $
 #
 
 DISTNAME=	libmpeg3-1.3
 PKGREVISION=	4
-CATEGORIES=	devel audio graphics
+CATEGORIES=	devel audio graphics multimedia
 MASTER_SITES=	http://heroines.sourceforge.net/
 
 MAINTAINER=	tech-pkg@NetBSD.org
diff --git a/devel/libmpeg3/PLIST b/multimedia/libmpeg3/PLIST
index 6ee2a2eb4ba..99fa16ab8f6 100644
--- a/devel/libmpeg3/PLIST
+++ b/multimedia/libmpeg3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/29 21:41:41 rh Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/06/26 18:00:21 grant Exp $
 include/mpeg3/libmpeg3.h
 bin/mpeg3dump
 bin/mpeg3cat
diff --git a/devel/libmpeg3/buildlink3.mk b/multimedia/libmpeg3/buildlink3.mk
index 5f0b16875df..10aaf508dd5 100644
--- a/devel/libmpeg3/buildlink3.mk
+++ b/multimedia/libmpeg3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 19:34:01 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMPEG3_BUILDLINK3_MK:=	${LIBMPEG3_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libmpeg3
 
 .if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
-BUILDLINK_PKGSRCDIR.libmpeg3?=	../../devel/libmpeg3
+BUILDLINK_PKGSRCDIR.libmpeg3?=	../../multimedia/libmpeg3
 .endif	# LIBMPEG3_BUILDLINK3_MK
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
index 5e55723dde6..cbf0204a06a 100644
--- a/devel/libmpeg3/distinfo
+++ b/multimedia/libmpeg3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/05/04 13:50:57 mrg Exp $
+$NetBSD: distinfo,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
 Size (libmpeg3-1.3.tar.gz) = 154062 bytes
diff --git a/devel/libmpeg3/patches/patch-aa b/multimedia/libmpeg3/patches/patch-aa
index 19760373573..d697c21a9e6 100644
--- a/devel/libmpeg3/patches/patch-aa
+++ b/multimedia/libmpeg3/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+$NetBSD: patch-aa,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- Makefile.orig	Sun May 20 05:05:26 2001
 +++ Makefile	Tue Jul 31 17:34:17 2001
diff --git a/devel/libmpeg3/patches/patch-ab b/multimedia/libmpeg3/patches/patch-ab
index 57d2cd00123..1a3e8b09b94 100644
--- a/devel/libmpeg3/patches/patch-ab
+++ b/multimedia/libmpeg3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+$NetBSD: patch-ab,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- mpeg3css.c.orig	Tue Jul 31 17:16:17 2001
 +++ mpeg3css.c	Tue Jul 31 17:16:44 2001
diff --git a/devel/libmpeg3/patches/patch-ac b/multimedia/libmpeg3/patches/patch-ac
index c974b0eb7bf..987729d8d3a 100644
--- a/devel/libmpeg3/patches/patch-ac
+++ b/multimedia/libmpeg3/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+$NetBSD: patch-ac,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- mpeg3ifo.c.orig	Tue Jul 31 17:18:25 2001
 +++ mpeg3ifo.c	Tue Jul 31 17:18:56 2001
diff --git a/devel/libmpeg3/patches/patch-ad b/multimedia/libmpeg3/patches/patch-ad
index 72226b4455e..549eb529364 100644
--- a/devel/libmpeg3/patches/patch-ad
+++ b/multimedia/libmpeg3/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+$NetBSD: patch-ad,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- ifo.h.orig	Tue Jul 31 17:19:54 2001
 +++ ifo.h	Tue Jul 31 17:20:47 2001
diff --git a/devel/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae
index 621c7cfd4eb..945eb272c37 100644
--- a/devel/libmpeg3/patches/patch-ae
+++ b/multimedia/libmpeg3/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2004/05/04 13:50:57 mrg Exp $
+$NetBSD: patch-ae,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- mpeg3io.c.orig	2001-05-20 13:05:26.000000000 +1000
 +++ mpeg3io.c	2004-05-04 23:48:36.000000000 +1000
diff --git a/devel/libmpeg3/patches/patch-af b/multimedia/libmpeg3/patches/patch-af
index 1a776f7900e..e890d31e5a9 100644
--- a/devel/libmpeg3/patches/patch-af
+++ b/multimedia/libmpeg3/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+$NetBSD: patch-af,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- video/reconstruct.c.orig	Tue Jul 31 17:23:42 2001
 +++ video/reconstruct.c	Tue Jul 31 17:24:52 2001
diff --git a/devel/libmpeg3/patches/patch-ag b/multimedia/libmpeg3/patches/patch-ag
index 8653083e5db..2a0f30fefb0 100644
--- a/devel/libmpeg3/patches/patch-ag
+++ b/multimedia/libmpeg3/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
+$NetBSD: patch-ag,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- video/mmxtest.c.orig	Tue Jul 31 19:37:07 2001
 +++ video/mmxtest.c	Tue Jul 31 19:41:16 2001
diff --git a/devel/libmpeg3/patches/patch-ah b/multimedia/libmpeg3/patches/patch-ah
index 6b5db0e4030..12035bb0083 100644
--- a/devel/libmpeg3/patches/patch-ah
+++ b/multimedia/libmpeg3/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2003/07/28 15:01:28 mrg Exp $
+$NetBSD: patch-ah,v 1.1 2004/06/26 18:00:21 grant Exp $
 
 --- video/output.c.orig	2001-05-20 13:05:26.000000000 +1000
 +++ video/output.c	2003-07-29 00:53:45.000000000 +1000
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 9ee8782eb68..f75f2ee0d69 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/05/12 16:19:32 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2004/06/26 18:00:21 grant Exp $
 
 DISTNAME=	transcode-0.6.12
 PKGREVISION=	1
@@ -49,7 +49,7 @@ post-install:
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/libmpeg3/buildlink3.mk"
+.include "../../multimedia/libmpeg3/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"