3 files changed, 28 insertions, 7 deletions

diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 2cd9723bb74b..5eb6b77538c1 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.2
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,12 +19,13 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gconf2
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	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
index fd91b290e760..31bf7e95fecc 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconf-editor-2.6.2.tar.bz2) = 4b739532de350969c71f96c3b97f1093
-SIZE (gnome2/gconf-editor-2.6.2.tar.bz2) = 387614
+MD5 (gnome2/gconf-editor-2.8.2.tar.bz2) = 193d5970b570366fd435b2b7ebdd8047
+SIZE (gnome2/gconf-editor-2.8.2.tar.bz2) = 510014
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 4b66bf1fa370..49065627221b 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -1,5 +1,16 @@
 bin/gconf-editor
 share/gnome/applications/gconf-editor.desktop
+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/omf/gconf-editor/gconf-editor-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gconf-editor.png
 share/gnome/pixmaps/gconf-editor/entry-blank.png
 share/gnome/pixmaps/gconf-editor/entry-bool.png
@@ -9,19 +20,20 @@ share/gnome/pixmaps/gconf-editor/entry-schema.png
 share/gnome/pixmaps/gconf-editor/entry-string.png
 share/gnome/pixmaps/gconf-editor/folder-closed.png
 share/gnome/pixmaps/gconf-editor/folder-open.png
-share/gnome/pixmaps/gconf-editor/stock-about-16.png
 share/locale/am/LC_MESSAGES/gconf-editor.mo
 share/locale/ar/LC_MESSAGES/gconf-editor.mo
 share/locale/az/LC_MESSAGES/gconf-editor.mo
 share/locale/be/LC_MESSAGES/gconf-editor.mo
 share/locale/bg/LC_MESSAGES/gconf-editor.mo
 share/locale/bn/LC_MESSAGES/gconf-editor.mo
+share/locale/bs/LC_MESSAGES/gconf-editor.mo
 share/locale/ca/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/el/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
@@ -49,8 +61,11 @@ 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/no/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/pt/LC_MESSAGES/gconf-editor.mo
@@ -71,3 +86,8 @@ share/locale/vi/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrm share/gnome/pixmaps/gconf-editor
+@dirrm share/gnome/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/C/figures
+@dirrm share/gnome/help/gconf-editor/C
+@dirrm share/gnome/help/gconf-editor
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true