Add CONFLICTS with the each others.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15873 df743ca5-7f9a-e211-a948-0013205c9059

23 files changed, 1301 insertions, 8 deletions

diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
new file mode 100644
index 000000000..f1cfdd941
--- /dev/null
+++ b/sysutils/gconf-editor/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	gconf-editor
+# Date created:				12 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/sysutils/gconf-editor/Makefile,v 1.55 2010/11/20 15:36:54 kwm Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.85 2010/09/27 18:22:59 kwm Exp $
+#
+
+PORTNAME=	gconf-editor
+PORTVERSION=	2.32.0
+PORTEPOCH=	1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A gconf database editor for the GNOME 2 environment
+
+CONFLICTS=	gconf-editor-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1=		gconf-editor.1
+GCONF_SCHEMAS=	gconf-editor.schemas
+
+.include <bsd.port.mk>
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
new file mode 100644
index 000000000..0ba563663
--- /dev/null
+++ b/sysutils/gconf-editor/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gconf-editor-2.32.0.tar.bz2) = c6d1d35ce5d136121ad76efe1c4033425bb2ad3800e711bd1bca9ce869c12a1f
+SIZE (gnome2/gconf-editor-2.32.0.tar.bz2) = 1397117
diff --git a/sysutils/gconf-editor/pkg-descr b/sysutils/gconf-editor/pkg-descr
new file mode 100644
index 000000000..0c8d23c9b
--- /dev/null
+++ b/sysutils/gconf-editor/pkg-descr
@@ -0,0 +1,2 @@
+gconf-editor is a GNOME 2 GConf database editor.  It is analogous to
+regedit on Windows.
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
new file mode 100644
index 000000000..9ae9658a2
--- /dev/null
+++ b/sysutils/gconf-editor/pkg-plist
@@ -0,0 +1,324 @@
+bin/gconf-editor
+share/applications/gconf-editor.desktop
+%%DATADIR%%/icons/hicolor/16x16/status/type-boolean.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-float.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-integer.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-list.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-pair.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-schema.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-string.png
+%%DATADIR%%/icons/hicolor/16x16/status/type-undefined.png
+share/gnome/help/gconf-editor/C/figures/entry-blank.png
+share/gnome/help/gconf-editor/C/figures/entry-bool.png
+share/gnome/help/gconf-editor/C/figures/entry-list.png
+share/gnome/help/gconf-editor/C/figures/entry-number.png
+share/gnome/help/gconf-editor/C/figures/entry-schema.png
+share/gnome/help/gconf-editor/C/figures/entry-string.png
+share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/C/gconf-editor.xml
+share/gnome/help/gconf-editor/C/legal.xml
+share/gnome/help/gconf-editor/ca/figures/entry-blank.png
+share/gnome/help/gconf-editor/ca/figures/entry-bool.png
+share/gnome/help/gconf-editor/ca/figures/entry-list.png
+share/gnome/help/gconf-editor/ca/figures/entry-number.png
+share/gnome/help/gconf-editor/ca/figures/entry-schema.png
+share/gnome/help/gconf-editor/ca/figures/entry-string.png
+share/gnome/help/gconf-editor/ca/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/ca/gconf-editor.xml
+share/gnome/help/gconf-editor/cs/figures/entry-blank.png
+share/gnome/help/gconf-editor/cs/figures/entry-bool.png
+share/gnome/help/gconf-editor/cs/figures/entry-list.png
+share/gnome/help/gconf-editor/cs/figures/entry-number.png
+share/gnome/help/gconf-editor/cs/figures/entry-schema.png
+share/gnome/help/gconf-editor/cs/figures/entry-string.png
+share/gnome/help/gconf-editor/cs/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/cs/gconf-editor.xml
+share/gnome/help/gconf-editor/de/figures/entry-blank.png
+share/gnome/help/gconf-editor/de/figures/entry-bool.png
+share/gnome/help/gconf-editor/de/figures/entry-list.png
+share/gnome/help/gconf-editor/de/figures/entry-number.png
+share/gnome/help/gconf-editor/de/figures/entry-schema.png
+share/gnome/help/gconf-editor/de/figures/entry-string.png
+share/gnome/help/gconf-editor/de/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/de/gconf-editor.xml
+share/gnome/help/gconf-editor/el/figures/entry-blank.png
+share/gnome/help/gconf-editor/el/figures/entry-bool.png
+share/gnome/help/gconf-editor/el/figures/entry-list.png
+share/gnome/help/gconf-editor/el/figures/entry-number.png
+share/gnome/help/gconf-editor/el/figures/entry-schema.png
+share/gnome/help/gconf-editor/el/figures/entry-string.png
+share/gnome/help/gconf-editor/el/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/el/gconf-editor.xml
+share/gnome/help/gconf-editor/en_GB/figures/entry-blank.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-bool.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-list.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-number.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-schema.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-string.png
+share/gnome/help/gconf-editor/en_GB/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/en_GB/gconf-editor.xml
+share/gnome/help/gconf-editor/es/figures/entry-blank.png
+share/gnome/help/gconf-editor/es/figures/entry-bool.png
+share/gnome/help/gconf-editor/es/figures/entry-list.png
+share/gnome/help/gconf-editor/es/figures/entry-number.png
+share/gnome/help/gconf-editor/es/figures/entry-schema.png
+share/gnome/help/gconf-editor/es/figures/entry-string.png
+share/gnome/help/gconf-editor/es/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/es/gconf-editor.xml
+share/gnome/help/gconf-editor/fr/figures/entry-blank.png
+share/gnome/help/gconf-editor/fr/figures/entry-bool.png
+share/gnome/help/gconf-editor/fr/figures/entry-list.png
+share/gnome/help/gconf-editor/fr/figures/entry-number.png
+share/gnome/help/gconf-editor/fr/figures/entry-schema.png
+share/gnome/help/gconf-editor/fr/figures/entry-string.png
+share/gnome/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/fr/gconf-editor.xml
+share/gnome/help/gconf-editor/it/figures/entry-blank.png
+share/gnome/help/gconf-editor/it/figures/entry-bool.png
+share/gnome/help/gconf-editor/it/figures/entry-list.png
+share/gnome/help/gconf-editor/it/figures/entry-number.png
+share/gnome/help/gconf-editor/it/figures/entry-schema.png
+share/gnome/help/gconf-editor/it/figures/entry-string.png
+share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/it/gconf-editor.xml
+share/gnome/help/gconf-editor/oc/figures/entry-blank.png
+share/gnome/help/gconf-editor/oc/figures/entry-bool.png
+share/gnome/help/gconf-editor/oc/figures/entry-list.png
+share/gnome/help/gconf-editor/oc/figures/entry-number.png
+share/gnome/help/gconf-editor/oc/figures/entry-schema.png
+share/gnome/help/gconf-editor/oc/figures/entry-string.png
+share/gnome/help/gconf-editor/oc/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/oc/gconf-editor.xml
+share/gnome/help/gconf-editor/pt_BR/figures/entry-blank.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-bool.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-list.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-number.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-schema.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-string.png
+share/gnome/help/gconf-editor/pt_BR/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/pt_BR/gconf-editor.xml
+share/gnome/help/gconf-editor/ru/figures/entry-blank.png
+share/gnome/help/gconf-editor/ru/figures/entry-bool.png
+share/gnome/help/gconf-editor/ru/figures/entry-list.png
+share/gnome/help/gconf-editor/ru/figures/entry-number.png
+share/gnome/help/gconf-editor/ru/figures/entry-schema.png
+share/gnome/help/gconf-editor/ru/figures/entry-string.png
+share/gnome/help/gconf-editor/ru/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/ru/gconf-editor.xml
+share/gnome/help/gconf-editor/sv/figures/entry-blank.png
+share/gnome/help/gconf-editor/sv/figures/entry-bool.png
+share/gnome/help/gconf-editor/sv/figures/entry-list.png
+share/gnome/help/gconf-editor/sv/figures/entry-number.png
+share/gnome/help/gconf-editor/sv/figures/entry-schema.png
+share/gnome/help/gconf-editor/sv/figures/entry-string.png
+share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/sv/gconf-editor.xml
+share/gnome/help/gconf-editor/th/figures/entry-blank.png
+share/gnome/help/gconf-editor/th/figures/entry-bool.png
+share/gnome/help/gconf-editor/th/figures/entry-list.png
+share/gnome/help/gconf-editor/th/figures/entry-number.png
+share/gnome/help/gconf-editor/th/figures/entry-schema.png
+share/gnome/help/gconf-editor/th/figures/entry-string.png
+share/gnome/help/gconf-editor/th/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/th/gconf-editor.xml
+share/gnome/help/gconf-editor/uk/figures/entry-blank.png
+share/gnome/help/gconf-editor/uk/figures/entry-bool.png
+share/gnome/help/gconf-editor/uk/figures/entry-list.png
+share/gnome/help/gconf-editor/uk/figures/entry-number.png
+share/gnome/help/gconf-editor/uk/figures/entry-schema.png
+share/gnome/help/gconf-editor/uk/figures/entry-string.png
+share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/uk/gconf-editor.xml
+share/gnome/help/gconf-editor/zh_CN/figures/entry-blank.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-bool.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-list.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-number.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-schema.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-string.png
+share/gnome/help/gconf-editor/zh_CN/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/zh_CN/gconf-editor.xml
+share/icons/hicolor/48x48/apps/gconf-editor.png
+share/locale/am/LC_MESSAGES/gconf-editor.mo
+share/locale/ar/LC_MESSAGES/gconf-editor.mo
+share/locale/as/LC_MESSAGES/gconf-editor.mo
+share/locale/ast/LC_MESSAGES/gconf-editor.mo
+share/locale/az/LC_MESSAGES/gconf-editor.mo
+share/locale/be/LC_MESSAGES/gconf-editor.mo
+share/locale/be@latin/LC_MESSAGES/gconf-editor.mo
+share/locale/bg/LC_MESSAGES/gconf-editor.mo
+share/locale/bn/LC_MESSAGES/gconf-editor.mo
+share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
+share/locale/br/LC_MESSAGES/gconf-editor.mo
+share/locale/bs/LC_MESSAGES/gconf-editor.mo
+share/locale/ca/LC_MESSAGES/gconf-editor.mo
+share/locale/ca@valencia/LC_MESSAGES/gconf-editor.mo
+share/locale/cs/LC_MESSAGES/gconf-editor.mo
+share/locale/cy/LC_MESSAGES/gconf-editor.mo
+share/locale/da/LC_MESSAGES/gconf-editor.mo
+share/locale/de/LC_MESSAGES/gconf-editor.mo
+share/locale/dz/LC_MESSAGES/gconf-editor.mo
+share/locale/el/LC_MESSAGES/gconf-editor.mo
+share/locale/en@shaw/LC_MESSAGES/gconf-editor.mo
+share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
+share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
+share/locale/es/LC_MESSAGES/gconf-editor.mo
+share/locale/et/LC_MESSAGES/gconf-editor.mo
+share/locale/eu/LC_MESSAGES/gconf-editor.mo
+share/locale/fa/LC_MESSAGES/gconf-editor.mo
+share/locale/fi/LC_MESSAGES/gconf-editor.mo
+share/locale/fr/LC_MESSAGES/gconf-editor.mo
+share/locale/ga/LC_MESSAGES/gconf-editor.mo
+share/locale/gl/LC_MESSAGES/gconf-editor.mo
+share/locale/gu/LC_MESSAGES/gconf-editor.mo
+share/locale/he/LC_MESSAGES/gconf-editor.mo
+share/locale/hi/LC_MESSAGES/gconf-editor.mo
+share/locale/hr/LC_MESSAGES/gconf-editor.mo
+share/locale/hu/LC_MESSAGES/gconf-editor.mo
+share/locale/id/LC_MESSAGES/gconf-editor.mo
+share/locale/it/LC_MESSAGES/gconf-editor.mo
+share/locale/ja/LC_MESSAGES/gconf-editor.mo
+share/locale/ka/LC_MESSAGES/gconf-editor.mo
+share/locale/kk/LC_MESSAGES/gconf-editor.mo
+share/locale/kn/LC_MESSAGES/gconf-editor.mo
+share/locale/ko/LC_MESSAGES/gconf-editor.mo
+share/locale/ku/LC_MESSAGES/gconf-editor.mo
+share/locale/li/LC_MESSAGES/gconf-editor.mo
+share/locale/lt/LC_MESSAGES/gconf-editor.mo
+share/locale/lv/LC_MESSAGES/gconf-editor.mo
+share/locale/mai/LC_MESSAGES/gconf-editor.mo
+share/locale/mg/LC_MESSAGES/gconf-editor.mo
+share/locale/mk/LC_MESSAGES/gconf-editor.mo
+share/locale/ml/LC_MESSAGES/gconf-editor.mo
+share/locale/mn/LC_MESSAGES/gconf-editor.mo
+share/locale/mr/LC_MESSAGES/gconf-editor.mo
+share/locale/ms/LC_MESSAGES/gconf-editor.mo
+share/locale/nb/LC_MESSAGES/gconf-editor.mo
+share/locale/ne/LC_MESSAGES/gconf-editor.mo
+share/locale/nl/LC_MESSAGES/gconf-editor.mo
+share/locale/nn/LC_MESSAGES/gconf-editor.mo
+share/locale/oc/LC_MESSAGES/gconf-editor.mo
+share/locale/or/LC_MESSAGES/gconf-editor.mo
+share/locale/pa/LC_MESSAGES/gconf-editor.mo
+share/locale/pl/LC_MESSAGES/gconf-editor.mo
+share/locale/ps/LC_MESSAGES/gconf-editor.mo
+share/locale/pt/LC_MESSAGES/gconf-editor.mo
+share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo
+share/locale/ro/LC_MESSAGES/gconf-editor.mo
+share/locale/ru/LC_MESSAGES/gconf-editor.mo
+share/locale/rw/LC_MESSAGES/gconf-editor.mo
+share/locale/si/LC_MESSAGES/gconf-editor.mo
+share/locale/sk/LC_MESSAGES/gconf-editor.mo
+share/locale/sl/LC_MESSAGES/gconf-editor.mo
+share/locale/sq/LC_MESSAGES/gconf-editor.mo
+share/locale/sr/LC_MESSAGES/gconf-editor.mo
+share/locale/sr@latin/LC_MESSAGES/gconf-editor.mo
+share/locale/sv/LC_MESSAGES/gconf-editor.mo
+share/locale/ta/LC_MESSAGES/gconf-editor.mo
+share/locale/te/LC_MESSAGES/gconf-editor.mo
+share/locale/th/LC_MESSAGES/gconf-editor.mo
+share/locale/tr/LC_MESSAGES/gconf-editor.mo
+share/locale/ug/LC_MESSAGES/gconf-editor.mo
+share/locale/uk/LC_MESSAGES/gconf-editor.mo
+share/locale/vi/LC_MESSAGES/gconf-editor.mo
+share/locale/xh/LC_MESSAGES/gconf-editor.mo
+share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
+share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
+share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
+share/omf/gconf-editor/gconf-editor-C.omf
+share/omf/gconf-editor/gconf-editor-ca.omf
+share/omf/gconf-editor/gconf-editor-cs.omf
+share/omf/gconf-editor/gconf-editor-de.omf
+share/omf/gconf-editor/gconf-editor-el.omf
+share/omf/gconf-editor/gconf-editor-en_GB.omf
+share/omf/gconf-editor/gconf-editor-es.omf
+share/omf/gconf-editor/gconf-editor-fr.omf
+share/omf/gconf-editor/gconf-editor-it.omf
+share/omf/gconf-editor/gconf-editor-oc.omf
+share/omf/gconf-editor/gconf-editor-pt_BR.omf
+share/omf/gconf-editor/gconf-editor-ru.omf
+share/omf/gconf-editor/gconf-editor-sv.omf
+share/omf/gconf-editor/gconf-editor-th.omf
+share/omf/gconf-editor/gconf-editor-uk.omf
+share/omf/gconf-editor/gconf-editor-zh_CN.omf
+@dirrm share/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/zh_CN/figures
+@dirrm share/gnome/help/gconf-editor/zh_CN
+@dirrm share/gnome/help/gconf-editor/uk/figures
+@dirrm share/gnome/help/gconf-editor/uk
+@dirrm share/gnome/help/gconf-editor/th/figures
+@dirrm share/gnome/help/gconf-editor/th
+@dirrm share/gnome/help/gconf-editor/sv/figures
+@dirrm share/gnome/help/gconf-editor/sv
+@dirrm share/gnome/help/gconf-editor/ru/figures
+@dirrm share/gnome/help/gconf-editor/ru
+@dirrm share/gnome/help/gconf-editor/pt_BR/figures
+@dirrm share/gnome/help/gconf-editor/pt_BR
+@dirrm share/gnome/help/gconf-editor/oc/figures
+@dirrm share/gnome/help/gconf-editor/oc
+@dirrm share/gnome/help/gconf-editor/it/figures
+@dirrm share/gnome/help/gconf-editor/it
+@dirrm share/gnome/help/gconf-editor/fr/figures
+@dirrm share/gnome/help/gconf-editor/fr
+@dirrm share/gnome/help/gconf-editor/es/figures
+@dirrm share/gnome/help/gconf-editor/es
+@dirrm share/gnome/help/gconf-editor/en_GB/figures
+@dirrm share/gnome/help/gconf-editor/en_GB
+@dirrm share/gnome/help/gconf-editor/el/figures
+@dirrm share/gnome/help/gconf-editor/el
+@dirrm share/gnome/help/gconf-editor/de/figures
+@dirrm share/gnome/help/gconf-editor/de
+@dirrm share/gnome/help/gconf-editor/cs/figures
+@dirrm share/gnome/help/gconf-editor/cs
+@dirrm share/gnome/help/gconf-editor/ca/figures
+@dirrm share/gnome/help/gconf-editor/ca
+@dirrm share/gnome/help/gconf-editor/C/figures
+@dirrm share/gnome/help/gconf-editor/C
+@dirrm share/gnome/help/gconf-editor
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/sysutils/gconf-editor3/Makefile b/sysutils/gconf-editor3/Makefile
index 7944cf43f..96417c294 100644
--- a/sysutils/gconf-editor3/Makefile
+++ b/sysutils/gconf-editor3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor3/Makefile,v 1.1 2011/03/09 22:08:04 kwm Exp $
+#   $MCom: ports/sysutils/gconf-editor3/Makefile,v 1.2 2011/04/05 14:19:17 kwm Exp $
 #
 
 PORTNAME=	gconf-editor
@@ -15,6 +15,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A gconf database editor for the GNOME 3 environment
 
+CONFLICTS=	gconf-editor-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
new file mode 100644
index 000000000..c7350bef4
--- /dev/null
+++ b/sysutils/gnome-control-center/Makefile
@@ -0,0 +1,72 @@
+# New ports collection makefile for:	gnomecontrolcenter2
+# Date created:				04 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/sysutils/gnome-control-center/Makefile,v 1.120 2010/11/20 15:36:54 kwm Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.214 2010/11/18 11:46:09 kwm Exp $
+#
+
+PORTNAME=	gnome-control-center
+PORTVERSION=	2.32.1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Control center for GNOME 2 project
+
+LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
+		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
+RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
+
+CONFLICTS=	gnome-control-center-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+GNOME_DESKTOP_VERSION=2
+USE_GSTREAMER=	good
+WANT_GNOME=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack metacity gnomemenus \
+		desktopfileutils libgnomekbd gnomedesktop librsvg2 gconf2
+USE_XORG=	xscrnsaver
+GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	control-center.schemas fontilus.schemas \
+		gnome-control-center.schemas
+
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+=	evolutiondataserver
+CONFIGURE_ARGS+=--enable-aboutme
+PLIST_SUB+=	ABOUTME=""
+.else
+CONFIGURE_ARGS+=--disable-aboutme
+PLIST_SUB+=	ABOUTME="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    	${WRKSRC}/capplets/common/gnome-theme-info.c
+	@${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
+		${WRKSRC}/capplets/display/org.gnome.randr.policy.in
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
new file mode 100644
index 000000000..2173acb5c
--- /dev/null
+++ b/sysutils/gnome-control-center/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gnome-control-center-2.32.1.tar.bz2) = 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
+SIZE (gnome2/gnome-control-center-2.32.1.tar.bz2) = 2280217
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
new file mode 100644
index 000000000..69c01de97
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -0,0 +1,15 @@
+--- capplets/about-me/gnome-about-me-password.c.orig	Sun Jun 11 04:50:31 2006
++++ capplets/about-me/gnome-about-me-password.c	Tue Jun 13 00:02:27 2006
+@@ -52,6 +52,12 @@
+ #include <signal.h>
+ #endif
+ 
++#if __FreeBSD__
++#include <sys/types.h>
++#include <libutil.h>
++#include <signal.h>
++#endif
++
+ #include "capplet-util.h"
+ #include "eel-alert-dialog.h"
+ 
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
new file mode 100644
index 000000000..c9b378544
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -0,0 +1,11 @@
+--- capplets/common/gnome-theme-info.c.orig	2009-05-03 20:30:56.000000000 +0200
++++ capplets/common/gnome-theme-info.c	2009-07-19 12:54:25.000000000 +0200
+@@ -1876,7 +1876,7 @@ gnome_theme_init ()
+ #ifdef XCURSOR_ICONDIR
+   /* if there's a separate xcursors dir, add that as well */
+   if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
+-      strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
++      strcmp (XCURSOR_ICONDIR, "%%LOCALBASE%%/lib/X11/icons")) {
+     top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR);
+     add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);
+     g_object_unref (top_theme_dir);
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
new file mode 100644
index 000000000..fba462829
--- /dev/null
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -0,0 +1,3 @@
+Configuration tools tightly integrated within the GNOME 2 desktop.
+
+WWW: http://www.gnome.org
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
new file mode 100644
index 000000000..65d4d00b5
--- /dev/null
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -0,0 +1,378 @@
+%%ABOUTME%%bin/gnome-about-me
+bin/gnome-appearance-properties
+bin/gnome-at-mobility
+bin/gnome-at-properties
+bin/gnome-at-visual
+bin/gnome-control-center
+bin/gnome-default-applications-properties
+bin/gnome-display-properties
+bin/gnome-font-viewer
+bin/gnome-keybinding-properties
+bin/gnome-keyboard-properties
+bin/gnome-mouse-properties
+bin/gnome-network-properties
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
+bin/gnome-window-properties
+etc/xdg/autostart/gnome-at-session.desktop
+etc/xdg/menus/gnomecc.menu
+include/gnome-window-settings-2.0/gnome-window-manager.h
+include/gnome-window-settings-2.0/gnome-wm-manager.h
+lib/libgnome-window-settings.a
+lib/libgnome-window-settings.la
+lib/libgnome-window-settings.so
+lib/libgnome-window-settings.so.1
+lib/window-manager-settings/libmetacity.a
+lib/window-manager-settings/libmetacity.la
+lib/window-manager-settings/libmetacity.so
+libdata/pkgconfig/gnome-default-applications.pc
+libdata/pkgconfig/gnome-keybindings.pc
+libdata/pkgconfig/gnome-window-settings-2.0.pc
+sbin/gnome-display-properties-install-systemwide
+%%ABOUTME%%share/applications/gnome-about-me.desktop
+share/applications/at-properties.desktop
+share/applications/default-applications.desktop
+share/applications/display-properties.desktop
+share/applications/gnome-appearance-properties.desktop
+share/applications/gnome-font-viewer.desktop
+share/applications/gnome-network-properties.desktop
+share/applications/gnome-settings-mouse.desktop
+share/applications/gnome-theme-installer.desktop
+share/applications/gnomecc.desktop
+share/applications/keybinding.desktop
+share/applications/keyboard.desktop
+share/applications/window-properties.desktop
+share/desktop-directories/gnomecc.directory
+%%DATADIR%%/default-apps/gnome-default-applications.xml
+%%DATADIR%%/keybindings/00-multimedia-key.xml
+%%DATADIR%%/keybindings/01-desktop-key.xml
+%%DATADIR%%/pixmaps/at-startup.png
+%%DATADIR%%/pixmaps/at-support.png
+%%DATADIR%%/pixmaps/bar-disabled.png
+%%DATADIR%%/pixmaps/bar-green.png
+%%DATADIR%%/pixmaps/bar-red.png
+%%DATADIR%%/pixmaps/bar.png
+%%DATADIR%%/pixmaps/double-click-maybe.png
+%%DATADIR%%/pixmaps/double-click-off.png
+%%DATADIR%%/pixmaps/double-click-on.png
+%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-little-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-little-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-middle-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-middle-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-ring-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-ring-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-thumb.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/left-thumb.svg
+%%DATADIR%%/pixmaps/mouse-cursor-normal-large.png
+%%DATADIR%%/pixmaps/mouse-cursor-normal.png
+%%DATADIR%%/pixmaps/mouse-cursor-white-large.png
+%%DATADIR%%/pixmaps/mouse-cursor-white.png
+%%DATADIR%%/pixmaps/ocean-stripes.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/print_error.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/print_error.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/print_ok.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/print_ok.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-index-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-index-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-little-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-little-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-middle-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-middle-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-ring-finger.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-ring-finger.svg
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-thumb.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/right-thumb.svg
+%%DATADIR%%/pixmaps/subpixel-bgr.png
+%%DATADIR%%/pixmaps/subpixel-rgb.png
+%%DATADIR%%/pixmaps/subpixel-vbgr.png
+%%DATADIR%%/pixmaps/subpixel-vrgb.png
+%%DATADIR%%/pixmaps/theme-thumbnailing.png
+%%DATADIR%%/pixmaps/window-theme-thumbnailing.png
+%%DATADIR%%/ui/appearance.ui
+%%DATADIR%%/ui/at-enable-dialog.ui
+%%DATADIR%%/ui/display-capplet.ui
+%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-dialog.ui
+%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-fingerprint.ui
+%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-password.ui
+%%DATADIR%%/ui/gnome-default-applications-properties.ui
+%%DATADIR%%/ui/gnome-keybinding-properties.ui
+%%DATADIR%%/ui/gnome-keyboard-properties-a11y-notifications.ui
+%%DATADIR%%/ui/gnome-keyboard-properties-dialog.ui
+%%DATADIR%%/ui/gnome-keyboard-properties-layout-chooser.ui
+%%DATADIR%%/ui/gnome-keyboard-properties-model-chooser.ui
+%%DATADIR%%/ui/gnome-keyboard-properties-options-dialog.ui
+%%DATADIR%%/ui/gnome-mouse-properties.ui
+%%DATADIR%%/ui/gnome-network-properties.ui
+%%DATADIR%%/ui/gnome-window-properties.ui
+share/gnome/cursor-fonts/cursor-large-white.pcf
+share/gnome/cursor-fonts/cursor-large.pcf
+share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/help/control-center/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center/C/config-background.xml
+share/gnome/help/control-center/C/config-behavior.xml
+share/gnome/help/control-center/C/config-cds.xml
+share/gnome/help/control-center/C/config-default-apps.xml
+share/gnome/help/control-center/C/config-file-type.xml
+share/gnome/help/control-center/C/config-hints.xml
+share/gnome/help/control-center/C/config-html.xml
+share/gnome/help/control-center/C/config-kbd.xml
+share/gnome/help/control-center/C/config-keybindings.xml
+share/gnome/help/control-center/C/config-mouse.xml
+share/gnome/help/control-center/C/config-screensaver.xml
+share/gnome/help/control-center/C/config-themes.xml
+share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/ca/control-center.xml
+share/gnome/help/control-center/ca@valencia/control-center.xml
+share/gnome/help/control-center/cs/control-center.xml
+share/gnome/help/control-center/de/control-center.xml
+share/gnome/help/control-center/el/control-center.xml
+share/gnome/help/control-center/en_GB/control-center.xml
+share/gnome/help/control-center/es/control-center.xml
+share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/id/control-center.xml
+share/gnome/help/control-center/it/control-center.xml
+share/gnome/help/control-center/ja/control-center.xml
+share/gnome/help/control-center/oc/control-center.xml
+share/gnome/help/control-center/pa/control-center.xml
+share/gnome/help/control-center/pl/control-center.xml
+share/gnome/help/control-center/pt/control-center.xml
+share/gnome/help/control-center/pt_BR/control-center.xml
+share/gnome/help/control-center/ru/control-center.xml
+share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/th/control-center.xml
+share/gnome/help/control-center/uk/control-center.xml
+share/gnome/help/control-center/vi/control-center.xml
+share/gnome/help/control-center/zh_CN/control-center.xml
+share/icons/hicolor/16x16/apps/gnome-network-properties.png
+share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
+share/icons/hicolor/16x16/apps/preferences-desktop-display.png
+share/icons/hicolor/22x22/apps/gnome-network-properties.png
+share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
+share/icons/hicolor/22x22/apps/preferences-desktop-display.png
+share/icons/hicolor/24x24/apps/gnome-network-properties.png
+share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
+share/icons/hicolor/24x24/apps/preferences-desktop-display.png
+share/icons/hicolor/32x32/apps/gnome-network-properties.png
+share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
+share/icons/hicolor/32x32/apps/preferences-desktop-display.png
+share/icons/hicolor/48x48/apps/gnome-network-properties.png
+share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
+share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/gnome-network-properties.svg
+share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
+share/icons/hicolor/scalable/apps/typing-monitor.svg
+share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/mime/application/x-gnome-theme-package.xml
+share/mime/packages/gnome-theme-package.xml
+share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-ca.omf
+share/omf/control-center/control-center-ca@valencia.omf
+share/omf/control-center/control-center-cs.omf
+share/omf/control-center/control-center-de.omf
+share/omf/control-center/control-center-el.omf
+share/omf/control-center/control-center-en_GB.omf
+share/omf/control-center/control-center-es.omf
+share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-id.omf
+share/omf/control-center/control-center-it.omf
+share/omf/control-center/control-center-ja.omf
+share/omf/control-center/control-center-oc.omf
+share/omf/control-center/control-center-pa.omf
+share/omf/control-center/control-center-pl.omf
+share/omf/control-center/control-center-pt.omf
+share/omf/control-center/control-center-pt_BR.omf
+share/omf/control-center/control-center-ru.omf
+share/omf/control-center/control-center-sv.omf
+share/omf/control-center/control-center-th.omf
+share/omf/control-center/control-center-uk.omf
+share/omf/control-center/control-center-vi.omf
+share/omf/control-center/control-center-zh_CN.omf
+share/polkit-1/actions/org.gnome.randr.policy
+@dirrm share/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/vi
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/th
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pt_BR
+@dirrm share/gnome/help/control-center/pt
+@dirrm share/gnome/help/control-center/pl
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/oc
+@dirrm share/gnome/help/control-center/ja
+@dirrm share/gnome/help/control-center/it
+@dirrm share/gnome/help/control-center/id
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/el
+@dirrm share/gnome/help/control-center/de
+@dirrm share/gnome/help/control-center/cs
+@dirrm share/gnome/help/control-center/ca@valencia
+@dirrm share/gnome/help/control-center/ca
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/cursor-fonts
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/default-apps
+@dirrmtry share/desktop-directories
+@dirrmtry share/applications
+@dirrm lib/window-manager-settings
+@dirrm include/gnome-window-settings-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@comment not sure about this ..
+@unexec rm -f %D/share/applications/mimeinfo.cache > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index 5f310098f..a4979a4ae 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.19 2011/04/10 19:41:37 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.20 2011/04/10 21:55:36 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
@@ -28,7 +28,7 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		glxinfo:${PORTSDIR}/graphics/mesa-demos
 
-CONFLICTS=	gnome-media-2.[0-9]*
+CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 1751a0304..2ba49bcee 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD: ports/sysutils/gnome-power-manager/Makefile,v 1.35 2010/12/04 07:33:35 ade Exp $
-#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.69 2010/09/27 18:49:22 kwm Exp $
+#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.71 2011/03/07 11:52:41 kwm Exp $
 #
 
 PORTNAME=	gnome-power-manager
@@ -23,6 +23,8 @@ LIB_DEPENDS=	upower-glib.1:${PORTSDIR}/sysutils/upower \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit
 
+CONFLICTS=	gnome-power-manager-3.[0-9]*
+
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile
index da2b214ae..1fc9eba04 100644
--- a/sysutils/gnome-power-manager3/Makefile
+++ b/sysutils/gnome-power-manager3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-power-manager3/Makefile,v 1.8 2011/04/10 19:41:37 mezz Exp $
+#   $MCom: ports/sysutils/gnome-power-manager3/Makefile,v 1.9 2011/04/15 11:25:12 kwm Exp $
 #
 
 PORTNAME=	gnome-power-manager
@@ -23,6 +23,8 @@ LIB_DEPENDS=	upower-glib.1:${PORTSDIR}/sysutils/upower \
 		execinfo:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit
 
+CONFLICTS=	gnome-power-manager-2.[0-9]*
+
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index b1c93bb96..b4379a4df 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.72 2010/11/15 13:50:07 kwm Exp $
+#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.74 2011/03/06 18:50:43 kwm Exp $
 #
 
 PORTNAME=	gnome-settings-daemon
@@ -21,6 +21,8 @@ LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 		nss3.1:${PORTSDIR}/security/nss
 RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
+CONFLICTS=	gnome-settings-daemon-3.[0-9]*
+
 USE_XORG=	xxf86misc
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile
index 27ce181c1..ebc299fa3 100644
--- a/sysutils/gnome-settings-daemon3/Makefile
+++ b/sysutils/gnome-settings-daemon3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.20 2011/04/07 07:30:24 kwm Exp $
+#   $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.21 2011/04/17 07:11:56 kwm Exp $
 #
 
 PORTNAME=	gnome-settings-daemon
@@ -24,6 +24,8 @@ LIB_DEPENDS=	canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
 RUN_DEPENDS=	gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
+CONFLICTS=	gnome-settings-daemon-2.[0-9]*
+
 LATEST_LINK=	gnome-settings-daemon3
 USE_XORG=	xxf86misc
 USE_BZIP2=	yes
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
new file mode 100644
index 000000000..ca78d90af
--- /dev/null
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	gnomesystemmonitor
+# Date created:				09 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/sysutils/gnome-system-monitor/Makefile,v 1.100 2010/11/20 15:36:55 kwm Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.141 2010/09/29 13:44:33 kwm Exp $
+#
+
+PORTNAME=	gnome-system-monitor
+PORTVERSION=	2.28.2
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME 2 system monitor program
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+
+CONFLICTS=	gnome-system-monitor-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
+		librsvg2
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lutil"
+
+GCONF_SCHEMAS=	gnome-system-monitor.schemas
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
new file mode 100644
index 000000000..8658314ed
--- /dev/null
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59
+SIZE (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = 2432252
diff --git a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
new file mode 100644
index 000000000..9b934be3d
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
@@ -0,0 +1,11 @@
+--- src/load-graph.cpp.orig	2008-01-14 23:43:43.000000000 -0600
++++ src/load-graph.cpp	2008-01-14 23:44:15.000000000 -0600
+@@ -412,7 +412,7 @@
+ 	  // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
+ 	  //      where base10 = 1, coef10 = 101, pow2 = 16
+ 
+-	  unsigned pow2 = std::floor(log2(new_max));
++	  unsigned pow2 = std::floor(log(new_max) / log(2));
+ 	  unsigned base10 = pow2 / 10;
+ 	  unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10)));
+ 	  g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp
new file mode 100644
index 000000000..c00526174
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp
@@ -0,0 +1,14 @@
+--- src/openfiles.cpp.orig	2008-05-27 16:16:46.000000000 -0400
++++ src/openfiles.cpp	2008-05-27 16:19:53.000000000 -0400
+@@ -66,7 +66,11 @@ friendlier_hostname(const char *addr_str
+ 		goto failsafe;
+ 
+ 	if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,
++#ifdef NI_IDN
+ 			sizeof hostname, service, sizeof service, NI_IDN))
++#else
++	    		sizeof hostname, service, sizeof service, 0))
++#endif
+ 		goto failsafe;
+ 
+ 	if (res) freeaddrinfo(res);
diff --git a/sysutils/gnome-system-monitor/pkg-descr b/sysutils/gnome-system-monitor/pkg-descr
new file mode 100644
index 000000000..40caee647
--- /dev/null
+++ b/sysutils/gnome-system-monitor/pkg-descr
@@ -0,0 +1 @@
+GNOME 2.0 system monitor program.
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
new file mode 100644
index 000000000..3cde25601
--- /dev/null
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -0,0 +1,373 @@
+bin/gnome-system-monitor
+share/applications/gnome-system-monitor.desktop
+share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/C/figures/processListing.png
+share/gnome/help/gnome-system-monitor/C/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/help/gnome-system-monitor/ar/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/ar/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/ar/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/ar/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/ar/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/ar/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/ar/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/ar/figures/processListing.png
+share/gnome/help/gnome-system-monitor/ar/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/ar/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/ar/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/ar/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/ar/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/ar/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/ca/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/ca/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/ca/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/ca/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/ca/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/ca/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/ca/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/ca/figures/processListing.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/ca/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/ca/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/ca/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/ca/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/cs/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/cs/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/cs/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/cs/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/cs/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/cs/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/cs/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/cs/figures/processListing.png
+share/gnome/help/gnome-system-monitor/cs/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/cs/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/cs/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/cs/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/cs/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/cs/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/da/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/da/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/da/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/da/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/da/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/da/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/da/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/da/figures/processListing.png
+share/gnome/help/gnome-system-monitor/da/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/da/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/da/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/da/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/da/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/da/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/de/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/de/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/de/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/de/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/de/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/de/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/de/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/de/figures/processListing.png
+share/gnome/help/gnome-system-monitor/de/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/de/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/de/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/de/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/de/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/de/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/el/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/el/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/el/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/el/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/el/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/el/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/el/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/el/figures/processListing.png
+share/gnome/help/gnome-system-monitor/el/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/el/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/el/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/el/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/el/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/el/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/es/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/es/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/es/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/es/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/es/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/es/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/es/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/es/figures/processListing.png
+share/gnome/help/gnome-system-monitor/es/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/es/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/es/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/es/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/es/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/es/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/fr/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/fr/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/fr/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/fr/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/fr/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/fr/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/fr/figures/processListing.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/oc/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/oc/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/oc/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/oc/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/oc/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/oc/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/oc/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/oc/figures/processListing.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/oc/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/oc/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/oc/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/oc/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/pa/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/pa/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/pa/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/pa/figures/processListing.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/pa/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/pa/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/pa/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/sv/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/sv/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/sv/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/sv/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/sv/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/sv/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/sv/figures/processListing.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/zh_CN/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/processListing.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/zh_CN/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/zh_CN/gnome-system-monitor.xml
+share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/as/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ast/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/be@latin/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eo/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/gu/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/kn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mai/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nds/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/oc/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/or/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ps/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/rw/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/si/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/te/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
+share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-ar.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-cs.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-da.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-de.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-el.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-zh_CN.omf
+share/pixmaps/gnome-system-monitor/download.svg
+share/pixmaps/gnome-system-monitor/side.png
+share/pixmaps/gnome-system-monitor/upload.svg
+@dirrm share/pixmaps/gnome-system-monitor
+@dirrm share/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/zh_CN/figures
+@dirrm share/gnome/help/gnome-system-monitor/zh_CN
+@dirrm share/gnome/help/gnome-system-monitor/sv/figures
+@dirrm share/gnome/help/gnome-system-monitor/sv
+@dirrm share/gnome/help/gnome-system-monitor/pa/figures
+@dirrm share/gnome/help/gnome-system-monitor/pa
+@dirrm share/gnome/help/gnome-system-monitor/oc/figures
+@dirrm share/gnome/help/gnome-system-monitor/oc
+@dirrm share/gnome/help/gnome-system-monitor/fr/figures
+@dirrm share/gnome/help/gnome-system-monitor/fr
+@dirrm share/gnome/help/gnome-system-monitor/es/figures
+@dirrm share/gnome/help/gnome-system-monitor/es
+@dirrm share/gnome/help/gnome-system-monitor/el/figures
+@dirrm share/gnome/help/gnome-system-monitor/el
+@dirrm share/gnome/help/gnome-system-monitor/de/figures
+@dirrm share/gnome/help/gnome-system-monitor/de
+@dirrm share/gnome/help/gnome-system-monitor/da/figures
+@dirrm share/gnome/help/gnome-system-monitor/da
+@dirrm share/gnome/help/gnome-system-monitor/cs/figures
+@dirrm share/gnome/help/gnome-system-monitor/cs
+@dirrm share/gnome/help/gnome-system-monitor/ca/figures
+@dirrm share/gnome/help/gnome-system-monitor/ca
+@dirrm share/gnome/help/gnome-system-monitor/bg/figures
+@dirrm share/gnome/help/gnome-system-monitor/bg
+@dirrm share/gnome/help/gnome-system-monitor/ar/figures
+@dirrm share/gnome/help/gnome-system-monitor/ar
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/sysutils/gnome-system-monitor3/Makefile b/sysutils/gnome-system-monitor3/Makefile
index 59febfd99..8c5f37bda 100644
--- a/sysutils/gnome-system-monitor3/Makefile
+++ b/sysutils/gnome-system-monitor3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor3/Makefile,v 1.5 2011/04/05 16:31:14 kwm Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor3/Makefile,v 1.6 2011/04/10 19:41:37 mezz Exp $
 #
 
 PORTNAME=	gnome-system-monitor
@@ -20,6 +20,8 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		gtkmm-3.0.1:${PORTSDIR}/x11-toolkits/gtkmm30
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
+CONFLICTS=	gnome-system-monitor-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes