Update to 0.4

6 files changed, 96 insertions, 10 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index de49acb84006..f121692169c8 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	eog
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
+		glade.4:${PORTSDIR}/devel/libglade \
+		bonobo.2:${PORTSDIR}/devel/bonobo \
+		gconf-1.0:${PORTSDIR}/devel/gconf
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--without-bonobo
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 008d3d4e1797..5838352faddd 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1 +1 @@
-MD5 (eog-0.3.tar.gz) = 78a814a9f7b2de19b6eb0b44ad5ff9ff
+MD5 (eog-0.4.tar.gz) = ed921c1a38316b3e126cf8a1a4fa6453
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 5a41b4819701..4c7b6e068bbe 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -1,5 +1,31 @@
+bin/bonobo-image-generic
 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
 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/oaf/image-generic.oafinfo
 share/gnome/pixmaps/gnome-eog.png
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
@@ -22,6 +48,21 @@ share/locale/no/LC_MESSAGES/eog.mo
 share/locale/pl/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_TW.Big5/LC_MESSAGES/eog.mo
+@dirrm share/gnome/help/eog/C/fig
+@dirrm share/gnome/help/eog/C
+@dirrm share/gnome/help/eog
+@dirrm share/gnome/eog/glade
+@dirrm share/gnome/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
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index de49acb84006..f121692169c8 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	eog
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
+		glade.4:${PORTSDIR}/devel/libglade \
+		bonobo.2:${PORTSDIR}/devel/bonobo \
+		gconf-1.0:${PORTSDIR}/devel/gconf
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--without-bonobo
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 008d3d4e1797..5838352faddd 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (eog-0.3.tar.gz) = 78a814a9f7b2de19b6eb0b44ad5ff9ff
+MD5 (eog-0.4.tar.gz) = ed921c1a38316b3e126cf8a1a4fa6453
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index 5a41b4819701..4c7b6e068bbe 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,5 +1,31 @@
+bin/bonobo-image-generic
 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
 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/oaf/image-generic.oafinfo
 share/gnome/pixmaps/gnome-eog.png
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
@@ -22,6 +48,21 @@ share/locale/no/LC_MESSAGES/eog.mo
 share/locale/pl/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_TW.Big5/LC_MESSAGES/eog.mo
+@dirrm share/gnome/help/eog/C/fig
+@dirrm share/gnome/help/eog/C
+@dirrm share/gnome/help/eog
+@dirrm share/gnome/eog/glade
+@dirrm share/gnome/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