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

9 files changed, 11 insertions, 10 deletions

diff --git a/misc/Makefile b/misc/Makefile
index eac6f0fd861..4d45cb302cc 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.289 2007/09/16 17:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.290 2007/09/20 00:02:40 wiz Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -62,9 +62,9 @@ SUBDIR+=	gkrellm-moon
 SUBDIR+=	gkrellm-weather
 SUBDIR+=	gnome-dirs
 SUBDIR+=	gnome-user-docs
+SUBDIR+=	gnome-utils
 SUBDIR+=	gnome1-dirs
 SUBDIR+=	gnome2-dirs
-SUBDIR+=	gnome2-utils
 SUBDIR+=	gnuls
 SUBDIR+=	goffice
 SUBDIR+=	goffice0.2
diff --git a/misc/gnome2-utils/DESCR b/misc/gnome-utils/DESCR
index f45cd9fdb47..f45cd9fdb47 100644
--- a/misc/gnome2-utils/DESCR
+++ b/misc/gnome-utils/DESCR
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome-utils/Makefile
index 883c499235c..727715a5a9d 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2007/09/19 23:13:23 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2007/09/20 00:02:42 wiz Exp $
 #
 
 DISTNAME=		gnome-utils-2.18.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,6 +11,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of useful GNOME2 utilities and applications
 
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
diff --git a/misc/gnome2-utils/PLIST b/misc/gnome-utils/PLIST
index 66ddf374bd4..85defd655ae 100644
--- a/misc/gnome2-utils/PLIST
+++ b/misc/gnome-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/04/19 21:39:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/09/20 00:02:42 wiz Exp $
 bin/baobab
 bin/gnome-dictionary
 bin/gnome-panel-screenshot
diff --git a/misc/gnome2-utils/PLIST.Linux b/misc/gnome-utils/PLIST.Linux
index 4cae0a10679..b2ca51598ff 100644
--- a/misc/gnome2-utils/PLIST.Linux
+++ b/misc/gnome-utils/PLIST.Linux
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2006/01/08 20:31:59 rh Exp $
+@comment $NetBSD: PLIST.Linux,v 1.1 2007/09/20 00:02:43 wiz Exp $
 bin/gfloppy
 man/man1/gfloppy.1
 share/applications/gfloppy.desktop
diff --git a/misc/gnome2-utils/distinfo b/misc/gnome-utils/distinfo
index 3383cb69f0f..b88baf1bc08 100644
--- a/misc/gnome2-utils/distinfo
+++ b/misc/gnome-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2007/04/19 21:39:59 wiz Exp $
+$NetBSD: distinfo,v 1.12 2007/09/20 00:02:43 wiz Exp $
 
 SHA1 (gnome-utils-2.18.1.tar.bz2) = e7e9f82a40b41336c8c081e621f1ef5864c6ba36
 RMD160 (gnome-utils-2.18.1.tar.bz2) = a404f1318de35d5bc3bb00209afbc8311d9f0a02
diff --git a/misc/gnome2-utils/patches/patch-aa b/misc/gnome-utils/patches/patch-aa
index b9186b903e2..f089cd13b12 100644
--- a/misc/gnome2-utils/patches/patch-aa
+++ b/misc/gnome-utils/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2007/04/11 18:06:55 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2007/09/20 00:02:44 wiz Exp $
 
 --- gsearchtool/gsearchtool-support.c.orig	2007-03-10 14:19:56.000000000 +0100
 +++ gsearchtool/gsearchtool-support.c
diff --git a/misc/gnome2-utils/patches/patch-ab b/misc/gnome-utils/patches/patch-ab
index a38b3a0375f..e688768aa56 100644
--- a/misc/gnome2-utils/patches/patch-ab
+++ b/misc/gnome-utils/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2006/09/25 15:34:24 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2007/09/20 00:02:44 wiz Exp $
 
 --- baobab/src/baobab-utils.c.orig	2006-08-27 11:10:39.000000000 +0000
 +++ baobab/src/baobab-utils.c
diff --git a/misc/gnome2-utils/patches/patch-ac b/misc/gnome-utils/patches/patch-ac
index f07a9bd0c9e..3099b6dbea2 100644
--- a/misc/gnome2-utils/patches/patch-ac
+++ b/misc/gnome-utils/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2007/04/11 18:06:55 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2007/09/20 00:02:44 wiz Exp $
 
 --- gnome-screenshot/screenshot-save.c.orig	2007-03-10 14:19:50.000000000 +0100
 +++ gnome-screenshot/screenshot-save.c