Update to 2.3.1.

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

4 files changed, 86 insertions, 17 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 66e4db9c3..29b697357 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	eog2
-PORTVERSION=	2.3.0
-PORTREVISION=	1
-#PORTREVISION=	0
+PORTVERSION=	2.3.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 6a50cdfb3..b968375d9 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eog-2.3.0.tar.bz2) = a571f2972828733324534e1b8aae726f
+MD5 (gnome2/eog-2.3.1.tar.bz2) = 7bfc3714df933dc0aadd18ffc715cf31
diff --git a/graphics/eog2/files/patch-Makefile.in b/graphics/eog2/files/patch-Makefile.in
deleted file mode 100644
index 48baea5f5..000000000
--- a/graphics/eog2/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Apr 12 02:18:51 2003
-+++ Makefile.in	Sat Apr 12 02:19:18 2003
-@@ -505,7 +505,7 @@
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/eog.schemas
-+	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/eog.schemas
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index 7cfd23495..766cc9503 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -21,9 +21,54 @@ share/gnome/gnome-2.0/ui/eog-shell-ui.xml
 share/gnome/help/eog/C/eog.xml
 share/gnome/help/eog/C/figures/eog_start_window.png
 share/gnome/help/eog/C/legal.xml
+share/gnome/help/eog/de/eog.xml
+share/gnome/help/eog/de/figures/eog_start_window.png
+share/gnome/help/eog/de/legal.xml
+share/gnome/help/eog/es/eog.xml
+share/gnome/help/eog/es/figures/eog_start_window.png
+share/gnome/help/eog/es/legal.xml
+share/gnome/help/eog/fr/eog.xml
+share/gnome/help/eog/fr/figures/eog_start_window.png
+share/gnome/help/eog/fr/legal.xml
+share/gnome/help/eog/it/eog.xml
+share/gnome/help/eog/it/figures/eog_start_window.png
+share/gnome/help/eog/it/legal.xml
+share/gnome/help/eog/ja/eog.xml
+share/gnome/help/eog/ja/figures/eog_start_window.png
+share/gnome/help/eog/ja/legal.xml
+share/gnome/help/eog/ko/eog.xml
+share/gnome/help/eog/ko/figures/eog_start_window.png
+share/gnome/help/eog/ko/legal.xml
+share/gnome/help/eog/sv/eog.xml
+share/gnome/help/eog/sv/figures/eog_start_window.png
+share/gnome/help/eog/sv/legal.xml
+share/gnome/help/eog/zh_CN/eog.xml
+share/gnome/help/eog/zh_CN/figures/eog_start_window.png
+share/gnome/help/eog/zh_CN/legal.xml
+share/gnome/help/eog/zh_TW/eog.xml
+share/gnome/help/eog/zh_TW/figures/eog_start_window.png
+share/gnome/help/eog/zh_TW/legal.xml
 share/gnome/idl/Eog.idl
 share/gnome/omf/eog/eog-C.omf
-@exec scrollkeeper-install %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/eog/down-right.png
 share/gnome/pixmaps/eog/orient-horizontal.png
 share/gnome/pixmaps/eog/orient-vertical.png
@@ -79,7 +124,44 @@ share/locale/wa/LC_MESSAGES/eog.mo
 share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 @dirrm share/gnome/omf/eog
+@dirrm share/gnome/help/eog/zh_TW/figures
+@dirrm share/gnome/help/eog/zh_TW
+@dirrm share/gnome/help/eog/zh_CN/figures
+@dirrm share/gnome/help/eog/zh_CN
+@dirrm share/gnome/help/eog/sv/figures
+@dirrm share/gnome/help/eog/sv
+@dirrm share/gnome/help/eog/ko/figures
+@dirrm share/gnome/help/eog/ko
+@dirrm share/gnome/help/eog/ja/figures
+@dirrm share/gnome/help/eog/ja
+@dirrm share/gnome/help/eog/it/figures
+@dirrm share/gnome/help/eog/it
+@dirrm share/gnome/help/eog/fr/figures
+@dirrm share/gnome/help/eog/fr
+@dirrm share/gnome/help/eog/es/figures
+@dirrm share/gnome/help/eog/es
+@dirrm share/gnome/help/eog/de/figures
+@dirrm share/gnome/help/eog/de
 @dirrm share/gnome/help/eog/C/figures
+@dirrm share/gnome/help/eog/C
+@dirrm share/gnome/help/eog
 @dirrm share/gnome/eog/glade
 @dirrm share/gnome/eog
-@unexec scrollkeeper-uninstall %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog/window
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog/view
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog/full_screen
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true