Finish move of gnome2-media to gnome-media.

12 files changed, 14 insertions, 39 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 4df44eff16e..8f0a5e10c9b 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/19 23:46:05 wiz Exp $
 #
 
 DISTNAME=		sound-juicer-2.14.5
@@ -27,7 +27,7 @@ BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.3
 .include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/gnome2-media/buildlink3.mk"
+.include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../audio/musicbrainz/buildlink3.mk"
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index e0ec9d91a34..e1d8f958c83 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2007/04/19 21:41:41 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2007/09/19 23:46:05 wiz Exp $
 
 DISTNAME=	gnome-2.18.1
 PKGREVISION=	1
@@ -45,7 +45,7 @@ DEPENDS+=	gok>=1.2.3:../../misc/gok
 DEPENDS+=	gnome-mag>=0.14.3:../../x11/gnome-mag
 DEPENDS+=	gnome-games>=2.18.1:../../games/gnome2-games
 #DEPENDS+=	nautilus-cd-burner>=2.18.0:../../sysutils/nautilus-cd-burner
-DEPENDS+=	gnome-media>=2.18.0:../../multimedia/gnome2-media
+DEPENDS+=	gnome-media>=2.18.0:../../multimedia/gnome-media
 DEPENDS+=	gnome-netstatus>=2.12.1:../../net/gnome-netstatus
 #DEPENDS+=	gnome2-system-monitor>=2.18.1.1:../../sysutils/gnome2-system-monitor
 DEPENDS+=	gnome-utils>=2.18.1:../../misc/gnome2-utils
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 1b684fb244b..da1a927e114 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2007/09/10 16:28:01 xtraeme Exp $
+# $NetBSD: Makefile,v 1.111 2007/09/19 23:46:06 wiz Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -22,7 +22,7 @@ SUBDIR+=	ggrab
 SUBDIR+=	gmencoder
 SUBDIR+=	gmplayer
 SUBDIR+=	gnash
-SUBDIR+=	gnome2-media
+SUBDIR+=	gnome-media
 SUBDIR+=	gopchop
 SUBDIR+=	gst-plugins0.10-bad
 SUBDIR+=	gst-plugins0.10-base
diff --git a/multimedia/gnome2-media/DESCR b/multimedia/gnome-media/DESCR
index 3fdb25c6983..3fdb25c6983 100644
--- a/multimedia/gnome2-media/DESCR
+++ b/multimedia/gnome-media/DESCR
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome-media/Makefile
index 07519abd0f4..5271baa5d70 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2007/09/19 23:13:26 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/19 23:46:06 wiz Exp $
 
 DISTNAME=		gnome-media-2.18.0
 PKGREVISION=		2
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome-media/PLIST
index 234defa3e07..4a84b277fee 100644
--- a/multimedia/gnome2-media/PLIST
+++ b/multimedia/gnome-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/09/15 15:23:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/09/19 23:46:06 wiz Exp $
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome-media/distinfo
index 37c8917baa7..ebdcb0c8874 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome-media/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2007/04/11 18:05:07 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/09/19 23:46:07 wiz Exp $
 
 SHA1 (gnome-media-2.18.0.tar.bz2) = 954b4d5069e29d60f28f63d3e2b7cd654247948f
 RMD160 (gnome-media-2.18.0.tar.bz2) = 7968d0cd5c00b0b36cbdc9c6c0eb1e5a35936e5f
diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome-media/patches/patch-aa
index eaf4d35ae26..fddf2a32085 100644
--- a/multimedia/gnome2-media/patches/patch-aa
+++ b/multimedia/gnome-media/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2007/04/11 18:05:07 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2007/09/19 23:46:07 wiz Exp $
 
 --- gnome-cd/bsd-cdrom.c.orig	2007-01-06 19:17:02.000000000 +0100
 +++ gnome-cd/bsd-cdrom.c
diff --git a/multimedia/gnome2-media/patches/patch-ab b/multimedia/gnome-media/patches/patch-ab
index 9168c1685fc..f5cc41e3b57 100644
--- a/multimedia/gnome2-media/patches/patch-ab
+++ b/multimedia/gnome-media/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2007/04/11 18:05:07 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2007/09/19 23:46:07 wiz Exp $
 
 --- gnome-cd/gst-cdrom.c.orig	2007-01-22 15:01:38.000000000 +0100
 +++ gnome-cd/gst-cdrom.c
diff --git a/multimedia/gnome2-media/patches/patch-ac b/multimedia/gnome-media/patches/patch-ac
index 74ada37d4de..3e24626d2bf 100644
--- a/multimedia/gnome2-media/patches/patch-ac
+++ b/multimedia/gnome-media/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2007/04/11 18:05:07 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2007/09/19 23:46:07 wiz Exp $
 
 --- configure.orig	2007-04-05 20:11:16.000000000 +0200
 +++ configure
diff --git a/multimedia/gnome2-media/buildlink3.mk b/multimedia/gnome2-media/buildlink3.mk
deleted file mode 100644
index 9fdd85b2818..00000000000
--- a/multimedia/gnome2-media/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/06/05 05:37:09 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-media
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-media}
-BUILDLINK_PACKAGES+=	gnome-media
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-media
-
-.if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
-BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.18.0nb1
-BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome2-media
-.endif	# GNOME_MEDIA_BUILDLINK3_MK
-
-.include "../../devel/GConf2-ui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 5331729d351..888843167de 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/09/19 23:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/19 23:46:05 wiz Exp $
 #
 
 DISTNAME=	gnome-python-desktop-2.18.0
@@ -30,7 +30,7 @@ PLIST_SUBST+=	NAUTILUSBURN="@comment "
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../multimedia/totem/buildlink3.mk"
-.include "../../multimedia/gnome2-media/buildlink3.mk"
+.include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"