Update to 2.4.0.1.

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

4 files changed, 78 insertions, 48 deletions

diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 8b06b87af..bd9462b26 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ghex2
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.4.0.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -25,6 +24,6 @@ USE_GNOME=	gnomeprefix gnomehack gail libgnomeprintui libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/editors/ghex2/distinfo b/editors/ghex2/distinfo
index 637c5db7e..ed1ab7a18 100644
--- a/editors/ghex2/distinfo
+++ b/editors/ghex2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ghex-2.3.0.tar.bz2) = 3336add8b5ee6c95ab851053f4b668c8
+MD5 (gnome2/ghex-2.4.0.1.tar.bz2) = 2add675fa3d8d61e71616d49bb7d861e
diff --git a/editors/ghex2/files/patch-src_ui.c b/editors/ghex2/files/patch-src_ui.c
deleted file mode 100644
index b79543ead..000000000
--- a/editors/ghex2/files/patch-src_ui.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui.c.orig	Fri Jul 18 20:25:58 2003
-+++ src/ui.c	Fri Jul 18 20:26:34 2003
-@@ -875,7 +875,7 @@
- 	g_return_if_fail (msg != NULL);
- 	va_start(args, msg);
- 	real_msg = g_strdup_vprintf(msg, args);
--	va_end(msg);
-+	va_end(args);
- 	info_dlg = gtk_message_dialog_new (
- 			GTK_WINDOW (win),
- 			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/editors/ghex2/pkg-plist b/editors/ghex2/pkg-plist
index 3e33e87d5..ef1dfba77 100644
--- a/editors/ghex2/pkg-plist
+++ b/editors/ghex2/pkg-plist
@@ -2,46 +2,71 @@ bin/ghex2
 etc/gconf/gconf.xml.defaults/apps/ghex2/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/ghex2/%gconf.xml
 etc/gconf/schemas/ghex2.schemas
+include/gtkhex/accessiblegtkhex.h
+include/gtkhex/accessiblegtkhexfactory.h
+include/gtkhex/gtkhex.h
+include/gtkhex/hex-document.h
 lib/libgtkhex.a
 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/gnome/help/ghex2/ja/authors.html
-share/gnome/help/ghex2/ja/ghex2.sgml
-share/gnome/help/ghex2/ja/ghexconversion.html
-share/gnome/help/ghex2/ja/ghexconverter.png
-share/gnome/help/ghex2/ja/ghexdisplaypref.png
-share/gnome/help/ghex2/ja/ghexediting.html
-share/gnome/help/ghex2/ja/ghexfind.png
-share/gnome/help/ghex2/ja/ghexfindreplace.html
-share/gnome/help/ghex2/ja/ghexfindreplace.png
-share/gnome/help/ghex2/ja/ghexfullwindow.png
-share/gnome/help/ghex2/ja/ghexmdiprefs.png
-share/gnome/help/ghex2/ja/ghexmenubar.png
-share/gnome/help/ghex2/ja/ghexmenues.html
-share/gnome/help/ghex2/ja/ghexprefedit.png
-share/gnome/help/ghex2/ja/ghexprintprefs.png
-share/gnome/help/ghex2/ja/index.html
-share/gnome/help/ghex2/ja/license.html
-share/gnome/help/ghex2/ja/prefs.html
-share/gnome/help/ghex2/ja/topic.dat
-share/gnome/help/ghex2/ja/usage.html
 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
-@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/ghex/ghex-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/ghex/ghex-ja.omf 2>/dev/null || /usr/bin/true
+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
-include/gtkhex/accessiblegtkhex.h
-include/gtkhex/accessiblegtkhexfactory.h
-include/gtkhex/hex-document.h
-include/gtkhex/gtkhex.h
 share/locale/am/LC_MESSAGES/ghex-2.0.mo
 share/locale/az/LC_MESSAGES/ghex-2.0.mo
 share/locale/be/LC_MESSAGES/ghex-2.0.mo
@@ -64,6 +89,7 @@ share/locale/hu/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/ml/LC_MESSAGES/ghex-2.0.mo
 share/locale/ms/LC_MESSAGES/ghex-2.0.mo
 share/locale/nl/LC_MESSAGES/ghex-2.0.mo
 share/locale/nn/LC_MESSAGES/ghex-2.0.mo
@@ -75,6 +101,8 @@ share/locale/ro/LC_MESSAGES/ghex-2.0.mo
 share/locale/ru/LC_MESSAGES/ghex-2.0.mo
 share/locale/sk/LC_MESSAGES/ghex-2.0.mo
 share/locale/sl/LC_MESSAGES/ghex-2.0.mo
+share/locale/sr/LC_MESSAGES/ghex-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/ghex-2.0.mo
 share/locale/sv/LC_MESSAGES/ghex-2.0.mo
 share/locale/tr/LC_MESSAGES/ghex-2.0.mo
 share/locale/uk/LC_MESSAGES/ghex-2.0.mo
@@ -82,14 +110,28 @@ 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 include/gtkhex
 @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
+@dirrm share/gnome/help/ghex2/zh_CN
+@dirrm share/gnome/help/ghex2/sv/figures
+@dirrm share/gnome/help/ghex2/sv
+@dirrm share/gnome/help/ghex2/ko/figures
+@dirrm share/gnome/help/ghex2/ko
+@dirrm share/gnome/help/ghex2/ja/figures
+@dirrm share/gnome/help/ghex2/ja
+@dirrm share/gnome/help/ghex2/it/figures
+@dirrm share/gnome/help/ghex2/it
+@dirrm share/gnome/help/ghex2/fr/figures
+@dirrm share/gnome/help/ghex2/fr
+@dirrm share/gnome/help/ghex2/es/figures
+@dirrm share/gnome/help/ghex2/es
+@dirrm share/gnome/help/ghex2/de/figures
+@dirrm share/gnome/help/ghex2/de
 @dirrm share/gnome/help/ghex2/C/figures
 @dirrm share/gnome/help/ghex2/C
-@dirrm share/gnome/help/ghex2/ja/stylesheet-images
-@dirrm share/gnome/help/ghex2/ja
 @dirrm share/gnome/help/ghex2
+@dirrm include/gtkhex
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ghex2
 @dirrm etc/gconf/gconf.xml.defaults/apps/ghex2
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-ja.omf 2>/dev/null || /usr/bin/true