Move swfdec and swfdec-gtk2 from graphics to multimedia.

Suggested by wiz@.

17 files changed, 25 insertions, 23 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 28c81d348ab..140c1f70b19 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10288 2005/06/04 09:36:23 wiz Exp $
+$NetBSD: CHANGES,v 1.10289 2005/06/04 10:41:41 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 	
@@ -2777,3 +2777,5 @@ Changes to the packages collection and infrastructure in 2005:
 	Added comms/conserver8 version 8.1.11 [wiz 2005-06-03]
 	Updated security/systrace-policies to 1.1nb1 [kristerw 2005-06-04]
 	Updated net/rsync to 2.6.5 [wiz 2005-06-04]
+	Moved graphics/swfdec to multimedia/swfdec [jmmv 2005-06-04]
+	Moved graphics/swfdec-gtk2 to multimedia/swfdec-gtk2 [jmmv 2005-06-04]
diff --git a/graphics/Makefile b/graphics/Makefile
index ceadde86961..681f21a59df 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.384 2005/05/18 22:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.385 2005/06/04 10:41:41 jmmv Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -261,8 +261,6 @@ SUBDIR+=	skencil
 SUBDIR+=	snx101view
 SUBDIR+=	sodipodi
 SUBDIR+=	spcaview
-SUBDIR+=	swfdec
-SUBDIR+=	swfdec-gtk2
 SUBDIR+=	tgif
 SUBDIR+=	tiff
 SUBDIR+=	tkpiechart
diff --git a/meta-pkgs/gtk2-extras/Makefile b/meta-pkgs/gtk2-extras/Makefile
index 9051af371d6..2c70bc9f2c0 100644
--- a/meta-pkgs/gtk2-extras/Makefile
+++ b/meta-pkgs/gtk2-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:04 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/04 10:41:42 jmmv Exp $
 
 DISTNAME=	gtk2-extras-2.6.0
 PKGREVISION=	1
@@ -13,7 +13,7 @@ COMMENT=	Meta-package for the GIMP Toolkit v2
 DEPENDS+=	gtk2+>=2.6.0:../../x11/gtk2
 DEPENDS+=	gtk2-engines>=2.6.0:../../x11/gtk2-engines
 DEPENDS+=	librsvg2-gtk2>=2.6.3:../../graphics/librsvg2-gtk2
-DEPENDS+=	swfdec-gtk2>=0.2.1nb1:../../graphics/swfdec-gtk2
+DEPENDS+=	swfdec-gtk2>=0.2.1nb1:../../multimedia/swfdec-gtk2
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 70e74a9d191..07aa381c5dd 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2005/06/03 15:40:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.71 2005/06/04 10:41:41 jmmv Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -71,6 +71,8 @@ SUBDIR+=	realplayer-codecs
 SUBDIR+=	regionset
 SUBDIR+=	smpeg
 SUBDIR+=	smpeg-xmms
+SUBDIR+=	swfdec
+SUBDIR+=	swfdec-gtk2
 SUBDIR+=	totem
 SUBDIR+=	totem-xine
 SUBDIR+=	transcode
diff --git a/graphics/swfdec-gtk2/DESCR b/multimedia/swfdec-gtk2/DESCR
index 8ca0443a1ac..8ca0443a1ac 100644
--- a/graphics/swfdec-gtk2/DESCR
+++ b/multimedia/swfdec-gtk2/DESCR
diff --git a/graphics/swfdec-gtk2/Makefile b/multimedia/swfdec-gtk2/Makefile
index 971c2d7734e..253845524e2 100644
--- a/graphics/swfdec-gtk2/Makefile
+++ b/multimedia/swfdec-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 #
 
 PKGREVISION=		2
 
-.include "../../graphics/swfdec/Makefile.common"
+.include "../../multimedia/swfdec/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/-gtk2-/}
 COMMENT+=		(GTK2 modules)
@@ -15,6 +15,6 @@ INSTALL_DIRS=		${WRKSRC}/pixbuf-loader
 
 GTK2_LOADERS=		YES
 
-.include "../../graphics/swfdec/buildlink3.mk"
+.include "../../multimedia/swfdec/buildlink3.mk"
 .include "../../x11/gtk2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/swfdec-gtk2/PLIST b/multimedia/swfdec-gtk2/PLIST
index f19f36dd6d6..c3df5572860 100644
--- a/graphics/swfdec-gtk2/PLIST
+++ b/multimedia/swfdec-gtk2/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 lib/gtk-2.0/2.4.0/loaders/swf_loader.la
 @comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/loaders
diff --git a/graphics/swfdec/DESCR b/multimedia/swfdec/DESCR
index dca3b18623c..dca3b18623c 100644
--- a/graphics/swfdec/DESCR
+++ b/multimedia/swfdec/DESCR
diff --git a/graphics/swfdec/MESSAGE b/multimedia/swfdec/MESSAGE
index 914486ba438..f9ca13935de 100644
--- a/graphics/swfdec/MESSAGE
+++ b/multimedia/swfdec/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/01/22 12:48:32 jmmv Exp $
+$NetBSD: MESSAGE,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 
 You should install the swfdec-gtk2 package, which provides an SWF
 gdk-pixbuf loader for the GTK2 toolkit.
diff --git a/graphics/swfdec/Makefile b/multimedia/swfdec/Makefile
index f5b34723feb..9fd0f2846a8 100644
--- a/graphics/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 #
 
 PKGREVISION=		2
diff --git a/graphics/swfdec/Makefile.common b/multimedia/swfdec/Makefile.common
index 39de7c0395d..818134c0c35 100644
--- a/graphics/swfdec/Makefile.common
+++ b/multimedia/swfdec/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.8 2005/06/04 00:21:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 #
 
 DISTNAME=		swfdec-0.2.2
-CATEGORIES=		graphics
+CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
 
 MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://swfdec.sourceforge.net/
 COMMENT=		Library for rendering Flash(R) animations and games
 
-DISTINFO_FILE=		${.CURDIR}/../../graphics/swfdec/distinfo
-PATCHDIR=		${.CURDIR}/../../graphics/swfdec/patches
+DISTINFO_FILE=		${.CURDIR}/../../multimedia/swfdec/distinfo
+PATCHDIR=		${.CURDIR}/../../multimedia/swfdec/patches
 
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
diff --git a/graphics/swfdec/PLIST b/multimedia/swfdec/PLIST
index 195e4ccdc0d..352138ca491 100644
--- a/graphics/swfdec/PLIST
+++ b/multimedia/swfdec/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 bin/swf_play
 include/swfdec/swf.h
 include/swfdec/swfdec.h
diff --git a/graphics/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 8c4b4db6960..9b3fa6ee89c 100644
--- a/graphics/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:14:58 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
diff --git a/graphics/swfdec/distinfo b/multimedia/swfdec/distinfo
index bc14984c72f..311ad4c2a6a 100644
--- a/graphics/swfdec/distinfo
+++ b/multimedia/swfdec/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 08:45:13 agc Exp $
+$NetBSD: distinfo,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 
 SHA1 (swfdec-0.2.2.tar.gz) = f3cbc3fec455117d554d37ac4dda1d99fb592661
 RMD160 (swfdec-0.2.2.tar.gz) = e44e1d5890fd1b8e6b73fa0ed5d645dbb6203c88
diff --git a/graphics/swfdec/patches/patch-aa b/multimedia/swfdec/patches/patch-aa
index f93b602e525..2aff0e8cff2 100644
--- a/graphics/swfdec/patches/patch-aa
+++ b/multimedia/swfdec/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $
+$NetBSD: patch-aa,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 
 --- libswfdec/mpglib/clipconv_f32_s16.h.orig	2002-11-06 17:11:48.000000000 +1000
 +++ libswfdec/mpglib/clipconv_f32_s16.h
diff --git a/graphics/swfdec/patches/patch-ab b/multimedia/swfdec/patches/patch-ab
index 91f2e905289..4b980a44235 100644
--- a/graphics/swfdec/patches/patch-ab
+++ b/multimedia/swfdec/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2003/05/12 20:17:48 jmc Exp $
+$NetBSD: patch-ab,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 
 --- player/swf_play.c.orig	Wed Feb  5 20:19:27 2003
 +++ player/swf_play.c	Mon May 12 11:43:12 2003
diff --git a/graphics/swfdec/patches/patch-ac b/multimedia/swfdec/patches/patch-ac
index 5925c37c250..3619296298e 100644
--- a/graphics/swfdec/patches/patch-ac
+++ b/multimedia/swfdec/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2004/01/22 12:48:32 jmmv Exp $
+$NetBSD: patch-ac,v 1.1 2005/06/04 10:41:42 jmmv Exp $
 
 --- pixbuf-loader/Makefile.in.orig	2003-02-05 21:37:46.000000000 +0100
 +++ pixbuf-loader/Makefile.in