move smpeg to multimedia/

18 files changed, 27 insertions, 27 deletions

diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index 6f377d86b8d..ae6c852409c 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: Makefile,v 1.14 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=		SDL_mixer-1.2.5
@@ -29,7 +29,7 @@ post-install:
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
index 9bef1005849..468feff3149 100644
--- a/audio/SDL_sound/Makefile
+++ b/audio/SDL_sound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/07 06:58:39 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=		SDL_sound-1.0.1
@@ -17,5 +17,5 @@ USE_X11=		YES
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/Makefile b/devel/Makefile
index 12ae15b3bc3..7ff57cf2ca7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.507 2004/06/24 03:47:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.508 2004/06/26 09:16:10 grant Exp $
 #
 
 COMMENT=	Development utilities
@@ -449,7 +449,6 @@ SUBDIR+=	sgi-stl-docs
 SUBDIR+=	silc-toolkit
 SUBDIR+=	slib
 SUBDIR+=	sml-mode
-SUBDIR+=	smpeg
 SUBDIR+=	spiff
 SUBDIR+=	splint
 SUBDIR+=	st
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index c6f4a0b7d7f..55315c84308 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/06/18 19:00:34 salo Exp $
+# $NetBSD: Makefile,v 1.19 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=	SDL_perl-1.19.2
@@ -20,12 +20,12 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SDL_perl/.packlist
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_gfx/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 927ba5402c1..ca3463b238f 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/12 20:06:29 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=		asc-source-1.14.0.0
@@ -33,7 +33,7 @@ post-extract:
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDLmm/buildlink3.mk"
 .include "../../devel/libsigc++/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../x11/paragui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index 89b87be8186..43c47315c21 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/05/04 16:25:15 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=		Magnetic22Src
@@ -21,6 +21,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtkmagnetic
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtkmagnetic
 
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index d1b2a49cdf4..6563f322843 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/07 07:05:50 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=	icebreaker-1.9.7
@@ -27,6 +27,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icebreaker
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dumpmpeg/Makefile b/graphics/dumpmpeg/Makefile
index 49db34999e1..c66a452207c 100644
--- a/graphics/dumpmpeg/Makefile
+++ b/graphics/dumpmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/19 04:59:01 snj Exp $
+# $NetBSD: Makefile,v 1.10 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=	dumpmpeg-0.6
@@ -13,5 +13,5 @@ COMMENT=	Splits mpeg stream into single images
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index ed970d92477..e2499ede633 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/05/07 01:14:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=	smpeg-xmms-0.3.5
@@ -15,7 +15,7 @@ USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
-.include "../../devel/smpeg/buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/multimedia/Makefile b/multimedia/Makefile
index e7c9a61468e..7e1864d0192 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/06/25 07:00:04 sekiya Exp $
+# $NetBSD: Makefile,v 1.50 2004/06/26 09:16:10 grant Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -61,6 +61,7 @@ SUBDIR+=	ogmtools
 SUBDIR+=	openquicktime
 SUBDIR+=	realplayer
 SUBDIR+=	realplayer-codecs
+SUBDIR+=	smpeg
 SUBDIR+=	transcode
 SUBDIR+=	trplayer
 SUBDIR+=	vlc
diff --git a/devel/smpeg/DESCR b/multimedia/smpeg/DESCR
index 9ef2c6159be..9ef2c6159be 100644
--- a/devel/smpeg/DESCR
+++ b/multimedia/smpeg/DESCR
diff --git a/devel/smpeg/Makefile b/multimedia/smpeg/Makefile
index 0bef1abb9e0..aea1c019f85 100644
--- a/devel/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2004/06/15 14:03:36 grant Exp $
+# $NetBSD: Makefile,v 1.1 2004/06/26 09:16:10 grant Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
 PKGREVISION=	6
-CATEGORIES=	devel
+CATEGORIES=	devel multimedia
 MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
 		ftp://ftp.linuxgames.com/loki/open-source/smpeg/
 
diff --git a/devel/smpeg/PLIST b/multimedia/smpeg/PLIST
index 743dffc67d5..9bfd72af4a7 100644
--- a/devel/smpeg/PLIST
+++ b/multimedia/smpeg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/06/26 09:16:10 grant Exp $
 bin/glmovie
 bin/gtv
 bin/plaympeg
diff --git a/devel/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
index 931749e93db..387d9a48030 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/multimedia/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/26 09:16:10 grant Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
diff --git a/devel/smpeg/distinfo b/multimedia/smpeg/distinfo
index 31c75d3d5b0..b7e074d4eed 100644
--- a/devel/smpeg/distinfo
+++ b/multimedia/smpeg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/03/01 01:46:57 kristerw Exp $
+$NetBSD: distinfo,v 1.1 2004/06/26 09:16:10 grant Exp $
 
 SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
 Size (smpeg-0.4.4.tar.gz) = 315054 bytes
diff --git a/devel/smpeg/patches/patch-aa b/multimedia/smpeg/patches/patch-aa
index c0b779a9b7a..697bd22594b 100644
--- a/devel/smpeg/patches/patch-aa
+++ b/multimedia/smpeg/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/07/28 09:52:31 jmmv Exp $
+$NetBSD: patch-aa,v 1.1 2004/06/26 09:16:10 grant Exp $
 
 --- plaympeg.c.orig	Tue Feb  4 15:59:22 2003
 +++ plaympeg.c	Tue Feb  4 15:59:48 2003
diff --git a/devel/smpeg/patches/patch-ab b/multimedia/smpeg/patches/patch-ab
index e5135950c6a..62e187b2201 100644
--- a/devel/smpeg/patches/patch-ab
+++ b/multimedia/smpeg/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2004/02/07 13:50:27 wiz Exp $
+$NetBSD: patch-ab,v 1.1 2004/06/26 09:16:10 grant Exp $
 
 --- Makefile.in.orig	2001-06-18 22:59:14.000000000 +0200
 +++ Makefile.in
diff --git a/devel/smpeg/patches/patch-ac b/multimedia/smpeg/patches/patch-ac
index 856469ce8ea..7af7271bd57 100644
--- a/devel/smpeg/patches/patch-ac
+++ b/multimedia/smpeg/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2004/03/01 01:46:57 kristerw Exp $
+$NetBSD: patch-ac,v 1.1 2004/06/26 09:16:10 grant Exp $
 
 --- video/video.h.orig	2004-03-01 02:14:39.000000000 +0100
 +++ video/video.h	2004-03-01 02:16:02.000000000 +0100