4 files changed, 30 insertions, 43 deletions

diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 60029766113e..f9ccfa1c45e6 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -3,26 +3,27 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/editors/ghex/Makefile,v 1.7 2007/10/11 04:06:59 mezz Exp $
 #
 
 PORTNAME=	ghex
-PORTVERSION=	2.8.2
+PORTVERSION=	2.20.0
 PORTREVISION=	1
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 hex editor
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui \
+		gnomedocutils
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/ghex/distinfo b/editors/ghex/distinfo
index 0eaf67d9d9eb..2c0d539686f2 100644
--- a/editors/ghex/distinfo
+++ b/editors/ghex/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/ghex-2.8.2.tar.bz2) = 1940a9f63b0d37604c6b489cda37fc19
-SHA256 (gnome2/ghex-2.8.2.tar.bz2) = 47142d1903ac8cf09d888a4a349e0a6ea671314354937b63a544b829e008861d
-SIZE (gnome2/ghex-2.8.2.tar.bz2) = 955164
+MD5 (gnome2/ghex-2.20.0.tar.bz2) = 7f76315b08f0d54d58540bae2f014394
+SHA256 (gnome2/ghex-2.20.0.tar.bz2) = 68863be37bc4f141f6a286e57d406a374b93d7036920ea7c73a64ae868147b10
+SIZE (gnome2/ghex-2.20.0.tar.bz2) = 1223113
diff --git a/editors/ghex/files/patch-app-docs.make b/editors/ghex/files/patch-app-docs.make
deleted file mode 100644
index cf9e1505241c..000000000000
--- a/editors/ghex/files/patch-app-docs.make
+++ /dev/null
@@ -1,6 +0,0 @@
---- app-docs.make.orig	Sun Mar  4 04:18:34 2001
-+++ app-docs.make	Sat Apr 14 08:55:37 2001
-@@ -1,2 +1,2 @@
--helpdir = $(datadir)/gnome/help/$(app)/$(lang)
-+helpdir = $(datadir)/help/$(app)/$(lang)
- help_DATA = \
diff --git a/editors/ghex/pkg-plist b/editors/ghex/pkg-plist
index 3a178b38f221..159af79639a1 100644
--- a/editors/ghex/pkg-plist
+++ b/editors/ghex/pkg-plist
@@ -6,64 +6,47 @@ lib/libgtkhex.la
 lib/libgtkhex.so
 lib/libgtkhex.so.0
 libdata/pkgconfig/gtkhex.pc
-share/gnome/applications/ghex.desktop
-share/gnome/gnome-2.0/ui/ghex-ui.xml
+share/applications/ghex.desktop
+share/gnome-2.0/ui/ghex-ui.xml
 share/gnome/help/ghex2/C/figures/ghex_window_empty.png
 share/gnome/help/ghex2/C/figures/ghex_window_open.png
 share/gnome/help/ghex2/C/ghex2.xml
 share/gnome/help/ghex2/C/legal.xml
-share/gnome/help/ghex2/C/topic.dat
 share/gnome/help/ghex2/de/figures/ghex_window_empty.png
 share/gnome/help/ghex2/de/figures/ghex_window_open.png
 share/gnome/help/ghex2/de/ghex2.xml
-share/gnome/help/ghex2/de/legal.xml
 share/gnome/help/ghex2/es/figures/ghex_window_empty.png
 share/gnome/help/ghex2/es/figures/ghex_window_open.png
 share/gnome/help/ghex2/es/ghex2.xml
-share/gnome/help/ghex2/es/legal.xml
-share/gnome/help/ghex2/es/topic.dat
 share/gnome/help/ghex2/fr/figures/ghex_window_empty.png
 share/gnome/help/ghex2/fr/figures/ghex_window_open.png
 share/gnome/help/ghex2/fr/ghex2.xml
-share/gnome/help/ghex2/fr/legal.xml
 share/gnome/help/ghex2/it/figures/ghex_window_empty.png
 share/gnome/help/ghex2/it/figures/ghex_window_open.png
 share/gnome/help/ghex2/it/ghex2.xml
-share/gnome/help/ghex2/it/legal.xml
 share/gnome/help/ghex2/ja/figures/ghex_window_empty.png
 share/gnome/help/ghex2/ja/figures/ghex_window_open.png
 share/gnome/help/ghex2/ja/ghex2.xml
-share/gnome/help/ghex2/ja/legal.xml
-share/gnome/help/ghex2/ja/topic.dat
 share/gnome/help/ghex2/ko/figures/ghex_window_empty.png
 share/gnome/help/ghex2/ko/figures/ghex_window_open.png
 share/gnome/help/ghex2/ko/ghex2.xml
-share/gnome/help/ghex2/ko/legal.xml
 share/gnome/help/ghex2/sv/figures/ghex_window_empty.png
 share/gnome/help/ghex2/sv/figures/ghex_window_open.png
 share/gnome/help/ghex2/sv/ghex2.xml
-share/gnome/help/ghex2/sv/legal.xml
-share/gnome/help/ghex2/sv/topic.dat
 share/gnome/help/ghex2/zh_CN/figures/ghex_window_empty.png
 share/gnome/help/ghex2/zh_CN/figures/ghex_window_open.png
 share/gnome/help/ghex2/zh_CN/ghex2.xml
-share/gnome/help/ghex2/zh_CN/legal.xml
 share/gnome/help/ghex2/zh_TW/figures/ghex_window_empty.png
 share/gnome/help/ghex2/zh_TW/figures/ghex_window_open.png
 share/gnome/help/ghex2/zh_TW/ghex2.xml
-share/gnome/help/ghex2/zh_TW/legal.xml
-share/gnome/omf/ghex/ghex-C.omf
-share/gnome/omf/ghex/ghex2-de.omf
-share/gnome/omf/ghex/ghex2-es.omf
-share/gnome/omf/ghex/ghex2-fr.omf
-share/gnome/omf/ghex/ghex2-it.omf
-share/gnome/omf/ghex/ghex2-ja.omf
-share/gnome/omf/ghex/ghex2-ko.omf
-share/gnome/omf/ghex/ghex2-sv.omf
-share/gnome/omf/ghex/ghex2-zh_CN.omf
-share/gnome/omf/ghex/ghex2-zh_TW.omf
-share/gnome/pixmaps/gnome-ghex.png
+share/icons/hicolor/16x16/apps/ghex.png
+share/icons/hicolor/22x22/apps/ghex.png
+share/icons/hicolor/24x24/apps/ghex.png
+share/icons/hicolor/32x32/apps/ghex.png
+share/icons/hicolor/48x48/apps/ghex.png
+share/icons/hicolor/scalable/apps/ghex.svg
 share/locale/am/LC_MESSAGES/ghex-2.0.mo
+share/locale/ar/LC_MESSAGES/ghex-2.0.mo
 share/locale/az/LC_MESSAGES/ghex-2.0.mo
 share/locale/be/LC_MESSAGES/ghex-2.0.mo
 share/locale/bg/LC_MESSAGES/ghex-2.0.mo
@@ -71,6 +54,7 @@ share/locale/ca/LC_MESSAGES/ghex-2.0.mo
 share/locale/cs/LC_MESSAGES/ghex-2.0.mo
 share/locale/da/LC_MESSAGES/ghex-2.0.mo
 share/locale/de/LC_MESSAGES/ghex-2.0.mo
+share/locale/dz/LC_MESSAGES/ghex-2.0.mo
 share/locale/el/LC_MESSAGES/ghex-2.0.mo
 share/locale/en_CA/LC_MESSAGES/ghex-2.0.mo
 share/locale/en_GB/LC_MESSAGES/ghex-2.0.mo
@@ -87,13 +71,15 @@ share/locale/id/LC_MESSAGES/ghex-2.0.mo
 share/locale/it/LC_MESSAGES/ghex-2.0.mo
 share/locale/ja/LC_MESSAGES/ghex-2.0.mo
 share/locale/ko/LC_MESSAGES/ghex-2.0.mo
+share/locale/lv/LC_MESSAGES/ghex-2.0.mo
+share/locale/mk/LC_MESSAGES/ghex-2.0.mo
 share/locale/ml/LC_MESSAGES/ghex-2.0.mo
 share/locale/ms/LC_MESSAGES/ghex-2.0.mo
 share/locale/nb/LC_MESSAGES/ghex-2.0.mo
 share/locale/ne/LC_MESSAGES/ghex-2.0.mo
 share/locale/nl/LC_MESSAGES/ghex-2.0.mo
 share/locale/nn/LC_MESSAGES/ghex-2.0.mo
-share/locale/no/LC_MESSAGES/ghex-2.0.mo
+share/locale/oc/LC_MESSAGES/ghex-2.0.mo
 share/locale/pa/LC_MESSAGES/ghex-2.0.mo
 share/locale/pl/LC_MESSAGES/ghex-2.0.mo
 share/locale/pt/LC_MESSAGES/ghex-2.0.mo
@@ -113,7 +99,6 @@ share/locale/vi/LC_MESSAGES/ghex-2.0.mo
 share/locale/wa/LC_MESSAGES/ghex-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/ghex-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
-@dirrm share/gnome/omf/ghex
 @dirrm share/gnome/help/ghex2/zh_TW/figures
 @dirrm share/gnome/help/ghex2/zh_TW
 @dirrm share/gnome/help/ghex2/zh_CN/figures
@@ -136,3 +121,10 @@ share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
 @dirrm share/gnome/help/ghex2/C
 @dirrm share/gnome/help/ghex2
 @dirrm include/gtkhex
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/applications