Unbreak and update to 0.6

8 files changed, 38 insertions, 184 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 282b1cb170cc..7ea2b1219ca7 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	eog
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-BROKEN=		"Fails with new devel/bonobo"
-
 LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 089f57e892e3..208516b5eaa5 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1 +1 @@
-MD5 (eog-0.5.tar.gz) = c082d3cf5d0ed6c129dba2797c4f15f2
+MD5 (eog-0.6.tar.gz) = e843959ff17f847e27a3219ac6cafcc7
diff --git a/graphics/eog/files/patch-ad b/graphics/eog/files/patch-ad
deleted file mode 100644
index b0434a7cbe16..000000000000
--- a/graphics/eog/files/patch-ad
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/main.c.orig	Sun Sep  3 17:34:48 2000
-+++ src/main.c	Mon Oct  2 11:22:02 2000
-@@ -38,3 +38,3 @@
- 	gboolean opened;
--	GConfError *error;
-+	GError *error;
- 
-@@ -50,4 +50,4 @@
- 		g_assert (error != NULL);
--		g_message ("GConf init failed: %s", error->str);
--		gconf_error_destroy (error);
-+		g_message ("GConf init failed: %s", error->message);
-+		g_error_free(error);
- 		exit (EXIT_FAILURE);
---- src/image-view.c.orig	Sat Sep  2 23:37:19 2000
-+++ src/image-view.c	Mon Oct  2 11:24:22 2000
-@@ -243,3 +243,3 @@
- {
--	image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -251,3 +251,3 @@
- {
--	image_view_set_check_type (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_check_type (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -259,3 +259,3 @@
- {
--	image_view_set_check_size (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_check_size (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -267,3 +267,3 @@
- {
--	image_view_set_dither (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_dither (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -275,3 +275,3 @@
- {
--	image_view_set_scroll (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_scroll (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
---- src/full-screen.c.orig	Sat Sep  2 23:37:19 2000
-+++ src/full-screen.c	Mon Oct  2 11:27:44 2000
-@@ -125,3 +125,3 @@
- 
--	priv->sb_policy = gconf_value_int (value);
-+	priv->sb_policy = gconf_value_get_int (value);
- 
-@@ -141,3 +141,3 @@
- 
--	priv->bevel = gconf_value_bool (value);
-+	priv->bevel = gconf_value_get_bool (value);
- 
---- src/window.c.orig	Sat Sep  2 23:37:19 2000
-+++ src/window.c	Mon Oct  2 11:28:25 2000
-@@ -324,3 +324,3 @@
- 
--	priv->sb_policy = gconf_value_int (value);
-+	priv->sb_policy = gconf_value_get_int (value);
- 
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index e6ac9b20ec1f..93bd93526064 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -1,46 +1,33 @@
-bin/bonobo-image-generic
 bin/eog
+bin/eog-image-viewer
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 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/apps/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%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/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/schemas/eog.schemas
 share/gnome/apps/Graphics/eog.desktop
 share/gnome/eog/glade/preferences-dialog.glade
-share/gnome/help/eog/C/basic-usage.html
-share/gnome/help/eog/C/configuring-eog.html
-share/gnome/help/eog/C/docbook.css
 share/gnome/help/eog/C/fig/image-window-toolbar.png
 share/gnome/help/eog/C/fig/image-window.png
 share/gnome/help/eog/C/fig/prefs-display.png
 share/gnome/help/eog/C/fig/prefs-viewers.png
-share/gnome/help/eog/C/full-screen-view.html
-share/gnome/help/eog/C/image-windows.html
-share/gnome/help/eog/C/index.html
-share/gnome/help/eog/C/intro.html
-share/gnome/help/eog/C/license.html
-share/gnome/help/eog/C/prefs-viewers.html
-share/gnome/help/eog/C/providing-feedback.html
-share/gnome/help/eog/C/stylesheet-images/caution.gif
-share/gnome/help/eog/C/stylesheet-images/home.gif
-share/gnome/help/eog/C/stylesheet-images/important.gif
-share/gnome/help/eog/C/stylesheet-images/next.gif
-share/gnome/help/eog/C/stylesheet-images/note.gif
-share/gnome/help/eog/C/stylesheet-images/prev.gif
-share/gnome/help/eog/C/stylesheet-images/tip.gif
-share/gnome/help/eog/C/stylesheet-images/toc-blank.gif
-share/gnome/help/eog/C/stylesheet-images/toc-minus.gif
-share/gnome/help/eog/C/stylesheet-images/toc-plus.gif
-share/gnome/help/eog/C/stylesheet-images/up.gif
-share/gnome/help/eog/C/stylesheet-images/warning.gif
-share/gnome/oaf/image-generic.oafinfo
+share/gnome/idl/Eog.idl
+share/gnome/oaf/GNOME_EOG.oaf
+share/gnome/pixmaps/eog/stock-zoom-1.xpm
+share/gnome/pixmaps/eog/stock-zoom-fit.xpm
+share/gnome/pixmaps/eog/stock-zoom-in.xpm
+share/gnome/pixmaps/eog/stock-zoom-out.xpm
 share/gnome/pixmaps/gnome-eog.png
+share/gnome/ui/eog-image-view-ui.xml
+share/locale/az/LC_MESSAGES/eog.mo
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
 share/locale/da/LC_MESSAGES/eog.mo
@@ -60,17 +47,20 @@ share/locale/lt/LC_MESSAGES/eog.mo
 share/locale/nl/LC_MESSAGES/eog.mo
 share/locale/no/LC_MESSAGES/eog.mo
 share/locale/pl/LC_MESSAGES/eog.mo
+share/locale/pt_BR/LC_MESSAGES/eog.mo
 share/locale/ro/LC_MESSAGES/eog.mo
 share/locale/ru/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
 share/locale/uk/LC_MESSAGES/eog.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/eog.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/eog.mo
+@dirrm share/gnome/pixmaps/eog
 @dirrm share/gnome/help/eog/C/stylesheet-images
 @dirrm share/gnome/help/eog/C/fig
 @dirrm share/gnome/help/eog/C
-@dirrm share/gnome/help/eog
+@dirrm share/gnome/help/eog  
 @dirrm share/gnome/eog/glade
 @dirrm share/gnome/eog
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 282b1cb170cc..7ea2b1219ca7 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	eog
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTVERSION=	0.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-BROKEN=		"Fails with new devel/bonobo"
-
 LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 089f57e892e3..208516b5eaa5 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (eog-0.5.tar.gz) = c082d3cf5d0ed6c129dba2797c4f15f2
+MD5 (eog-0.6.tar.gz) = e843959ff17f847e27a3219ac6cafcc7
diff --git a/graphics/eog2/files/patch-ad b/graphics/eog2/files/patch-ad
deleted file mode 100644
index b0434a7cbe16..000000000000
--- a/graphics/eog2/files/patch-ad
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/main.c.orig	Sun Sep  3 17:34:48 2000
-+++ src/main.c	Mon Oct  2 11:22:02 2000
-@@ -38,3 +38,3 @@
- 	gboolean opened;
--	GConfError *error;
-+	GError *error;
- 
-@@ -50,4 +50,4 @@
- 		g_assert (error != NULL);
--		g_message ("GConf init failed: %s", error->str);
--		gconf_error_destroy (error);
-+		g_message ("GConf init failed: %s", error->message);
-+		g_error_free(error);
- 		exit (EXIT_FAILURE);
---- src/image-view.c.orig	Sat Sep  2 23:37:19 2000
-+++ src/image-view.c	Mon Oct  2 11:24:22 2000
-@@ -243,3 +243,3 @@
- {
--	image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -251,3 +251,3 @@
- {
--	image_view_set_check_type (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_check_type (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -259,3 +259,3 @@
- {
--	image_view_set_check_size (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_check_size (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -267,3 +267,3 @@
- {
--	image_view_set_dither (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_dither (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
-@@ -275,3 +275,3 @@
- {
--	image_view_set_scroll (IMAGE_VIEW (data), gconf_value_int (value));
-+	image_view_set_scroll (IMAGE_VIEW (data), gconf_value_get_int (value));
- }
---- src/full-screen.c.orig	Sat Sep  2 23:37:19 2000
-+++ src/full-screen.c	Mon Oct  2 11:27:44 2000
-@@ -125,3 +125,3 @@
- 
--	priv->sb_policy = gconf_value_int (value);
-+	priv->sb_policy = gconf_value_get_int (value);
- 
-@@ -141,3 +141,3 @@
- 
--	priv->bevel = gconf_value_bool (value);
-+	priv->bevel = gconf_value_get_bool (value);
- 
---- src/window.c.orig	Sat Sep  2 23:37:19 2000
-+++ src/window.c	Mon Oct  2 11:28:25 2000
-@@ -324,3 +324,3 @@
- 
--	priv->sb_policy = gconf_value_int (value);
-+	priv->sb_policy = gconf_value_get_int (value);
- 
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index e6ac9b20ec1f..93bd93526064 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,46 +1,33 @@
-bin/bonobo-image-generic
 bin/eog
+bin/eog-image-viewer
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 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/apps/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%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/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/schemas/eog.schemas
 share/gnome/apps/Graphics/eog.desktop
 share/gnome/eog/glade/preferences-dialog.glade
-share/gnome/help/eog/C/basic-usage.html
-share/gnome/help/eog/C/configuring-eog.html
-share/gnome/help/eog/C/docbook.css
 share/gnome/help/eog/C/fig/image-window-toolbar.png
 share/gnome/help/eog/C/fig/image-window.png
 share/gnome/help/eog/C/fig/prefs-display.png
 share/gnome/help/eog/C/fig/prefs-viewers.png
-share/gnome/help/eog/C/full-screen-view.html
-share/gnome/help/eog/C/image-windows.html
-share/gnome/help/eog/C/index.html
-share/gnome/help/eog/C/intro.html
-share/gnome/help/eog/C/license.html
-share/gnome/help/eog/C/prefs-viewers.html
-share/gnome/help/eog/C/providing-feedback.html
-share/gnome/help/eog/C/stylesheet-images/caution.gif
-share/gnome/help/eog/C/stylesheet-images/home.gif
-share/gnome/help/eog/C/stylesheet-images/important.gif
-share/gnome/help/eog/C/stylesheet-images/next.gif
-share/gnome/help/eog/C/stylesheet-images/note.gif
-share/gnome/help/eog/C/stylesheet-images/prev.gif
-share/gnome/help/eog/C/stylesheet-images/tip.gif
-share/gnome/help/eog/C/stylesheet-images/toc-blank.gif
-share/gnome/help/eog/C/stylesheet-images/toc-minus.gif
-share/gnome/help/eog/C/stylesheet-images/toc-plus.gif
-share/gnome/help/eog/C/stylesheet-images/up.gif
-share/gnome/help/eog/C/stylesheet-images/warning.gif
-share/gnome/oaf/image-generic.oafinfo
+share/gnome/idl/Eog.idl
+share/gnome/oaf/GNOME_EOG.oaf
+share/gnome/pixmaps/eog/stock-zoom-1.xpm
+share/gnome/pixmaps/eog/stock-zoom-fit.xpm
+share/gnome/pixmaps/eog/stock-zoom-in.xpm
+share/gnome/pixmaps/eog/stock-zoom-out.xpm
 share/gnome/pixmaps/gnome-eog.png
+share/gnome/ui/eog-image-view-ui.xml
+share/locale/az/LC_MESSAGES/eog.mo
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
 share/locale/da/LC_MESSAGES/eog.mo
@@ -60,17 +47,20 @@ share/locale/lt/LC_MESSAGES/eog.mo
 share/locale/nl/LC_MESSAGES/eog.mo
 share/locale/no/LC_MESSAGES/eog.mo
 share/locale/pl/LC_MESSAGES/eog.mo
+share/locale/pt_BR/LC_MESSAGES/eog.mo
 share/locale/ro/LC_MESSAGES/eog.mo
 share/locale/ru/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
 share/locale/uk/LC_MESSAGES/eog.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/eog.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/eog.mo
+@dirrm share/gnome/pixmaps/eog
 @dirrm share/gnome/help/eog/C/stylesheet-images
 @dirrm share/gnome/help/eog/C/fig
 @dirrm share/gnome/help/eog/C
-@dirrm share/gnome/help/eog
+@dirrm share/gnome/help/eog  
 @dirrm share/gnome/eog/glade
 @dirrm share/gnome/eog
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window