summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-09-20 00:08:07 +0000
committerwiz <wiz@pkgsrc.org>2007-09-20 00:08:07 +0000
commita0587761ce960a1a821d0f505cf8275140f2ccd3 (patch)
tree0c72aa3c17f2a6823ebab030f1439cbd6068d856
parentf155c597af99a5d055d20f28016b2d3a58059374 (diff)
downloadpkgsrc-a0587761ce960a1a821d0f505cf8275140f2ccd3.tar.gz
Rename gnome2-system-monitor to gnome-system-monitor to match upstream.
ok jmmv, drochner
-rw-r--r--sysutils/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/DESCR (renamed from sysutils/gnome2-system-monitor/DESCR)0
-rw-r--r--sysutils/gnome-system-monitor/Makefile (renamed from sysutils/gnome2-system-monitor/Makefile)5
-rw-r--r--sysutils/gnome-system-monitor/PLIST (renamed from sysutils/gnome2-system-monitor/PLIST)2
-rw-r--r--sysutils/gnome-system-monitor/distinfo (renamed from sysutils/gnome2-system-monitor/distinfo)2
5 files changed, 7 insertions, 6 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index afac3c1d7fd..5a1a82861bd 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.409 2007/09/19 23:34:57 wiz Exp $
+# $NetBSD: Makefile,v 1.410 2007/09/20 00:08:07 wiz Exp $
#
COMMENT= System utilities
@@ -107,10 +107,10 @@ SUBDIR+= gkrellm-server
SUBDIR+= gkrellm-share
SUBDIR+= gnome-menus
SUBDIR+= gnome-pkgview
+SUBDIR+= gnome-system-monitor
SUBDIR+= gnome-vfs
SUBDIR+= gnome-vfs-monikers
SUBDIR+= gnome-vfsmm
-SUBDIR+= gnome2-system-monitor
SUBDIR+= gnometoaster
SUBDIR+= gpart
SUBDIR+= grub
diff --git a/sysutils/gnome2-system-monitor/DESCR b/sysutils/gnome-system-monitor/DESCR
index 9299956a4f4..9299956a4f4 100644
--- a/sysutils/gnome2-system-monitor/DESCR
+++ b/sysutils/gnome-system-monitor/DESCR
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 3eda4d2a5ab..4d63416cf25 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2007/09/20 00:08:09 wiz Exp $
#
DISTNAME= gnome-system-monitor-2.15.92
-PKGNAME= ${DISTNAME:S/gnome/gnome2/}
PKGREVISION= 4
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.15/}
@@ -18,6 +17,8 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config
+CONFLICTS+= gnome2-system-monitor-[0-9]*
+
LIBS+= -lutil
GCONF2_SCHEMAS+= gnome-system-monitor.schemas
diff --git a/sysutils/gnome2-system-monitor/PLIST b/sysutils/gnome-system-monitor/PLIST
index 9196f7b732a..18e0d04dfbc 100644
--- a/sysutils/gnome2-system-monitor/PLIST
+++ b/sysutils/gnome-system-monitor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/09/15 15:23:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.1 2007/09/20 00:08:10 wiz Exp $
bin/gnome-system-monitor
share/applications/gnome-system-monitor.desktop
share/gconf/schemas/gnome-system-monitor.schemas
diff --git a/sysutils/gnome2-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 55b4bcb8152..800ef9ce665 100644
--- a/sysutils/gnome2-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2006/09/15 15:23:12 jmmv Exp $
+$NetBSD: distinfo,v 1.1 2007/09/20 00:08:10 wiz Exp $
SHA1 (gnome-system-monitor-2.15.92.tar.bz2) = f158b43d4365b8605a4ee0f822dd4d977c6dfff9
RMD160 (gnome-system-monitor-2.15.92.tar.bz2) = c0bf2c5356a0626071663ad43cd2019a4f7c16af