Update to 2.2.0. Changes since 1.0.4:

* Translation updates.
* Toolbar fix (Christian Neumaier)
* Typo fixes. (Kjartan Maraas)
* Typo fixes. (Kjartan Maraas)
* Documentation updates. - #91027 (Irene Ryan)
* URI handling fixes. (Jens)
* Don't depend on libgnomeprint until printing is working again. (Jens)
* We don't crash anymore if the user doesn't have permissions to read
  a file - #85263 (Federico).
* The window is correctly sized upon startup, and you can shrink it
  again - #72352, #75713 (Jens).
* Nautilus will now display "Display as Image", which is better than
  "Display as EOG Image" - #73651 (Federico).
* Images now have a simple context menu - #75889 (Federico).
* We do the right thing to destroy the window list on File/Exit -
  #86469 (Federico).
* Filenames with percent signs in them are now handled correctly -
* #89372 (Federico).
* The File/Open dialog now displays a list of the supported image
  types - #85690 (Jens).
* Removed Tiles interpolation as it does not make sense for EOG. (Federico)
* Reworked preferences dialog and droped View menu settings. (Jens)
* Components are installed in $(libexec) (Michael).
* Restarted work on the collection component, currently disabled
  by default (Jens).
* No distorted view anymore when resizing an empty window. -
  #85927 (Jens)
* DnD into an empty window doesn't open a new window. (Jens)
* Load control ui xml file correctly (Ross Burton).
* Fullscreen now uses the whole screen again. (Jens)
* Better HIG compliance. (Jens)
* Rotating and flipping images - #68340 (Jens).
* New Latvian translation (Peteris Krisjanis).
* New Bulgarian translation (Borislav Aleksandrov).
* New Albanian translation (Laurent Dhima, Christian Rose).
* Lots of updated translations.

Changes in the package:
- Depend on gnome2-dirs.
- Use the new schemas.mk framework to handle GConf2 schemas.

4 files changed, 47 insertions, 25 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 103a4b6ead9..bf4ae8c533f 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 06:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/14 21:11:26 jmmv Exp $
 #
 
-DISTNAME=		eog-1.0.4
-PKGREVISION=		1
+DISTNAME=		eog-2.2.0
 CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
@@ -12,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Eye of GNOME: an image viewing and cataloging program
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
@@ -20,10 +20,13 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
+GCONF2_SCHEMAS= 	eog.schemas
+
 .include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../print/libgnomeprint/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../graphics/librsvg2/buildlink2.mk"
diff --git a/graphics/eog2/PLIST b/graphics/eog2/PLIST
index 34f3bec1eab..1dfde07df75 100644
--- a/graphics/eog2/PLIST
+++ b/graphics/eog2/PLIST
@@ -1,17 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/18 18:45:41 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:11:26 jmmv Exp $
 bin/eog
-etc/gconf/gconf.xml.defaults/apps/eog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/%gconf.xml
-etc/gconf/schemas/eog.schemas
 lib/bonobo/servers/GNOME_EOG.server
 libexec/eog-image-viewer
 share/applications/eog.desktop
+share/eog/glade/eog.glade
+share/gconf/schemas/eog.schemas
 share/gnome-2.0/ui/eog-image-view-ctrl-ui.xml
 share/gnome-2.0/ui/eog-image-view-ui.xml
 share/gnome-2.0/ui/eog-shell-ui.xml
@@ -19,6 +12,7 @@ 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/idl/Eog.idl
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/eog.mo
@@ -34,11 +28,15 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/eog.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/eog.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/eog.mo
@@ -70,11 +68,10 @@ share/pixmaps/gnome-eog.png
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
-@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
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
+@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/eog/glade
+@dirrm share/eog
+@comment in gnome2-dirs: @dirrm share/applications
+@comment in bonobo-activation: @dirrm lib/bonobo/servers
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index bc3067075ba..a2252d64e8a 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/12/18 18:45:41 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 21:11:26 jmmv Exp $
 
-SHA1 (eog-1.0.4.tar.bz2) = 2ebef9bba4c7aaabd872022acf8c6231ed5e36ab
-Size (eog-1.0.4.tar.bz2) = 373136 bytes
+SHA1 (eog-2.2.0.tar.bz2) = 121d6c2529b26de6edebeae892630c092fee0b1e
+Size (eog-2.2.0.tar.bz2) = 469229 bytes
+SHA1 (patch-aa) = bed9ab3f596e5044eb2af84d2c3da7e723024603
diff --git a/graphics/eog2/patches/patch-aa b/graphics/eog2/patches/patch-aa
new file mode 100644
index 00000000000..5eaafb80eb6
--- /dev/null
+++ b/graphics/eog2/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2003/02/14 21:11:26 jmmv Exp $
+
+--- Makefile.in.orig	2003-01-28 09:35:03.000000000 +0100
++++ Makefile.in
+@@ -133,7 +133,7 @@ Graphics_DATA = $(Graphics_in_files:.des
+ 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)
+ 
+@@ -512,7 +512,6 @@ mostlyclean distclean maintainer-clean
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_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.