Update graphics/f-spot to 0.6.0.0.

PR:		ports/137546
Submitted by:	Romain Tartiere

4 files changed, 60 insertions, 40 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 45ff4ed591ce..5e44274003e7 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -3,12 +3,10 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.45 2007/08/26 05:10:23 killfill Exp $
 #
 
 PORTNAME=	f-spot
-PORTVERSION=	0.5.0.3
-PORTREVISION=	2
+PORTVERSION=	0.6.0.0
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -38,16 +36,8 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} 's|target="liblcms.so.1"|target="liblcms.so"|g ; \
-		s|target="libexif.so.@EXIF_SOVERSION@"|target="libexif.so"|g' \
-		${WRKSRC}/src/f-spot.exe.config.in
-	@${REINPLACE_CMD} 's|target="libgphoto2.so.2"|target="libgphoto2.so"|g'\
-	    	${WRKSRC}/libgphoto2-sharp/libgphoto2-sharp.dll.config
 	@${REINPLACE_CMD} 's|#!/bin/bash|#!/usr/bin/env bash|g' \
 		${WRKSRC}/src/f-spot.in \
 		${WRKSRC}/tools/f-spot-import
-	@${REINPLACE_CMD} 's|G_GNUC_FUNCTION|G_STRLOC|g' \
-		${WRKSRC}/libfspot/f-jpeg-utils.c
 
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index 23ca18a8c97c..b17cfd485215 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,3 +1,3 @@
-MD5 (f-spot-0.5.0.3.tar.bz2) = 52db86f1dc715a3958425aa3d006c900
-SHA256 (f-spot-0.5.0.3.tar.bz2) = 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd
-SIZE (f-spot-0.5.0.3.tar.bz2) = 2776582
+MD5 (f-spot-0.6.0.0.tar.bz2) = 9115f9df72c5fc1c82eb46b3af01e67d
+SHA256 (f-spot-0.6.0.0.tar.bz2) = 90801e2f0d62a9b8710e214433dbac8d7b9cb2c8832cf03447cde15324bc6220
+SIZE (f-spot-0.6.0.0.tar.bz2) = 3006475
diff --git a/graphics/f-spot/files/patch-src-MainWindow.cs b/graphics/f-spot/files/patch-src-MainWindow.cs
deleted file mode 100644
index 941036ecb76a..000000000000
--- a/graphics/f-spot/files/patch-src-MainWindow.cs
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/MainWindow.cs.orig	2008-10-18 07:54:25.000000000 -0300
-+++ src/MainWindow.cs	2008-11-17 18:05:48.000000000 -0300
-@@ -2700,8 +2700,10 @@
- 		
- 		case Preferences.MAIN_WINDOW_WIDTH:
- 		case Preferences.MAIN_WINDOW_HEIGHT:
--			main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
--					   Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
-+			if (Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH) > 0 &&
-+						  Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT) > 0)
-+				main_window.Resize(Preferences.Get<int> (Preferences.MAIN_WINDOW_WIDTH),
-+						   Preferences.Get<int> (Preferences.MAIN_WINDOW_HEIGHT));
- 
- 			break;
- 		
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index 8b106794ecdd..fee670581633 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -3,12 +3,23 @@ bin/f-spot-import
 bin/f-spot-sqlite-upgrade
 lib/f-spot/Cms.dll
 lib/f-spot/Cms.dll.config
+lib/f-spot/Cms.dll.mdb
+lib/f-spot/FSpot.Bling.dll
+lib/f-spot/FSpot.Bling.dll.mdb
 lib/f-spot/FSpot.Core.dll
+lib/f-spot/FSpot.Core.dll.mdb
 lib/f-spot/FSpot.JobScheduler.dll
+lib/f-spot/FSpot.JobScheduler.dll.mdb
+lib/f-spot/FSpot.Platform.dll
+lib/f-spot/FSpot.Platform.dll.mdb
 lib/f-spot/FSpot.Query.dll
+lib/f-spot/FSpot.Query.dll.mdb
 lib/f-spot/FSpot.Utils.dll
 lib/f-spot/FSpot.Utils.dll.config
+lib/f-spot/FSpot.Utils.dll.mdb
 lib/f-spot/FSpot.Widgets.dll
+lib/f-spot/FSpot.Widgets.dll.config
+lib/f-spot/FSpot.Widgets.dll.mdb
 lib/f-spot/FlickrNet.dll
 lib/f-spot/Mono.Addins.Gui.dll
 lib/f-spot/Mono.Addins.Setup.dll
@@ -44,28 +55,25 @@ lib/f-spot/extensions/TabbloExport.dll
 lib/f-spot/extensions/ZipExport.dll
 lib/f-spot/f-spot.exe
 lib/f-spot/f-spot.exe.config
+lib/f-spot/f-spot.exe.mdb
 lib/f-spot/f-spot.global.addins
 lib/f-spot/gio-sharp.dll
 lib/f-spot/gio-sharp.dll.config
+lib/f-spot/gkeyfile-sharp.dll
 lib/f-spot/gnome-keyring-sharp.dll
+lib/f-spot/gtk-sharp-beans.dll
+lib/f-spot/gtk-sharp-beans.dll.config
 lib/f-spot/libfspot.a
 lib/f-spot/libfspot.la
 lib/f-spot/libfspot.so
 lib/f-spot/libfspot.so.0
-lib/f-spot/libfspoteog.a
-lib/f-spot/libfspoteog.la
-lib/f-spot/libfspoteog.so
-lib/f-spot/libfspoteog.so.0
 lib/f-spot/libfspotjpegtran.a
 lib/f-spot/libfspotjpegtran.la
 lib/f-spot/libfspotjpegtran.so
 lib/f-spot/libfspotjpegtran.so.0
 lib/f-spot/libgphoto2-sharp.dll
 lib/f-spot/libgphoto2-sharp.dll.config
-lib/gio-sharp-unstable/gio-sharp.dll
-lib/gio-sharp-unstable/gio-sharp.dll.config
 libdata/pkgconfig/f-spot.pc
-libdata/pkgconfig/gio-sharp-unstable.pc
 libexec/gnome-screensaver/f-spot-screensaver
 share/applications/f-spot-import.desktop
 share/applications/f-spot-view.desktop
@@ -146,6 +154,7 @@ share/applications/screensavers/f-spot-screensaver.desktop
 %%DATADIR%%/icons/hicolor/24x24/places/film-roll.png
 %%DATADIR%%/icons/hicolor/24x24/status/mode-browse.png
 %%DATADIR%%/icons/hicolor/24x24/status/mode-image-edit.png
+%%DATADIR%%/icons/hicolor/256x256/apps/f-spot.png
 %%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-left.png
 %%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-right.png
 %%DATADIR%%/icons/hicolor/32x32/actions/view-fullscreen.png
@@ -162,7 +171,6 @@ share/applications/screensavers/f-spot-screensaver.desktop
 %%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/view-fullscreen.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/view-restore.svg
-%%DATADIR%%/icons/hicolor/scalable/apps/f-spot.svg
 %%DATADIR%%/icons/hicolor/scalable/emblems/emblem-event.svg
 %%DATADIR%%/icons/hicolor/scalable/emblems/emblem-places.svg
 %%DATADIR%%/icons/hicolor/scalable/status/mode-browse.svg
@@ -177,6 +185,17 @@ share/gnome/help/f-spot/C/figures/f-spot-sepia.png
 share/gnome/help/f-spot/C/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/C/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/C/figures/f-spot-straighten.png
+share/gnome/help/f-spot/cs/f-spot.xml
+share/gnome/help/f-spot/cs/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/cs/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/cs/figures/f-spot-crop.png
+share/gnome/help/f-spot/cs/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/cs/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/cs/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/cs/figures/f-spot-sepia.png
+share/gnome/help/f-spot/cs/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/cs/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/cs/figures/f-spot-straighten.png
 share/gnome/help/f-spot/da/f-spot.xml
 share/gnome/help/f-spot/da/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/da/figures/f-spot-autocolor.png
@@ -188,6 +207,17 @@ share/gnome/help/f-spot/da/figures/f-spot-sepia.png
 share/gnome/help/f-spot/da/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/da/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/da/figures/f-spot-straighten.png
+share/gnome/help/f-spot/de/f-spot.xml
+share/gnome/help/f-spot/de/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/de/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/de/figures/f-spot-crop.png
+share/gnome/help/f-spot/de/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/de/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/de/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/de/figures/f-spot-sepia.png
+share/gnome/help/f-spot/de/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/de/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/de/figures/f-spot-straighten.png
 share/gnome/help/f-spot/es/f-spot.xml
 share/gnome/help/f-spot/es/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/es/figures/f-spot-autocolor.png
@@ -268,9 +298,11 @@ share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
 share/icons/hicolor/16x16/apps/f-spot.png
 share/icons/hicolor/22x22/apps/f-spot.png
 share/icons/hicolor/24x24/apps/f-spot.png
+share/icons/hicolor/256x256/apps/f-spot.png
 share/icons/hicolor/32x32/apps/f-spot.png
-share/icons/hicolor/scalable/apps/f-spot.svg
+share/icons/hicolor/48x48/apps/f-spot.png
 share/locale/ar/LC_MESSAGES/f-spot.mo
+share/locale/as/LC_MESSAGES/f-spot.mo
 share/locale/be@latin/LC_MESSAGES/f-spot.mo
 share/locale/bg/LC_MESSAGES/f-spot.mo
 share/locale/ca/LC_MESSAGES/f-spot.mo
@@ -288,19 +320,23 @@ share/locale/fa/LC_MESSAGES/f-spot.mo
 share/locale/fi/LC_MESSAGES/f-spot.mo
 share/locale/fr/LC_MESSAGES/f-spot.mo
 share/locale/gl/LC_MESSAGES/f-spot.mo
+share/locale/gu/LC_MESSAGES/f-spot.mo
 share/locale/he/LC_MESSAGES/f-spot.mo
 share/locale/hi/LC_MESSAGES/f-spot.mo
 share/locale/hu/LC_MESSAGES/f-spot.mo
 share/locale/it/LC_MESSAGES/f-spot.mo
 share/locale/ja/LC_MESSAGES/f-spot.mo
 share/locale/ka/LC_MESSAGES/f-spot.mo
+share/locale/kn/LC_MESSAGES/f-spot.mo
 share/locale/ko/LC_MESSAGES/f-spot.mo
 share/locale/lt/LC_MESSAGES/f-spot.mo
 share/locale/lv/LC_MESSAGES/f-spot.mo
 share/locale/mk/LC_MESSAGES/f-spot.mo
+share/locale/mr/LC_MESSAGES/f-spot.mo
 share/locale/nb/LC_MESSAGES/f-spot.mo
 share/locale/nl/LC_MESSAGES/f-spot.mo
 share/locale/oc/LC_MESSAGES/f-spot.mo
+share/locale/or/LC_MESSAGES/f-spot.mo
 share/locale/pa/LC_MESSAGES/f-spot.mo
 share/locale/pl/LC_MESSAGES/f-spot.mo
 share/locale/pt/LC_MESSAGES/f-spot.mo
@@ -311,6 +347,7 @@ share/locale/sk/LC_MESSAGES/f-spot.mo
 share/locale/sr/LC_MESSAGES/f-spot.mo
 share/locale/sr@latin/LC_MESSAGES/f-spot.mo
 share/locale/sv/LC_MESSAGES/f-spot.mo
+share/locale/ta/LC_MESSAGES/f-spot.mo
 share/locale/th/LC_MESSAGES/f-spot.mo
 share/locale/uk/LC_MESSAGES/f-spot.mo
 share/locale/vi/LC_MESSAGES/f-spot.mo
@@ -318,7 +355,9 @@ share/locale/zh_CN/LC_MESSAGES/f-spot.mo
 share/locale/zh_HK/LC_MESSAGES/f-spot.mo
 share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 share/omf/f-spot/f-spot-C.omf
+share/omf/f-spot/f-spot-cs.omf
 share/omf/f-spot/f-spot-da.omf
+share/omf/f-spot/f-spot-de.omf
 share/omf/f-spot/f-spot-es.omf
 share/omf/f-spot/f-spot-fr.omf
 share/omf/f-spot/f-spot-it.omf
@@ -341,14 +380,17 @@ share/omf/f-spot/f-spot-sv.omf
 @dirrm share/gnome/help/f-spot/fr
 @dirrm share/gnome/help/f-spot/es/figures
 @dirrm share/gnome/help/f-spot/es
+@dirrm share/gnome/help/f-spot/de/figures
+@dirrm share/gnome/help/f-spot/de
 @dirrm share/gnome/help/f-spot/da/figures
 @dirrm share/gnome/help/f-spot/da
+@dirrm share/gnome/help/f-spot/cs/figures
+@dirrm share/gnome/help/f-spot/cs
 @dirrm share/gnome/help/f-spot/C/figures
 @dirrm share/gnome/help/f-spot/C
 @dirrm share/gnome/help/f-spot
 @dirrm %%DATADIR%%/icons/hicolor/scalable/status
 @dirrm %%DATADIR%%/icons/hicolor/scalable/emblems
-@dirrm %%DATADIR%%/icons/hicolor/scalable/apps
 @dirrm %%DATADIR%%/icons/hicolor/scalable/actions
 @dirrm %%DATADIR%%/icons/hicolor/scalable
 @dirrm %%DATADIR%%/icons/hicolor/32x32/status
@@ -357,6 +399,8 @@ share/omf/f-spot/f-spot-sv.omf
 @dirrm %%DATADIR%%/icons/hicolor/32x32/apps
 @dirrm %%DATADIR%%/icons/hicolor/32x32/actions
 @dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/256x256/apps
+@dirrm %%DATADIR%%/icons/hicolor/256x256
 @dirrm %%DATADIR%%/icons/hicolor/24x24/status
 @dirrm %%DATADIR%%/icons/hicolor/24x24/places
 @dirrm %%DATADIR%%/icons/hicolor/24x24/emblems
@@ -381,8 +425,9 @@ share/omf/f-spot/f-spot-sv.omf
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
 @dirrmtry share/applications/screensavers
 @dirrmtry libexec/gnome-screensaver
-@dirrm lib/gio-sharp-unstable
 @dirrm lib/f-spot/extensions
 @dirrm lib/f-spot