Rename gnome2-control-center to control-center, to match upstream name.

ok jmmv, drochner

13 files changed, 33 insertions, 33 deletions

diff --git a/x11/Makefile b/x11/Makefile
index fe714b89298..4bd1b3fdd9b 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.521 2007/09/14 00:28:54 simonb Exp $
+# $NetBSD: Makefile,v 1.522 2007/09/19 23:53:47 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -25,6 +25,7 @@ SUBDIR+=	bitmap
 SUBDIR+=	blt
 SUBDIR+=	bwidget
 SUBDIR+=	compositeproto
+SUBDIR+=	control-center
 SUBDIR+=	damageproto
 SUBDIR+=	desklaunch
 SUBDIR+=	deskmenu
@@ -60,7 +61,6 @@ SUBDIR+=	gnome-session
 SUBDIR+=	gnome-themes
 SUBDIR+=	gnome-themes-extras
 SUBDIR+=	gnome2-applets
-SUBDIR+=	gnome2-control-center
 SUBDIR+=	gnome2-terminal
 SUBDIR+=	gnopernicus
 SUBDIR+=	gnustep-back
diff --git a/x11/gnome2-control-center/DESCR b/x11/control-center/DESCR
index 21995d71a53..21995d71a53 100644
--- a/x11/gnome2-control-center/DESCR
+++ b/x11/control-center/DESCR
diff --git a/x11/gnome2-control-center/Makefile b/x11/control-center/Makefile
index b4f880a2c56..261298d851d 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2007/09/19 23:13:36 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/19 23:53:48 wiz Exp $
 #
 
 DISTNAME=	control-center-2.18.1
-PKGNAME=	gnome2-${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.18/}
@@ -18,6 +17,8 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 
+CONFLICTS+=		gnome2-control-center-[0-9]*
+
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--disable-hal
 CONFIGURE_ARGS+=	--enable-aboutme
@@ -40,7 +41,7 @@ GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
 GCONF2_SCHEMAS+=	themus.schemas
 GCONF2_SCHEMAS+=	fontilus.schemas
 
-EGDIR=			${PREFIX}/share/examples/gnome2-control-center
+EGDIR=			${PREFIX}/share/examples/control-center
 CONF_FILES=		${EGDIR}/theme-method.conf \
 			${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/theme-method.conf
 CONF_FILES+=		${EGDIR}/font-method.conf \
diff --git a/x11/gnome2-control-center/PLIST b/x11/control-center/PLIST
index 16b618b6b3d..927f63d63ba 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/04/17 15:59:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/09/19 23:53:49 wiz Exp $
 bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
@@ -115,9 +115,9 @@ share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/desktop-directories/font-method.directory
 share/desktop-directories/gnomecc.directory
 share/desktop-directories/theme-method.directory
-share/examples/gnome2-control-center/font-method.conf
-share/examples/gnome2-control-center/gnomecc.menu
-share/examples/gnome2-control-center/theme-method.conf
+share/examples/control-center/font-method.conf
+share/examples/control-center/gnomecc.menu
+share/examples/control-center/theme-method.conf
 share/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
@@ -263,7 +263,7 @@ share/pixmaps/display-capplet.png
 @dirrm share/gnome/cursor-fonts
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
-@dirrm share/examples/gnome2-control-center
+@dirrm share/examples/control-center
 @comment in xdg-dirs: @dirrm share/desktop-directories
 @comment in dbus: @dirrm share/dbus-1/services
 @dirrm share/control-center/xrdb
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/control-center/buildlink3.mk
index 4cdd535f74a..8218ced563e 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/control-center/buildlink3.mk
@@ -1,21 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.22 2007/09/19 23:13:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/09/19 23:53:49 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
+CONTROL_CENTER_BUILDLINK3_MK:=	${CONTROL_CENTER_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome2-control-center
+BUILDLINK_DEPENDS+=	control-center
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
-BUILDLINK_PACKAGES+=	gnome2-control-center
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome2-control-center
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncontrol-center}
+BUILDLINK_PACKAGES+=	control-center
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}control-center
 
-.if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
-BUILDLINK_ABI_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.18.1nb1
-BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
-.endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
+.if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.control-center+=	control-center>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.control-center?=	control-center>=2.18.1nb1
+BUILDLINK_PKGSRCDIR.control-center?=	../../x11/control-center
+.endif	# CONTROL_CENTER_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
@@ -32,6 +32,5 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome2-control-center/distinfo b/x11/control-center/distinfo
index 4a0bf2059d8..22344f13182 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/control-center/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2007/04/11 17:48:10 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/09/19 23:53:49 wiz Exp $
 
 SHA1 (control-center-2.18.1.tar.bz2) = 4325caeb94de9b77cd57fc210f1ba623458a2aa8
 RMD160 (control-center-2.18.1.tar.bz2) = f3980d2348a699f646d87ec27c61f27057594302
diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/control-center/patches/patch-aa
index 0b18581bd1a..caffba83cee 100644
--- a/x11/gnome2-control-center/patches/patch-aa
+++ b/x11/control-center/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2006/11/24 18:31:25 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2007/09/19 23:53:50 wiz Exp $
 
 --- capplets/about-me/gnome-about-me-password.c.orig	2006-09-15 13:12:18.000000000 +0200
 +++ capplets/about-me/gnome-about-me-password.c
diff --git a/x11/gnome2-control-center/patches/patch-ab b/x11/control-center/patches/patch-ab
index 0c10b142d99..b2cae7e0d3c 100644
--- a/x11/gnome2-control-center/patches/patch-ab
+++ b/x11/control-center/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2006/09/24 20:00:14 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/09/19 23:53:50 wiz Exp $
 
 --- capplets/about-me/gnome-about-me.c.orig	2006-09-24 20:42:14.000000000 +0000
 +++ capplets/about-me/gnome-about-me.c
diff --git a/x11/gnome2-control-center/patches/patch-ad b/x11/control-center/patches/patch-ad
index 6cf652a3c32..92710309f02 100644
--- a/x11/gnome2-control-center/patches/patch-ad
+++ b/x11/control-center/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2004/09/21 16:56:18 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2007/09/19 23:53:51 wiz Exp $
 
 --- configure.orig	2004-08-30 01:56:22.000000000 +0200
 +++ configure
diff --git a/x11/gnome2-control-center/patches/patch-af b/x11/control-center/patches/patch-af
index ab9af160e7f..d8004c9d934 100644
--- a/x11/gnome2-control-center/patches/patch-af
+++ b/x11/control-center/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2005/08/12 15:59:22 jmmv Exp $
+$NetBSD: patch-af,v 1.4 2007/09/19 23:53:51 wiz Exp $
 
 --- capplets/background/Makefile.in.orig	2005-04-04 12:09:16.000000000 +0200
 +++ capplets/background/Makefile.in
diff --git a/x11/gnome2-control-center/patches/patch-ag b/x11/control-center/patches/patch-ag
index 3d891ba8c51..95c72a4d02f 100644
--- a/x11/gnome2-control-center/patches/patch-ag
+++ b/x11/control-center/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2007/04/11 17:48:10 drochner Exp $
+$NetBSD: patch-ag,v 1.1 2007/09/19 23:53:51 wiz Exp $
 
 --- libslab/directory-tile.c.orig	2007-04-05 13:32:36.000000000 +0200
 +++ libslab/directory-tile.c
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 1767167eec7..bada00a595a 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2007/09/19 23:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2007/09/19 23:53:47 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.18.3
@@ -50,7 +50,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/scrollkeeper/buildlink3.mk"
-.include "../../x11/gnome2-control-center/buildlink3.mk"
+.include "../../x11/control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 1923783501e..1f712bf1775 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2007/09/19 23:13:36 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2007/09/19 23:53:48 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.18.0
@@ -105,11 +105,11 @@ PYTHON_PATCH_SCRIPTS+=	invest-applet/invest/invest-chart
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../x11/gnome2-control-center/buildlink3.mk"
+.include "../../x11/control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"