3 files changed, 24 insertions, 24 deletions

diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index aca189afa042..751d7117deb4 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.66 2007/09/18 01:30:46 ahze Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.68 2008/03/11 03:54:37 mezz Exp $
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index cbe4c5480452..45fda8d93de9 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.20.0.tar.bz2) = b686677878b5754ffa8d0a2cc1129988
-SHA256 (gnome2/gconf-editor-2.20.0.tar.bz2) = 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a
-SIZE (gnome2/gconf-editor-2.20.0.tar.bz2) = 892603
+MD5 (gnome2/gconf-editor-2.22.0.tar.bz2) = 7ca99aec214dd855b5de7dacc8937055
+SHA256 (gnome2/gconf-editor-2.22.0.tar.bz2) = e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc
+SIZE (gnome2/gconf-editor-2.22.0.tar.bz2) = 873868
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 6df1d36571f4..817b8e2afc39 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -17,22 +17,6 @@ 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/uk/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/omf/gconf-editor/gconf-editor-C.omf
-share/omf/gconf-editor/gconf-editor-de.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-sv.omf
-share/omf/gconf-editor/gconf-editor-uk.omf
-share/pixmaps/gconf-editor/entry-blank.png
-share/pixmaps/gconf-editor/entry-bool.png
-share/pixmaps/gconf-editor/entry-list.png
-share/pixmaps/gconf-editor/entry-number.png
-share/pixmaps/gconf-editor/entry-schema.png
-share/pixmaps/gconf-editor/entry-string.png
-share/pixmaps/gconf-editor/folder-closed.png
-share/pixmaps/gconf-editor/folder-open.png
 share/icons/hicolor/48x48/apps/gconf-editor.png
 share/locale/am/LC_MESSAGES/gconf-editor.mo
 share/locale/ar/LC_MESSAGES/gconf-editor.mo
@@ -86,6 +70,7 @@ 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
@@ -113,6 +98,22 @@ 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-de.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-sv.omf
+share/omf/gconf-editor/gconf-editor-uk.omf
+share/pixmaps/gconf-editor/entry-blank.png
+share/pixmaps/gconf-editor/entry-bool.png
+share/pixmaps/gconf-editor/entry-list.png
+share/pixmaps/gconf-editor/entry-number.png
+share/pixmaps/gconf-editor/entry-schema.png
+share/pixmaps/gconf-editor/entry-string.png
+share/pixmaps/gconf-editor/folder-closed.png
+share/pixmaps/gconf-editor/folder-open.png
 @dirrm share/pixmaps/gconf-editor
 @dirrm share/omf/gconf-editor
 @dirrm share/gnome/help/gconf-editor/uk/figures
@@ -132,6 +133,7 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrm share/gnome/help/gconf-editor/C/figures
 @dirrm share/gnome/help/gconf-editor/C
 @dirrm share/gnome/help/gconf-editor
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -160,4 +162,3 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrmtry share/applications