4 files changed, 36 insertions, 34 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index d207071e1789..93a0f2da69f4 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/graphics/eog/Makefile,v 1.4 2006/10/21 18:34:14 mezz Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.51 2007/03/13 00:48:55 mezz Exp $
 #
 
 PORTNAME=	eog
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,6 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui \
 		librsvg2 desktopfileutils gnomedesktop
+INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 INSTALLS_OMF=	yes
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index b35494eb2e04..6b68e48b77ba 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.16.3.tar.bz2) = 82468185d766b9676d7f06c124939f9d
-SHA256 (gnome2/eog-2.16.3.tar.bz2) = 81fd0962414fa5af71c38cd1cfb1753b12fafdd42111679813a7294eb5a0bdcb
-SIZE (gnome2/eog-2.16.3.tar.bz2) = 1071413
+MD5 (gnome2/eog-2.18.0.1.tar.bz2) = 32f4cd4cd3108522eccf0b8fd85c8bbd
+SHA256 (gnome2/eog-2.18.0.1.tar.bz2) = 9c18c512d7da540e8c96059f00af8e309c5ac6322de168f54f09c0451f59ec9e
+SIZE (gnome2/eog-2.18.0.1.tar.bz2) = 1235965
diff --git a/graphics/eog/files/patch-libeog_eog-image-list.c b/graphics/eog/files/patch-libeog_eog-image-list.c
deleted file mode 100644
index 609cd0469a4e..000000000000
--- a/graphics/eog/files/patch-libeog_eog-image-list.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- libeog/eog-image-list.c.orig	Thu Aug 25 14:57:02 2005
-+++ libeog/eog-image-list.c	Thu Aug 25 14:57:46 2005
-@@ -450,12 +450,13 @@
- 		case GNOME_VFS_MONITOR_EVENT_CREATED:
- 		
- 			if (list && list->priv) {
-+				gchar *str;
- 				node = list->priv->store;
- 				
- 				while (node != NULL && !found) {
- 			
- 					uri = eog_image_get_uri(node->data);
--					gchar *str = gnome_vfs_uri_to_string 
-+					str = gnome_vfs_uri_to_string 
- 						(uri, GNOME_VFS_URI_HIDE_NONE);
- 					found = (strcmp (str, info_uri)==0)?TRUE:FALSE;
- 					g_free (str);
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index ee244189d2f2..08a99fc188c6 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -7,8 +7,11 @@ share/gnome/help/eog/C/figures/eog_save_as_window.png
 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_save_as_window.png
 share/gnome/help/eog/de/figures/eog_start_window.png
-share/gnome/help/eog/de/legal.xml
+share/gnome/help/eog/en_GB/eog.xml
+share/gnome/help/eog/en_GB/figures/eog_save_as_window.png
+share/gnome/help/eog/en_GB/figures/eog_start_window.png
 share/gnome/help/eog/es/eog.xml
 share/gnome/help/eog/es/figures/eog_save_as_window.png
 share/gnome/help/eog/es/figures/eog_start_window.png
@@ -27,6 +30,15 @@ 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/pa/eog.xml
+share/gnome/help/eog/pa/figures/eog_save_as_window.png
+share/gnome/help/eog/pa/figures/eog_start_window.png
+share/gnome/help/eog/pt_BR/eog.xml
+share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png
+share/gnome/help/eog/pt_BR/figures/eog_start_window.png
+share/gnome/help/eog/ru/eog.xml
+share/gnome/help/eog/ru/figures/eog_save_as_window.png
+share/gnome/help/eog/ru/figures/eog_start_window.png
 share/gnome/help/eog/sv/eog.xml
 share/gnome/help/eog/sv/figures/eog_save_as_window.png
 share/gnome/help/eog/sv/figures/eog_start_window.png
@@ -41,27 +53,26 @@ share/gnome/help/eog/zh_TW/figures/eog_start_window.png
 share/gnome/help/eog/zh_TW/legal.xml
 share/gnome/omf/eog/eog-C.omf
 share/gnome/omf/eog/eog-de.omf
+share/gnome/omf/eog/eog-en_GB.omf
 share/gnome/omf/eog/eog-es.omf
 share/gnome/omf/eog/eog-eu.omf
 share/gnome/omf/eog/eog-fr.omf
 share/gnome/omf/eog/eog-it.omf
 share/gnome/omf/eog/eog-ja.omf
 share/gnome/omf/eog/eog-ko.omf
+share/gnome/omf/eog/eog-pa.omf
+share/gnome/omf/eog/eog-pt_BR.omf
+share/gnome/omf/eog/eog-ru.omf
 share/gnome/omf/eog/eog-sv.omf
 share/gnome/omf/eog/eog-uk.omf
 share/gnome/omf/eog/eog-zh_CN.omf
 share/gnome/omf/eog/eog-zh_TW.omf
-share/gnome/pixmaps/eog/down-right.png
-share/gnome/pixmaps/eog/loading.png
-share/gnome/pixmaps/eog/orient-horizontal.png
-share/gnome/pixmaps/eog/orient-vertical.png
-share/gnome/pixmaps/eog/right-down.png
-share/gnome/pixmaps/eog/stock-flip-horizontal-16.png
-share/gnome/pixmaps/eog/stock-flip-vertical-16.png
-share/gnome/pixmaps/eog/stock-rotate-180-16.png
-share/gnome/pixmaps/eog/stock-rotate-270-16.png
-share/gnome/pixmaps/eog/stock-rotate-90-16.png
 share/gnome/pixmaps/gnome-eog.png
+share/icons/hicolor/16x16/apps/eog.png
+share/icons/hicolor/22x22/apps/eog.png
+share/icons/hicolor/24x24/apps/eog.png
+share/icons/hicolor/32x32/apps/eog.png
+share/icons/hicolor/scalable/apps/eog.svg
 share/locale/af/LC_MESSAGES/eog.mo
 share/locale/am/LC_MESSAGES/eog.mo
 share/locale/ar/LC_MESSAGES/eog.mo
@@ -140,7 +151,6 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_HK/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 share/locale/zu/LC_MESSAGES/eog.mo
-@dirrm share/gnome/pixmaps/eog
 @dirrm share/gnome/omf/eog
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
@@ -150,6 +160,12 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @dirrm share/gnome/help/eog/uk
 @dirrm share/gnome/help/eog/sv/figures
 @dirrm share/gnome/help/eog/sv
+@dirrm share/gnome/help/eog/ru/figures
+@dirrm share/gnome/help/eog/ru
+@dirrm share/gnome/help/eog/pt_BR/figures
+@dirrm share/gnome/help/eog/pt_BR
+@dirrm share/gnome/help/eog/pa/figures
+@dirrm share/gnome/help/eog/pa
 @dirrm share/gnome/help/eog/ko/figures
 @dirrm share/gnome/help/eog/ko
 @dirrm share/gnome/help/eog/ja/figures
@@ -162,6 +178,8 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @dirrm share/gnome/help/eog/eu
 @dirrm share/gnome/help/eog/es/figures
 @dirrm share/gnome/help/eog/es
+@dirrm share/gnome/help/eog/en_GB/figures
+@dirrm share/gnome/help/eog/en_GB
 @dirrm share/gnome/help/eog/de/figures
 @dirrm share/gnome/help/eog/de
 @dirrm share/gnome/help/eog/C/figures