update to 2.18.1

This moves this pkg to the new stable gnome branch, too much to list here.

4 files changed, 51 insertions, 29 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index df6b4916e6d..8ee1387ba88 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2007/03/21 12:05:46 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2007/04/11 18:09:46 drochner Exp $
 #
 
-DISTNAME=	eog-2.16.3
-PKGREVISION=	1
+DISTNAME=	eog-2.18.1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.18/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -32,6 +31,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
diff --git a/graphics/eog2/PLIST b/graphics/eog2/PLIST
index 084013f2d65..952f3778c00 100644
--- a/graphics/eog2/PLIST
+++ b/graphics/eog2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2006/11/28 22:25:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/04/11 18:09:46 drochner Exp $
 bin/eog
 share/applications/eog.desktop
 share/eog/eog-gtk-ui.xml
@@ -9,8 +9,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
@@ -29,6 +32,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,6 +53,11 @@ 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/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
@@ -121,31 +138,29 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
 share/locale/zu/LC_MESSAGES/eog.mo
 share/omf/eog/eog-C.omf
 share/omf/eog/eog-de.omf
+share/omf/eog/eog-en_GB.omf
 share/omf/eog/eog-es.omf
 share/omf/eog/eog-eu.omf
 share/omf/eog/eog-fr.omf
 share/omf/eog/eog-it.omf
 share/omf/eog/eog-ja.omf
 share/omf/eog/eog-ko.omf
+share/omf/eog/eog-pa.omf
+share/omf/eog/eog-pt_BR.omf
+share/omf/eog/eog-ru.omf
 share/omf/eog/eog-sv.omf
 share/omf/eog/eog-uk.omf
 share/omf/eog/eog-zh_CN.omf
 share/omf/eog/eog-zh_TW.omf
-share/pixmaps/eog/down-right.png
-share/pixmaps/eog/loading.png
-share/pixmaps/eog/orient-horizontal.png
-share/pixmaps/eog/orient-vertical.png
-share/pixmaps/eog/right-down.png
-share/pixmaps/eog/stock-flip-horizontal-16.png
-share/pixmaps/eog/stock-flip-vertical-16.png
-share/pixmaps/eog/stock-rotate-180-16.png
-share/pixmaps/eog/stock-rotate-270-16.png
-share/pixmaps/eog/stock-rotate-90-16.png
 share/pixmaps/gnome-eog.png
-@dirrm share/pixmaps/eog
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/eog
-@comment in scrollkeeper: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
 @dirrm share/gnome/help/eog/zh_CN/figures
@@ -154,6 +169,12 @@ share/pixmaps/gnome-eog.png
 @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
@@ -166,12 +187,13 @@ share/pixmaps/gnome-eog.png
 @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
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
-@comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/eog/glade
 @dirrm share/eog
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 7749615550b..7e94c36074e 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2007/02/08 18:21:27 drochner Exp $
+$NetBSD: distinfo,v 1.27 2007/04/11 18:09:46 drochner Exp $
 
-SHA1 (eog-2.16.3.tar.bz2) = 2d532ed3d125d7a6a7aee4cfd96786ae65ee3932
-RMD160 (eog-2.16.3.tar.bz2) = ebdabee1930c145ab61d615cfa220a8e35ab8f57
-Size (eog-2.16.3.tar.bz2) = 1071413 bytes
-SHA1 (patch-aa) = 92e91a057bf10c33784b4592bbde2a7ee3cf5c55
+SHA1 (eog-2.18.1.tar.bz2) = e66f234b5104bb307a0d82398d9e759933e04954
+RMD160 (eog-2.18.1.tar.bz2) = 75c815d99913d8574a852e92f422e8a57d3e7817
+Size (eog-2.18.1.tar.bz2) = 1241674 bytes
+SHA1 (patch-aa) = 5bfe6cc09dba6b0ff5d338a862eb44ca1bf13a39
 SHA1 (patch-ab) = d75be607acda1586434b13721ca620326c516ecd
diff --git a/graphics/eog2/patches/patch-aa b/graphics/eog2/patches/patch-aa
index bc821a14683..025d1dbf4ce 100644
--- a/graphics/eog2/patches/patch-aa
+++ b/graphics/eog2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/02/08 18:34:20 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2007/04/11 18:09:46 drochner Exp $
 
---- Makefile.in.orig	2006-02-06 21:55:28.000000000 +0100
+--- Makefile.in.orig	2007-04-09 21:35:36.000000000 +0200
 +++ Makefile.in
-@@ -251,7 +251,7 @@ desktop_in_files = eog.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@@ -231,7 +231,7 @@ desktop_DATA = $(desktop_in_files:.deskt
  gladedir = $(datadir)/eog/glade
  glade_DATA = eog.glade
+ 
 -schemasdir = $(sysconfdir)/gconf/schemas
 +schemasdir = $(datadir)/gconf/schemas
  schemas_in_files = eog.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
- icondir = $(datadir)/pixmaps
+