Move gnome2-applets to gnome-applets to make directory name match PKGNAME.

13 files changed, 15 insertions, 15 deletions

diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 2fee76832f8..1733d9294b0 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/09/19 23:57:00 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/19 23:59:55 wiz Exp $
 
 DISTNAME=	gnome-base-2.18.1
 CATEGORIES=	meta-pkgs x11 gnome
@@ -71,7 +71,7 @@ DEPENDS+=	evolution-data-server>=1.10.1:../../mail/evolution-data-server
 DEPENDS+=	control-center>=2.18.1:../../x11/control-center
 DEPENDS+=	gnome-panel>=2.18.1:../../x11/gnome-panel
 DEPENDS+=	gucharmap>=1.10.0:../../fonts/gucharmap
-DEPENDS+=	gnome-applets>=2.18.0:../../x11/gnome2-applets
+DEPENDS+=	gnome-applets>=2.18.0:../../x11/gnome-applets
 DEPENDS+=	gnome-themes>=2.18.1:../../x11/gnome-themes
 DEPENDS+=	gnome-backgrounds>=2.15.92:../../graphics/gnome-backgrounds
 DEPENDS+=	vte>=0.16.1:../../x11/vte
diff --git a/x11/Makefile b/x11/Makefile
index 72de9b80839..790dba22016 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.523 2007/09/19 23:57:00 wiz Exp $
+# $NetBSD: Makefile,v 1.524 2007/09/19 23:59:55 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -53,6 +53,7 @@ SUBDIR+=	fvwm-wharf
 SUBDIR+=	gdm
 SUBDIR+=	ggiterm
 SUBDIR+=	glproto
+SUBDIR+=	gnome-applets
 SUBDIR+=	gnome-desktop
 SUBDIR+=	gnome-mag
 SUBDIR+=	gnome-panel
@@ -61,7 +62,6 @@ SUBDIR+=	gnome-session
 SUBDIR+=	gnome-terminal
 SUBDIR+=	gnome-themes
 SUBDIR+=	gnome-themes-extras
-SUBDIR+=	gnome2-applets
 SUBDIR+=	gnopernicus
 SUBDIR+=	gnustep-back
 SUBDIR+=	gnustep-gui
diff --git a/x11/gnome2-applets/DESCR b/x11/gnome-applets/DESCR
index ad79fccdc9d..ad79fccdc9d 100644
--- a/x11/gnome2-applets/DESCR
+++ b/x11/gnome-applets/DESCR
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome-applets/Makefile
index 1f712bf1775..8501fa269e4 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2007/09/19 23:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/20 00:00:00 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.18.0
@@ -20,7 +20,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome2-applets
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-applets
 PKG_SUPPORTED_OPTIONS=	inet6
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome-applets/PLIST
index 973353bc5ff..275d49d1e94 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/05/31 13:26:09 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/09/20 00:00:00 wiz Exp $
 ${CPUFREQ}bin/cpufreq-selector
 bin/invest-chart
 include/libgweather/gweather-gconf.h
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome-applets/distinfo
index d7cd1bac3b1..9356dc6d847 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/09/17 16:21:55 drochner Exp $
+$NetBSD: distinfo,v 1.10 2007/09/20 00:00:02 wiz Exp $
 
 SHA1 (gnome-applets-2.18.0.tar.bz2) = 7bec1f642e827634f74859e81e1502799d3c05a2
 RMD160 (gnome-applets-2.18.0.tar.bz2) = c9a18c717fd01ede9476a70784a8522968e52211
diff --git a/x11/gnome2-applets/patches/patch-aa b/x11/gnome-applets/patches/patch-aa
index 06abca29d1e..579a51aa691 100644
--- a/x11/gnome2-applets/patches/patch-aa
+++ b/x11/gnome-applets/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2005/03/22 16:19:42 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2007/09/20 00:00:02 wiz Exp $
 
 --- battstat/sounds/Makefile.in.orig	2005-03-07 15:02:46.000000000 +0100
 +++ battstat/sounds/Makefile.in
diff --git a/x11/gnome2-applets/patches/patch-ab b/x11/gnome-applets/patches/patch-ab
index b3d24326b94..a66c7a2015d 100644
--- a/x11/gnome2-applets/patches/patch-ab
+++ b/x11/gnome-applets/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2005/10/12 21:59:10 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2007/09/20 00:00:02 wiz Exp $
 
 --- battstat/properties.c.orig	2005-07-09 07:48:58.000000000 +0200
 +++ battstat/properties.c
diff --git a/x11/gnome2-applets/patches/patch-ac b/x11/gnome-applets/patches/patch-ac
index 6e4ba45a043..065cfb25065 100644
--- a/x11/gnome2-applets/patches/patch-ac
+++ b/x11/gnome-applets/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2006/09/15 15:14:38 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2007/09/20 00:00:02 wiz Exp $
 
 --- configure.orig	2006-09-04 16:08:23.000000000 +0200
 +++ configure
diff --git a/x11/gnome2-applets/patches/patch-ad b/x11/gnome-applets/patches/patch-ad
index 0a6c3fde362..a5a7aaf2cde 100644
--- a/x11/gnome2-applets/patches/patch-ad
+++ b/x11/gnome-applets/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2005/10/12 21:59:10 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2007/09/20 00:00:03 wiz Exp $
 
 --- battstat/power-management.c.orig	2005-08-30 16:32:42.000000000 +0200
 +++ battstat/power-management.c
diff --git a/x11/gnome2-applets/patches/patch-ae b/x11/gnome-applets/patches/patch-ae
index 79737d481be..83300741bb8 100644
--- a/x11/gnome2-applets/patches/patch-ae
+++ b/x11/gnome-applets/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2007/04/17 17:59:07 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2007/09/20 00:00:03 wiz Exp $
 
 --- geyes/Makefile.in.orig	2007-03-12 14:04:23.000000000 +0100
 +++ geyes/Makefile.in
diff --git a/x11/gnome2-applets/patches/patch-af b/x11/gnome-applets/patches/patch-af
index 99aac463d0e..aa92ed7ba33 100644
--- a/x11/gnome2-applets/patches/patch-af
+++ b/x11/gnome-applets/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2007/04/17 17:59:07 drochner Exp $
+$NetBSD: patch-af,v 1.4 2007/09/20 00:00:03 wiz Exp $
 
 --- ./stickynotes/pixmaps/Makefile.in.orig	2007-04-17 18:13:05.000000000 +0200
 +++ ./stickynotes/pixmaps/Makefile.in
diff --git a/x11/gnome2-applets/patches/patch-ag b/x11/gnome-applets/patches/patch-ag
index 7383811cb3b..64aca64ce67 100644
--- a/x11/gnome2-applets/patches/patch-ag
+++ b/x11/gnome-applets/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2007/09/17 16:21:55 drochner Exp $
+$NetBSD: patch-ag,v 1.3 2007/09/20 00:00:03 wiz Exp $
 
 --- mixer/Makefile.in.orig	2007-09-17 17:52:12.000000000 +0200
 +++ mixer/Makefile.in