Add CONFLICTS with the each others.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15852 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 716 insertions, 2 deletions

diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
new file mode 100644
index 000000000..47a6c0ea2
--- /dev/null
+++ b/graphics/eog-plugins/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:	eog-plugins
+# Date created:		28 August 2009
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/graphics/eog-plugins/Makefile,v 1.8 2011/03/04 02:15:08 wen Exp $
+#   $MCom: ports/graphics/eog-plugins/Makefile,v 1.14 2010/09/04 18:09:30 kwm Exp $
+#
+
+PORTNAME=	eog-plugins
+PORTVERSION=	2.30.1
+PORTREVISION=	2
+CATEGORIES=	graphics gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Plug-ins for the Eye of GNOME image viewer application
+
+BUILD_DEPENDS=	eog:${PORTSDIR}/graphics/eog
+LIB_DEPENDS=	gdata.7:${PORTSDIR}/devel/libgdata
+RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
+
+CONFLICTS=	eog-plugins-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
+WANT_GNOME=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_CHAMPLAIN) || \
+    (exists(${LOCALBASE}/lib/libchamplain-0.8.so)) || defined(WITH_CHAMPLIAN)
+LIB_DEPENDS+=	champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
+PLIST_SUB+=	CHAMPLAIN=""
+.else
+PLUST_SUB+=	CHAMPLAIN="@comment "
+.endif
+
+.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
+	defined(WITH_EXIF))
+LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+PLIST_SUB+=	EXIF=""
+.else
+PLIST_SUB+=	EXIF="@comment "
+.endif
+
+.if ${HAVE_GNOME:Mpygnome2}!=""
+USE_GNOME+=	pygnome2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|champlain-0.4|champlain-0.8|g' \
+		-e 's|champlain-gtk-0.4|champlain-gtk-0.8|g' \
+		${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/graphics/eog-plugins/distinfo b/graphics/eog-plugins/distinfo
new file mode 100644
index 000000000..479adc45f
--- /dev/null
+++ b/graphics/eog-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/eog-plugins-2.30.1.tar.bz2) = 72b89b93e56d1fb58480cb8dd3d980d7
+SHA256 (gnome2/eog-plugins-2.30.1.tar.bz2) = 0e651053367e1d6aecfb8058a93dcac2223ec822a691ee134e9a879662580caf
+SIZE (gnome2/eog-plugins-2.30.1.tar.bz2) = 344700
diff --git a/graphics/eog-plugins/pkg-descr b/graphics/eog-plugins/pkg-descr
new file mode 100644
index 000000000..7eed446bb
--- /dev/null
+++ b/graphics/eog-plugins/pkg-descr
@@ -0,0 +1,2 @@
+EoG-plugins is a collection of plugins for use with the Eye of GNOME Image
+Viewer.
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
new file mode 100644
index 000000000..4d8d40e9b
--- /dev/null
+++ b/graphics/eog-plugins/pkg-plist
@@ -0,0 +1,86 @@
+%%PYTHON%%lib/eog/plugins/console.py
+%%PYTHON%%lib/eog/plugins/console.pyc
+%%PYTHON%%lib/eog/plugins/console.pyo
+%%EXIF%%lib/eog/plugins/exif-display.eog-plugin
+%%EXIF%%lib/eog/plugins/exif-display/exif-display-config.ui
+%%EXIF%%lib/eog/plugins/exif-display/exif-display.ui
+lib/eog/plugins/fit-to-width.eog-plugin
+%%EXIF%%lib/eog/plugins/libexif-display.la
+%%EXIF%%lib/eog/plugins/libexif-display.so
+lib/eog/plugins/libfit-to-width.la
+lib/eog/plugins/libfit-to-width.so
+%%CHAMPLAIN%%lib/eog/plugins/libmap.la
+%%CHAMPLAIN%%lib/eog/plugins/libmap.so
+lib/eog/plugins/libpostasa.la
+lib/eog/plugins/libpostasa.so
+lib/eog/plugins/libsend-by-mail.la
+lib/eog/plugins/libsend-by-mail.so
+%%CHAMPLAIN%%lib/eog/plugins/map.eog-plugin
+lib/eog/plugins/postasa.eog-plugin
+lib/eog/plugins/postasa/postasa-config.xml
+lib/eog/plugins/postasa/postasa-uploads.xml
+%%PYTHON%%lib/eog/plugins/pythonconsole.eog-plugin
+%%PYTHON%%lib/eog/plugins/pythonconsole.py
+%%PYTHON%%lib/eog/plugins/pythonconsole.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole.pyo
+lib/eog/plugins/send-by-mail.eog-plugin
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.eog-plugin
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.py
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyc
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyo
+share/locale/ar/LC_MESSAGES/eog-plugins.mo
+share/locale/as/LC_MESSAGES/eog-plugins.mo
+share/locale/be@latin/LC_MESSAGES/eog-plugins.mo
+share/locale/bg/LC_MESSAGES/eog-plugins.mo
+share/locale/bn_IN/LC_MESSAGES/eog-plugins.mo
+share/locale/ca/LC_MESSAGES/eog-plugins.mo
+share/locale/cs/LC_MESSAGES/eog-plugins.mo
+share/locale/da/LC_MESSAGES/eog-plugins.mo
+share/locale/de/LC_MESSAGES/eog-plugins.mo
+share/locale/el/LC_MESSAGES/eog-plugins.mo
+share/locale/en_GB/LC_MESSAGES/eog-plugins.mo
+share/locale/es/LC_MESSAGES/eog-plugins.mo
+share/locale/eu/LC_MESSAGES/eog-plugins.mo
+share/locale/fi/LC_MESSAGES/eog-plugins.mo
+share/locale/fr/LC_MESSAGES/eog-plugins.mo
+share/locale/gl/LC_MESSAGES/eog-plugins.mo
+share/locale/gu/LC_MESSAGES/eog-plugins.mo
+share/locale/hu/LC_MESSAGES/eog-plugins.mo
+share/locale/id/LC_MESSAGES/eog-plugins.mo
+share/locale/it/LC_MESSAGES/eog-plugins.mo
+share/locale/ja/LC_MESSAGES/eog-plugins.mo
+share/locale/kn/LC_MESSAGES/eog-plugins.mo
+share/locale/lt/LC_MESSAGES/eog-plugins.mo
+share/locale/mk/LC_MESSAGES/eog-plugins.mo
+share/locale/ml/LC_MESSAGES/eog-plugins.mo
+share/locale/mr/LC_MESSAGES/eog-plugins.mo
+share/locale/nb/LC_MESSAGES/eog-plugins.mo
+share/locale/or/LC_MESSAGES/eog-plugins.mo
+share/locale/pa/LC_MESSAGES/eog-plugins.mo
+share/locale/pl/LC_MESSAGES/eog-plugins.mo
+share/locale/pt/LC_MESSAGES/eog-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/eog-plugins.mo
+share/locale/sl/LC_MESSAGES/eog-plugins.mo
+share/locale/sq/LC_MESSAGES/eog-plugins.mo
+share/locale/sv/LC_MESSAGES/eog-plugins.mo
+share/locale/ta/LC_MESSAGES/eog-plugins.mo
+share/locale/te/LC_MESSAGES/eog-plugins.mo
+share/locale/uk/LC_MESSAGES/eog-plugins.mo
+share/locale/vi/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo
+@dirrm lib/eog/plugins/postasa
+%%EXIF%%@dirrm lib/eog/plugins/exif-display
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/graphics/eog-plugins3/Makefile b/graphics/eog-plugins3/Makefile
index 14d46ed70..35ae904f8 100644
--- a/graphics/eog-plugins3/Makefile
+++ b/graphics/eog-plugins3/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog-plugins3/Makefile,v 1.2 2011/03/22 12:11:41 kwm Exp $
+#   $MCom: ports/graphics/eog-plugins3/Makefile,v 1.3 2011/04/22 10:44:44 kwm Exp $
 #
 
 PORTNAME=	eog-plugins
@@ -20,6 +20,8 @@ LIB_DEPENDS=	gdata.11:${PORTSDIR}/devel/libgdata08 \
 		peas-1.0.0:${PORTSDIR}/devel/libpeas
 RUN_DEPENDS=	eog>=2.91.0:${PORTSDIR}/graphics/eog3
 
+CONFLICTS=	eog-plugins-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk30
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
new file mode 100644
index 000000000..67d4126cb
--- /dev/null
+++ b/graphics/eog/Makefile
@@ -0,0 +1,77 @@
+# New ports collection makefile for:	eog2
+# Date created:		21 May 2002
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/graphics/eog/Makefile,v 1.81 2011/03/05 12:05:28 miwi Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.123 2010/11/16 10:11:41 kwm Exp $
+#
+
+PORTNAME=	eog
+PORTVERSION=	2.32.1
+PORTREVISION=	2
+CATEGORIES=	graphics gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The Eye Of Gnome image viewer
+
+BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
+		update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
+		update-mime-database:${PORTSDIR}/misc/shared-mime-info
+
+CONFLICTS=	eog-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \
+		gconf2 gnomedesktop
+WANT_GNOME=	yes
+INSTALLS_ICONS=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+GNU_CONFIGURE=	yes
+GNOME_DESKTOP_VERSION=2
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	eog.schemas
+
+.include <bsd.port.pre.mk>
+
+_WITH_EXIF=	no
+_WITH_EXEMPI=	no
+
+.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
+	defined(WITH_EXIF))
+LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+PLIST_SUB+=	EXIF=""
+_WITH_EXIF=	yes
+.else
+PLIST_SUB+=	EXIF="@comment "
+.endif
+
+.if !defined(WITHOUT_EXEMPI) || (exists(${LOCALBASE}/lib/libexempi.so)) || \
+    	defined(WITH_EXEMPI)
+LIB_DEPENDS+=	exempi.3:${PORTSDIR}/textproc/exempi
+_WITH_EXEMPI=	yes
+.endif
+
+.if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
+PLIST_SUB+=	EXIFEXEMPI=""
+.else
+PLIST_SUB+=	EXIFEXEMPI="@comment "
+.endif
+
+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_GNOME+=	pygtk2
+CONFIGURE_ARGS+=--enable-python
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+
+post-install:
+	@-update-desktop-database > /dev/null
+
+.include <bsd.port.post.mk>
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
new file mode 100644
index 000000000..f47a31c3c
--- /dev/null
+++ b/graphics/eog/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/eog-2.32.1.tar.bz2) = 543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078
+SIZE (gnome2/eog-2.32.1.tar.bz2) = 2804681
diff --git a/graphics/eog/pkg-descr b/graphics/eog/pkg-descr
new file mode 100644
index 000000000..920f1863a
--- /dev/null
+++ b/graphics/eog/pkg-descr
@@ -0,0 +1,5 @@
+This is the Eye of Gnome, a GNOME 2 image viewer and cataloging
+application.  It provides inline image viewing support for
+nautilus.
+
+WWW: http://www.gnome.org/gnome-office/eog.shtml
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
new file mode 100644
index 000000000..92f6c69b2
--- /dev/null
+++ b/graphics/eog/pkg-plist
@@ -0,0 +1,469 @@
+bin/eog
+include/eog-2.20/eog/eog-application.h
+include/eog-2.20/eog/eog-debug.h
+include/eog-2.20/eog/eog-dialog.h
+include/eog-2.20/eog/eog-enums.h
+include/eog-2.20/eog/eog-error-message-area.h
+%%EXIFEXEMPI%%include/eog-2.20/eog/eog-exif-details.h
+%%EXIF%%include/eog-2.20/eog/eog-exif-util.h
+include/eog-2.20/eog/eog-file-chooser.h
+include/eog-2.20/eog/eog-image-save-info.h
+include/eog-2.20/eog/eog-image.h
+include/eog-2.20/eog/eog-job-queue.h
+include/eog-2.20/eog/eog-jobs.h
+include/eog-2.20/eog/eog-list-store.h
+include/eog-2.20/eog/eog-plugin.h
+include/eog-2.20/eog/eog-properties-dialog.h
+include/eog-2.20/eog/eog-scroll-view.h
+include/eog-2.20/eog/eog-sidebar.h
+include/eog-2.20/eog/eog-statusbar.h
+include/eog-2.20/eog/eog-thumb-nav.h
+include/eog-2.20/eog/eog-thumb-view.h
+include/eog-2.20/eog/eog-thumbnail.h
+include/eog-2.20/eog/eog-transform.h
+include/eog-2.20/eog/eog-window.h
+lib/eog/plugins/fullscreen.eog-plugin
+lib/eog/plugins/libfullscreen.la
+lib/eog/plugins/libfullscreen.so
+lib/eog/plugins/libreload.la
+lib/eog/plugins/libreload.so
+lib/eog/plugins/libstatusbar-date.la
+lib/eog/plugins/libstatusbar-date.so
+lib/eog/plugins/reload.eog-plugin
+lib/eog/plugins/statusbar-date.eog-plugin
+libdata/pkgconfig/eog.pc
+share/applications/eog.desktop
+%%DOCSDIR%%/EogDialog.html
+%%DOCSDIR%%/EogExifDetails.html
+%%DOCSDIR%%/EogFileChooser.html
+%%DOCSDIR%%/EogImageSaveInfo.html
+%%DOCSDIR%%/EogMetadataReaderJpg.html
+%%DOCSDIR%%/EogMetadataReaderPng.html
+%%DOCSDIR%%/EogPluginManager.html
+%%DOCSDIR%%/EogPreferencesDialog.html
+%%DOCSDIR%%/EogPrintImageSetup.html
+%%DOCSDIR%%/EogPrintPreview.html
+%%DOCSDIR%%/EogScrollView.html
+%%DOCSDIR%%/EogSidebar.html
+%%DOCSDIR%%/EogStatusbar.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/eog-eog-application.html
+%%DOCSDIR%%/eog-eog-config-keys.html
+%%DOCSDIR%%/eog-eog-debug.html
+%%DOCSDIR%%/eog-eog-error-message-area.html
+%%DOCSDIR%%/eog-eog-exif-util.html
+%%DOCSDIR%%/eog-eog-image.html
+%%DOCSDIR%%/eog-eog-jobs.html
+%%DOCSDIR%%/eog-eog-job-queue.html
+%%DOCSDIR%%/eog-eog-list-store.html
+%%DOCSDIR%%/eog-eog-metadata-reader.html
+%%DOCSDIR%%/eog-eog-pixbuf-util.html
+%%DOCSDIR%%/eog-eog-plugin.html
+%%DOCSDIR%%/eog-eog-plugin-engine.html
+%%DOCSDIR%%/eog-eog-print.html
+%%DOCSDIR%%/eog-eog-properties-dialog.html
+%%DOCSDIR%%/eog-eog-save-as-dialog-helper.html
+%%DOCSDIR%%/eog-eog-session.html
+%%DOCSDIR%%/eog-eog-thumb-nav.html
+%%DOCSDIR%%/eog-eog-thumb-view.html
+%%DOCSDIR%%/eog-eog-thumbnail.html
+%%DOCSDIR%%/eog-eog-transform.html
+%%DOCSDIR%%/eog-eog-uri-converter.html
+%%DOCSDIR%%/eog-eog-util.html
+%%DOCSDIR%%/eog-uta.html
+%%DOCSDIR%%/eog-eog-window.html
+%%DOCSDIR%%/eog-zoom.html
+%%DOCSDIR%%/eog.devhelp
+%%DOCSDIR%%/eog.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DATADIR%%/eog-image-properties-dialog.ui
+%%DATADIR%%/eog-multiple-save-as-dialog.ui
+%%DATADIR%%/eog-preferences-dialog.ui
+%%DATADIR%%/eog-toolbar.xml
+%%DATADIR%%/eog-ui.xml
+%%DATADIR%%/gtkrc
+%%DATADIR%%/icons/hicolor/16x16/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/16x16/actions/eog-plugin.png
+%%DATADIR%%/icons/hicolor/16x16/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eog-plugin.png
+%%DATADIR%%/icons/hicolor/22x22/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/24x24/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/24x24/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/32x32/actions/eog-image-collection.png
+%%DATADIR%%/icons/hicolor/32x32/actions/eog-plugin.png
+%%DATADIR%%/icons/hicolor/32x32/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/48x48/actions/slideshow-play.png
+%%DATADIR%%/icons/hicolor/scalable/actions/eog-image-collection.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/eog-plugin.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/slideshow-play.svg
+%%DATADIR%%/pixmaps/thumbnail-frame.png
+share/gnome/help/eog/C/eog.xml
+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/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/C/legal.xml
+share/gnome/help/eog/ar/eog.xml
+share/gnome/help/eog/ar/figures/eog_save_as_window.png
+share/gnome/help/eog/ar/figures/eog_start_window.png
+share/gnome/help/eog/ar/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/ca/eog.xml
+share/gnome/help/eog/ca/figures/eog_save_as_window.png
+share/gnome/help/eog/ca/figures/eog_start_window.png
+share/gnome/help/eog/ca/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/cs/eog.xml
+share/gnome/help/eog/cs/figures/eog_save_as_window.png
+share/gnome/help/eog/cs/figures/eog_start_window.png
+share/gnome/help/eog/cs/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/da/eog.xml
+share/gnome/help/eog/da/figures/eog_save_as_window.png
+share/gnome/help/eog/da/figures/eog_start_window.png
+share/gnome/help/eog/da/figures/eog_toolbar_editor_window.png
+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/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/el/eog.xml
+share/gnome/help/eog/el/figures/eog_save_as_window.png
+share/gnome/help/eog/el/figures/eog_start_window.png
+share/gnome/help/eog/el/figures/eog_toolbar_editor_window.png
+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/en_GB/figures/eog_toolbar_editor_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
+share/gnome/help/eog/es/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/eu/eog.xml
+share/gnome/help/eog/eu/figures/eog_save_as_window.png
+share/gnome/help/eog/eu/figures/eog_start_window.png
+share/gnome/help/eog/eu/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/fi/eog.xml
+share/gnome/help/eog/fi/figures/eog_save_as_window.png
+share/gnome/help/eog/fi/figures/eog_start_window.png
+share/gnome/help/eog/fi/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/fr/eog.xml
+share/gnome/help/eog/fr/figures/eog_save_as_window.png
+share/gnome/help/eog/fr/figures/eog_start_window.png
+share/gnome/help/eog/fr/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/it/eog.xml
+share/gnome/help/eog/it/figures/eog_save_as_window.png
+share/gnome/help/eog/it/figures/eog_start_window.png
+share/gnome/help/eog/it/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/ja/eog.xml
+share/gnome/help/eog/ja/figures/eog_save_as_window.png
+share/gnome/help/eog/ja/figures/eog_start_window.png
+share/gnome/help/eog/ja/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/ko/eog.xml
+share/gnome/help/eog/ko/figures/eog_save_as_window.png
+share/gnome/help/eog/ko/figures/eog_start_window.png
+share/gnome/help/eog/ko/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/oc/eog.xml
+share/gnome/help/eog/oc/figures/eog_save_as_window.png
+share/gnome/help/eog/oc/figures/eog_start_window.png
+share/gnome/help/eog/oc/figures/eog_toolbar_editor_window.png
+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/pa/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/pl/eog.xml
+share/gnome/help/eog/pl/figures/eog_save_as_window.png
+share/gnome/help/eog/pl/figures/eog_start_window.png
+share/gnome/help/eog/pl/figures/eog_toolbar_editor_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/pt_BR/figures/eog_toolbar_editor_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/ru/figures/eog_toolbar_editor_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
+share/gnome/help/eog/sv/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/th/eog.xml
+share/gnome/help/eog/th/figures/eog_save_as_window.png
+share/gnome/help/eog/th/figures/eog_start_window.png
+share/gnome/help/eog/th/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/uk/eog.xml
+share/gnome/help/eog/uk/figures/eog_save_as_window.png
+share/gnome/help/eog/uk/figures/eog_start_window.png
+share/gnome/help/eog/uk/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/zh_CN/eog.xml
+share/gnome/help/eog/zh_CN/figures/eog_save_as_window.png
+share/gnome/help/eog/zh_CN/figures/eog_start_window.png
+share/gnome/help/eog/zh_CN/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/zh_TW/eog.xml
+share/gnome/help/eog/zh_TW/figures/eog_save_as_window.png
+share/gnome/help/eog/zh_TW/figures/eog_start_window.png
+share/gnome/help/eog/zh_TW/figures/eog_toolbar_editor_window.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
+share/locale/as/LC_MESSAGES/eog.mo
+share/locale/ast/LC_MESSAGES/eog.mo
+share/locale/az/LC_MESSAGES/eog.mo
+share/locale/be/LC_MESSAGES/eog.mo
+share/locale/be@latin/LC_MESSAGES/eog.mo
+share/locale/bg/LC_MESSAGES/eog.mo
+share/locale/bn/LC_MESSAGES/eog.mo
+share/locale/bn_IN/LC_MESSAGES/eog.mo
+share/locale/br/LC_MESSAGES/eog.mo
+share/locale/bs/LC_MESSAGES/eog.mo
+share/locale/ca/LC_MESSAGES/eog.mo
+share/locale/ca@valencia/LC_MESSAGES/eog.mo
+share/locale/cs/LC_MESSAGES/eog.mo
+share/locale/cy/LC_MESSAGES/eog.mo
+share/locale/da/LC_MESSAGES/eog.mo
+share/locale/de/LC_MESSAGES/eog.mo
+share/locale/dz/LC_MESSAGES/eog.mo
+share/locale/el/LC_MESSAGES/eog.mo
+share/locale/en@shaw/LC_MESSAGES/eog.mo
+share/locale/en_CA/LC_MESSAGES/eog.mo
+share/locale/en_GB/LC_MESSAGES/eog.mo
+share/locale/es/LC_MESSAGES/eog.mo
+share/locale/et/LC_MESSAGES/eog.mo
+share/locale/eu/LC_MESSAGES/eog.mo
+share/locale/fa/LC_MESSAGES/eog.mo
+share/locale/fi/LC_MESSAGES/eog.mo
+share/locale/fr/LC_MESSAGES/eog.mo
+share/locale/fur/LC_MESSAGES/eog.mo
+share/locale/ga/LC_MESSAGES/eog.mo
+share/locale/gl/LC_MESSAGES/eog.mo
+share/locale/gu/LC_MESSAGES/eog.mo
+share/locale/he/LC_MESSAGES/eog.mo
+share/locale/hi/LC_MESSAGES/eog.mo
+share/locale/hr/LC_MESSAGES/eog.mo
+share/locale/hu/LC_MESSAGES/eog.mo
+share/locale/id/LC_MESSAGES/eog.mo
+share/locale/is/LC_MESSAGES/eog.mo
+share/locale/it/LC_MESSAGES/eog.mo
+share/locale/ja/LC_MESSAGES/eog.mo
+share/locale/ka/LC_MESSAGES/eog.mo
+share/locale/kk/LC_MESSAGES/eog.mo
+share/locale/kn/LC_MESSAGES/eog.mo
+share/locale/ko/LC_MESSAGES/eog.mo
+share/locale/ks/LC_MESSAGES/eog.mo
+share/locale/ku/LC_MESSAGES/eog.mo
+share/locale/lt/LC_MESSAGES/eog.mo
+share/locale/lv/LC_MESSAGES/eog.mo
+share/locale/mai/LC_MESSAGES/eog.mo
+share/locale/mg/LC_MESSAGES/eog.mo
+share/locale/mk/LC_MESSAGES/eog.mo
+share/locale/ml/LC_MESSAGES/eog.mo
+share/locale/mn/LC_MESSAGES/eog.mo
+share/locale/mr/LC_MESSAGES/eog.mo
+share/locale/ms/LC_MESSAGES/eog.mo
+share/locale/nb/LC_MESSAGES/eog.mo
+share/locale/nds/LC_MESSAGES/eog.mo
+share/locale/ne/LC_MESSAGES/eog.mo
+share/locale/nl/LC_MESSAGES/eog.mo
+share/locale/nn/LC_MESSAGES/eog.mo
+share/locale/nso/LC_MESSAGES/eog.mo
+share/locale/oc/LC_MESSAGES/eog.mo
+share/locale/or/LC_MESSAGES/eog.mo
+share/locale/pa/LC_MESSAGES/eog.mo
+share/locale/pl/LC_MESSAGES/eog.mo
+share/locale/ps/LC_MESSAGES/eog.mo
+share/locale/pt/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/rw/LC_MESSAGES/eog.mo
+share/locale/si/LC_MESSAGES/eog.mo
+share/locale/sk/LC_MESSAGES/eog.mo
+share/locale/sl/LC_MESSAGES/eog.mo
+share/locale/sq/LC_MESSAGES/eog.mo
+share/locale/sr/LC_MESSAGES/eog.mo
+share/locale/sr@latin/LC_MESSAGES/eog.mo
+share/locale/sv/LC_MESSAGES/eog.mo
+share/locale/ta/LC_MESSAGES/eog.mo
+share/locale/te/LC_MESSAGES/eog.mo
+share/locale/th/LC_MESSAGES/eog.mo
+share/locale/tk/LC_MESSAGES/eog.mo
+share/locale/tr/LC_MESSAGES/eog.mo
+share/locale/ug/LC_MESSAGES/eog.mo
+share/locale/uk/LC_MESSAGES/eog.mo
+share/locale/uz/LC_MESSAGES/eog.mo
+share/locale/uz@cyrillic/LC_MESSAGES/eog.mo
+share/locale/vi/LC_MESSAGES/eog.mo
+share/locale/wa/LC_MESSAGES/eog.mo
+share/locale/xh/LC_MESSAGES/eog.mo
+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
+share/omf/eog/eog-C.omf
+share/omf/eog/eog-ar.omf
+share/omf/eog/eog-ca.omf
+share/omf/eog/eog-cs.omf
+share/omf/eog/eog-da.omf
+share/omf/eog/eog-de.omf
+share/omf/eog/eog-el.omf
+share/omf/eog/eog-en_GB.omf
+share/omf/eog/eog-es.omf
+share/omf/eog/eog-eu.omf
+share/omf/eog/eog-fi.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-oc.omf
+share/omf/eog/eog-pa.omf
+share/omf/eog/eog-pl.omf
+share/omf/eog/eog-pt_BR.omf
+share/omf/eog/eog-ru.omf
+share/omf/eog/eog-sv.omf
+share/omf/eog/eog-th.omf
+share/omf/eog/eog-uk.omf
+share/omf/eog/eog-zh_CN.omf
+share/omf/eog/eog-zh_TW.omf
+@dirrm share/omf/eog
+@dirrm share/gnome/help/eog/zh_TW/figures
+@dirrm share/gnome/help/eog/zh_TW
+@dirrm share/gnome/help/eog/zh_CN/figures
+@dirrm share/gnome/help/eog/zh_CN
+@dirrm share/gnome/help/eog/uk/figures
+@dirrm share/gnome/help/eog/uk
+@dirrm share/gnome/help/eog/th/figures
+@dirrm share/gnome/help/eog/th
+@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/pl/figures
+@dirrm share/gnome/help/eog/pl
+@dirrm share/gnome/help/eog/pa/figures
+@dirrm share/gnome/help/eog/pa
+@dirrm share/gnome/help/eog/oc/figures
+@dirrm share/gnome/help/eog/oc
+@dirrm share/gnome/help/eog/ko/figures
+@dirrm share/gnome/help/eog/ko
+@dirrm share/gnome/help/eog/ja/figures
+@dirrm share/gnome/help/eog/ja
+@dirrm share/gnome/help/eog/it/figures
+@dirrm share/gnome/help/eog/it
+@dirrm share/gnome/help/eog/fr/figures
+@dirrm share/gnome/help/eog/fr
+@dirrm share/gnome/help/eog/fi/figures
+@dirrm share/gnome/help/eog/fi
+@dirrm share/gnome/help/eog/eu/figures
+@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/el/figures
+@dirrm share/gnome/help/eog/el
+@dirrm share/gnome/help/eog/de/figures
+@dirrm share/gnome/help/eog/de
+@dirrm share/gnome/help/eog/da/figures
+@dirrm share/gnome/help/eog/da
+@dirrm share/gnome/help/eog/cs/figures
+@dirrm share/gnome/help/eog/cs
+@dirrm share/gnome/help/eog/ca/figures
+@dirrm share/gnome/help/eog/ca
+@dirrm share/gnome/help/eog/ar/figures
+@dirrm share/gnome/help/eog/ar
+@dirrm share/gnome/help/eog/C/figures
+@dirrm share/gnome/help/eog/C
+@dirrm share/gnome/help/eog
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrm lib/eog/plugins
+@dirrm lib/eog
+@dirrm include/eog-2.20/eog
+@dirrm include/eog-2.20
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ks/LC_MESSAGES
+@dirrmtry share/locale/ks
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/graphics/eog3/Makefile b/graphics/eog3/Makefile
index 093a8a126..c3e1bb9fd 100644
--- a/graphics/eog3/Makefile
+++ b/graphics/eog3/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog3/Makefile,v 1.8 2011/04/05 19:25:45 kwm Exp $
+#   $MCom: ports/graphics/eog3/Makefile,v 1.9 2011/04/10 19:41:35 mezz Exp $
 #
 
 PORTNAME=	eog
@@ -25,6 +25,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-i
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
+CONFLICTS=	eog-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack librsvg2 desktopfileutils gtk30 \