Fix the build

8 files changed, 400 insertions, 151 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 56d26a394ec..7f784697a12 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2015/05/23 07:01:03 kefren Exp $
+# $NetBSD: Makefile,v 1.70 2015/05/23 10:33:01 kefren Exp $
 #
 
 DISTNAME=	f-spot-0.8.2
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.8/}
 EXTRACT_SUFX=	.tar.bz2
@@ -55,6 +55,7 @@ GCONF_SCHEMAS=	f-spot.schemas
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/flickrnet/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
diff --git a/graphics/f-spot/PLIST b/graphics/f-spot/PLIST
index 736b07399ac..4b7ae94823e 100644
--- a/graphics/f-spot/PLIST
+++ b/graphics/f-spot/PLIST
@@ -1,14 +1,69 @@
-@comment $NetBSD: PLIST,v 1.5 2010/05/17 17:46:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/05/23 10:33:01 kefren Exp $
 bin/f-spot
 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/Extensions/FSpot.Editors.BWEditor.dll
+lib/f-spot/Extensions/FSpot.Editors.BWEditor.dll.mdb
+lib/f-spot/Extensions/FSpot.Editors.BlackoutEditor.dll
+lib/f-spot/Extensions/FSpot.Editors.BlackoutEditor.dll.mdb
+lib/f-spot/Extensions/FSpot.Editors.FlipEditor.dll
+lib/f-spot/Extensions/FSpot.Editors.FlipEditor.dll.mdb
+lib/f-spot/Extensions/FSpot.Editors.PixelateEditor.dll
+lib/f-spot/Extensions/FSpot.Editors.PixelateEditor.dll.mdb
+lib/f-spot/Extensions/FSpot.Editors.ResizeEditor.dll
+lib/f-spot/Extensions/FSpot.Editors.ResizeEditor.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.CD.dll
+lib/f-spot/Extensions/FSpot.Exporters.CD.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.CoverTransition.dll
+lib/f-spot/Extensions/FSpot.Exporters.CoverTransition.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.Facebook.dll
+lib/f-spot/Extensions/FSpot.Exporters.Facebook.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.Flickr.dll
+lib/f-spot/Extensions/FSpot.Exporters.Flickr.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.Folder.dll
+lib/f-spot/Extensions/FSpot.Exporters.Folder.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.Gallery.dll
+lib/f-spot/Extensions/FSpot.Exporters.Gallery.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.PicasaWeb.dll
+lib/f-spot/Extensions/FSpot.Exporters.PicasaWeb.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.SmugMug.dll
+lib/f-spot/Extensions/FSpot.Exporters.SmugMug.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.Tabblo.dll
+lib/f-spot/Extensions/FSpot.Exporters.Tabblo.dll.mdb
+lib/f-spot/Extensions/FSpot.Exporters.Zip.dll
+lib/f-spot/Extensions/FSpot.Exporters.Zip.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.ChangePhotoPath.dll
+lib/f-spot/Extensions/FSpot.Tools.ChangePhotoPath.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.DevelopInUFRaw.dll
+lib/f-spot/Extensions/FSpot.Tools.DevelopInUFRaw.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.LiveWebGallery.dll
+lib/f-spot/Extensions/FSpot.Tools.LiveWebGallery.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.MergeDb.dll
+lib/f-spot/Extensions/FSpot.Tools.MergeDb.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.RawPlusJpeg.dll
+lib/f-spot/Extensions/FSpot.Tools.RawPlusJpeg.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.RetroactiveRoll.dll
+lib/f-spot/Extensions/FSpot.Tools.RetroactiveRoll.dll.mdb
+lib/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll
+lib/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll.mdb
+lib/f-spot/Extensions/Mono.Google.dll
+lib/f-spot/Extensions/Mono.Google.dll.mdb
+lib/f-spot/Extensions/Mono.Tabblo.dll
+lib/f-spot/Extensions/Mono.Tabblo.dll.mdb
+lib/f-spot/Extensions/SmugMugNet.dll
+lib/f-spot/Extensions/SmugMugNet.dll.mdb
 lib/f-spot/FSpot.Bling.dll
 lib/f-spot/FSpot.Bling.dll.mdb
+lib/f-spot/FSpot.Cms.dll
+lib/f-spot/FSpot.Cms.dll.config
+lib/f-spot/FSpot.Cms.dll.mdb
+lib/f-spot/FSpot.Core.addins
 lib/f-spot/FSpot.Core.dll
+lib/f-spot/FSpot.Core.dll.config
 lib/f-spot/FSpot.Core.dll.mdb
+lib/f-spot/FSpot.Gui.dll
+lib/f-spot/FSpot.Gui.dll.config
+lib/f-spot/FSpot.Gui.dll.mdb
 lib/f-spot/FSpot.JobScheduler.dll
 lib/f-spot/FSpot.JobScheduler.dll.mdb
 lib/f-spot/FSpot.Platform.dll
@@ -18,48 +73,25 @@ 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.Google.dll
-lib/f-spot/Mono.Tabblo.dll
-lib/f-spot/SemWeb.dll
-lib/f-spot/SmugMugNet.dll
-lib/f-spot/extensions/CDExport.dll
-lib/f-spot/extensions/ChangePhotoPath.dll
-lib/f-spot/extensions/CoverTransition.dll
-lib/f-spot/extensions/DBusService.dll
-lib/f-spot/extensions/DevelopInUFRaw.dll
-lib/f-spot/extensions/FacebookExport.dll
-lib/f-spot/extensions/FlickrExport.dll
-lib/f-spot/extensions/FolderExport.dll
-lib/f-spot/extensions/GalleryExport.dll
-lib/f-spot/extensions/HashJob.dll
-lib/f-spot/extensions/LiveWebGallery.dll
-lib/f-spot/extensions/MergeDb.dll
-lib/f-spot/extensions/PicasaWebExport.dll
-lib/f-spot/extensions/RawPlusJpeg.dll
-lib/f-spot/extensions/RetroactiveRoll.dll
-lib/f-spot/extensions/ScreensaverConfig.dll
-lib/f-spot/extensions/SmugMugExport.dll
-lib/f-spot/extensions/TabbloExport.dll
-lib/f-spot/extensions/ZipExport.dll
+lib/f-spot/Hyena.Data.Sqlite.dll
+lib/f-spot/Hyena.Data.Sqlite.dll.mdb
+lib/f-spot/Hyena.Gui.dll
+lib/f-spot/Hyena.Gui.dll.config
+lib/f-spot/Hyena.Gui.dll.mdb
+lib/f-spot/Hyena.dll
+lib/f-spot/Hyena.dll.config
+lib/f-spot/Hyena.dll.mdb
+lib/f-spot/TagLib.dll
+lib/f-spot/TagLib.dll.mdb
 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.la
-lib/f-spot/libfspotjpegtran.la
-lib/f-spot/libgphoto2-sharp.dll
-lib/f-spot/libgphoto2-sharp.dll.config
-lib/f-spot/libgphoto2glue.la
 lib/f-spot/unique-sharp.dll
 lib/f-spot/unique-sharp.dll.config
 lib/pkgconfig/f-spot.pc
@@ -87,7 +119,6 @@ share/f-spot/icons/hicolor/16x16/actions/view-far.png
 share/f-spot/icons/hicolor/16x16/actions/view-fullscreen.png
 share/f-spot/icons/hicolor/16x16/actions/view-near.png
 share/f-spot/icons/hicolor/16x16/actions/view-restore.png
-share/f-spot/icons/hicolor/16x16/apps/f-spot.png
 share/f-spot/icons/hicolor/16x16/devices/camera-photo.png
 share/f-spot/icons/hicolor/16x16/emblems/emblem-event.png
 share/f-spot/icons/hicolor/16x16/emblems/emblem-people.png
@@ -112,7 +143,6 @@ share/f-spot/icons/hicolor/22x22/actions/view-far.png
 share/f-spot/icons/hicolor/22x22/actions/view-fullscreen.png
 share/f-spot/icons/hicolor/22x22/actions/view-near.png
 share/f-spot/icons/hicolor/22x22/actions/view-restore.png
-share/f-spot/icons/hicolor/22x22/apps/f-spot.png
 share/f-spot/icons/hicolor/22x22/devices/camera-photo.png
 share/f-spot/icons/hicolor/22x22/emblems/emblem-event.png
 share/f-spot/icons/hicolor/22x22/emblems/emblem-people.png
@@ -134,7 +164,6 @@ share/f-spot/icons/hicolor/24x24/actions/view-far.png
 share/f-spot/icons/hicolor/24x24/actions/view-fullscreen.png
 share/f-spot/icons/hicolor/24x24/actions/view-near.png
 share/f-spot/icons/hicolor/24x24/actions/view-restore.png
-share/f-spot/icons/hicolor/24x24/apps/f-spot.png
 share/f-spot/icons/hicolor/24x24/devices/camera-photo.png
 share/f-spot/icons/hicolor/24x24/emblems/emblem-event.png
 share/f-spot/icons/hicolor/24x24/emblems/emblem-people.png
@@ -143,12 +172,10 @@ share/f-spot/icons/hicolor/24x24/emblems/emblem-readonly.png
 share/f-spot/icons/hicolor/24x24/places/film-roll.png
 share/f-spot/icons/hicolor/24x24/status/mode-browse.png
 share/f-spot/icons/hicolor/24x24/status/mode-image-edit.png
-share/f-spot/icons/hicolor/256x256/apps/f-spot.png
 share/f-spot/icons/hicolor/32x32/actions/object-rotate-left.png
 share/f-spot/icons/hicolor/32x32/actions/object-rotate-right.png
 share/f-spot/icons/hicolor/32x32/actions/view-fullscreen.png
 share/f-spot/icons/hicolor/32x32/actions/view-restore.png
-share/f-spot/icons/hicolor/32x32/apps/f-spot.png
 share/f-spot/icons/hicolor/32x32/devices/camera-photo.png
 share/f-spot/icons/hicolor/32x32/emblems/emblem-event.png
 share/f-spot/icons/hicolor/32x32/emblems/emblem-people.png
@@ -163,7 +190,14 @@ share/f-spot/icons/hicolor/scalable/emblems/emblem-event.svg
 share/f-spot/icons/hicolor/scalable/emblems/emblem-places.svg
 share/f-spot/icons/hicolor/scalable/status/mode-browse.svg
 share/gconf/schemas/f-spot.schemas
-share/gnome/help/f-spot/C/f-spot.xml
+share/gnome/help/f-spot/C/23hq.page
+share/gnome/help/f-spot/C/adjust-color.page
+share/gnome/help/f-spot/C/cd.page
+share/gnome/help/f-spot/C/colors.page
+share/gnome/help/f-spot/C/date-search.page
+share/gnome/help/f-spot/C/enhancements.page
+share/gnome/help/f-spot/C/extensions.page
+share/gnome/help/f-spot/C/facebook.page
 share/gnome/help/f-spot/C/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/C/figures/f-spot-autocolor.png
 share/gnome/help/f-spot/C/figures/f-spot-crop.png
@@ -174,29 +208,35 @@ 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
-share/gnome/help/f-spot/da/figures/f-spot-crop.png
-share/gnome/help/f-spot/da/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/da/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/da/figures/f-spot-red-eye.png
-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/C/file-management.page
+share/gnome/help/f-spot/C/flickr.page
+share/gnome/help/f-spot/C/folder.page
+share/gnome/help/f-spot/C/general-editing.page
+share/gnome/help/f-spot/C/import-photos.page
+share/gnome/help/f-spot/C/import-roll-search.page
+share/gnome/help/f-spot/C/index.page
+share/gnome/help/f-spot/C/introduction.page
+share/gnome/help/f-spot/C/picasa.page
+share/gnome/help/f-spot/C/rate-search.page
+share/gnome/help/f-spot/C/ratings.page
+share/gnome/help/f-spot/C/smugmug.page
+share/gnome/help/f-spot/C/tag-attach.page
+share/gnome/help/f-spot/C/tag-creation.page
+share/gnome/help/f-spot/C/tag-delete.page
+share/gnome/help/f-spot/C/tag-remove.page
+share/gnome/help/f-spot/C/tag-search.page
+share/gnome/help/f-spot/C/tags.page
+share/gnome/help/f-spot/C/upload-to-web.page
+share/gnome/help/f-spot/C/versioning.page
+share/gnome/help/f-spot/C/zooomr.page
+share/gnome/help/f-spot/de/23hq.page
+share/gnome/help/f-spot/de/adjust-color.page
+share/gnome/help/f-spot/de/cd.page
+share/gnome/help/f-spot/de/colors.page
+share/gnome/help/f-spot/de/date-search.page
+share/gnome/help/f-spot/de/enhancements.page
+share/gnome/help/f-spot/de/extensions.page
+share/gnome/help/f-spot/de/facebook.page
 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
@@ -207,7 +247,35 @@ 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/de/file-management.page
+share/gnome/help/f-spot/de/flickr.page
+share/gnome/help/f-spot/de/folder.page
+share/gnome/help/f-spot/de/general-editing.page
+share/gnome/help/f-spot/de/import-photos.page
+share/gnome/help/f-spot/de/import-roll-search.page
+share/gnome/help/f-spot/de/index.page
+share/gnome/help/f-spot/de/introduction.page
+share/gnome/help/f-spot/de/picasa.page
+share/gnome/help/f-spot/de/rate-search.page
+share/gnome/help/f-spot/de/ratings.page
+share/gnome/help/f-spot/de/smugmug.page
+share/gnome/help/f-spot/de/tag-attach.page
+share/gnome/help/f-spot/de/tag-creation.page
+share/gnome/help/f-spot/de/tag-delete.page
+share/gnome/help/f-spot/de/tag-remove.page
+share/gnome/help/f-spot/de/tag-search.page
+share/gnome/help/f-spot/de/tags.page
+share/gnome/help/f-spot/de/upload-to-web.page
+share/gnome/help/f-spot/de/versioning.page
+share/gnome/help/f-spot/de/zooomr.page
+share/gnome/help/f-spot/es/23hq.page
+share/gnome/help/f-spot/es/adjust-color.page
+share/gnome/help/f-spot/es/cd.page
+share/gnome/help/f-spot/es/colors.page
+share/gnome/help/f-spot/es/date-search.page
+share/gnome/help/f-spot/es/enhancements.page
+share/gnome/help/f-spot/es/extensions.page
+share/gnome/help/f-spot/es/facebook.page
 share/gnome/help/f-spot/es/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/es/figures/f-spot-autocolor.png
 share/gnome/help/f-spot/es/figures/f-spot-crop.png
@@ -218,7 +286,35 @@ share/gnome/help/f-spot/es/figures/f-spot-sepia.png
 share/gnome/help/f-spot/es/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/es/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/es/figures/f-spot-straighten.png
-share/gnome/help/f-spot/fr/f-spot.xml
+share/gnome/help/f-spot/es/file-management.page
+share/gnome/help/f-spot/es/flickr.page
+share/gnome/help/f-spot/es/folder.page
+share/gnome/help/f-spot/es/general-editing.page
+share/gnome/help/f-spot/es/import-photos.page
+share/gnome/help/f-spot/es/import-roll-search.page
+share/gnome/help/f-spot/es/index.page
+share/gnome/help/f-spot/es/introduction.page
+share/gnome/help/f-spot/es/picasa.page
+share/gnome/help/f-spot/es/rate-search.page
+share/gnome/help/f-spot/es/ratings.page
+share/gnome/help/f-spot/es/smugmug.page
+share/gnome/help/f-spot/es/tag-attach.page
+share/gnome/help/f-spot/es/tag-creation.page
+share/gnome/help/f-spot/es/tag-delete.page
+share/gnome/help/f-spot/es/tag-remove.page
+share/gnome/help/f-spot/es/tag-search.page
+share/gnome/help/f-spot/es/tags.page
+share/gnome/help/f-spot/es/upload-to-web.page
+share/gnome/help/f-spot/es/versioning.page
+share/gnome/help/f-spot/es/zooomr.page
+share/gnome/help/f-spot/fr/23hq.page
+share/gnome/help/f-spot/fr/adjust-color.page
+share/gnome/help/f-spot/fr/cd.page
+share/gnome/help/f-spot/fr/colors.page
+share/gnome/help/f-spot/fr/date-search.page
+share/gnome/help/f-spot/fr/enhancements.page
+share/gnome/help/f-spot/fr/extensions.page
+share/gnome/help/f-spot/fr/facebook.page
 share/gnome/help/f-spot/fr/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/fr/figures/f-spot-autocolor.png
 share/gnome/help/f-spot/fr/figures/f-spot-crop.png
@@ -229,51 +325,35 @@ share/gnome/help/f-spot/fr/figures/f-spot-sepia.png
 share/gnome/help/f-spot/fr/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/fr/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/fr/figures/f-spot-straighten.png
-share/gnome/help/f-spot/it/f-spot.xml
-share/gnome/help/f-spot/it/figures/f-spot-adjust-colors.png
-share/gnome/help/f-spot/it/figures/f-spot-autocolor.png
-share/gnome/help/f-spot/it/figures/f-spot-crop.png
-share/gnome/help/f-spot/it/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/it/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/it/figures/f-spot-red-eye.png
-share/gnome/help/f-spot/it/figures/f-spot-sepia.png
-share/gnome/help/f-spot/it/figures/f-spot-slideshow.png
-share/gnome/help/f-spot/it/figures/f-spot-soft-focus.png
-share/gnome/help/f-spot/it/figures/f-spot-straighten.png
-share/gnome/help/f-spot/oc/f-spot.xml
-share/gnome/help/f-spot/oc/figures/f-spot-adjust-colors.png
-share/gnome/help/f-spot/oc/figures/f-spot-autocolor.png
-share/gnome/help/f-spot/oc/figures/f-spot-crop.png
-share/gnome/help/f-spot/oc/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/oc/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/oc/figures/f-spot-red-eye.png
-share/gnome/help/f-spot/oc/figures/f-spot-sepia.png
-share/gnome/help/f-spot/oc/figures/f-spot-slideshow.png
-share/gnome/help/f-spot/oc/figures/f-spot-soft-focus.png
-share/gnome/help/f-spot/oc/figures/f-spot-straighten.png
-share/gnome/help/f-spot/pt_BR/f-spot.xml
-share/gnome/help/f-spot/pt_BR/figures/f-spot-adjust-colors.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-autocolor.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-crop.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-red-eye.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-sepia.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-slideshow.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-soft-focus.png
-share/gnome/help/f-spot/pt_BR/figures/f-spot-straighten.png
-share/gnome/help/f-spot/ru/f-spot.xml
-share/gnome/help/f-spot/ru/figures/f-spot-adjust-colors.png
-share/gnome/help/f-spot/ru/figures/f-spot-autocolor.png
-share/gnome/help/f-spot/ru/figures/f-spot-crop.png
-share/gnome/help/f-spot/ru/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/ru/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/ru/figures/f-spot-red-eye.png
-share/gnome/help/f-spot/ru/figures/f-spot-sepia.png
-share/gnome/help/f-spot/ru/figures/f-spot-slideshow.png
-share/gnome/help/f-spot/ru/figures/f-spot-soft-focus.png
-share/gnome/help/f-spot/ru/figures/f-spot-straighten.png
-share/gnome/help/f-spot/sl/f-spot.xml
+share/gnome/help/f-spot/fr/file-management.page
+share/gnome/help/f-spot/fr/flickr.page
+share/gnome/help/f-spot/fr/folder.page
+share/gnome/help/f-spot/fr/general-editing.page
+share/gnome/help/f-spot/fr/import-photos.page
+share/gnome/help/f-spot/fr/import-roll-search.page
+share/gnome/help/f-spot/fr/index.page
+share/gnome/help/f-spot/fr/introduction.page
+share/gnome/help/f-spot/fr/picasa.page
+share/gnome/help/f-spot/fr/rate-search.page
+share/gnome/help/f-spot/fr/ratings.page
+share/gnome/help/f-spot/fr/smugmug.page
+share/gnome/help/f-spot/fr/tag-attach.page
+share/gnome/help/f-spot/fr/tag-creation.page
+share/gnome/help/f-spot/fr/tag-delete.page
+share/gnome/help/f-spot/fr/tag-remove.page
+share/gnome/help/f-spot/fr/tag-search.page
+share/gnome/help/f-spot/fr/tags.page
+share/gnome/help/f-spot/fr/upload-to-web.page
+share/gnome/help/f-spot/fr/versioning.page
+share/gnome/help/f-spot/fr/zooomr.page
+share/gnome/help/f-spot/sl/23hq.page
+share/gnome/help/f-spot/sl/adjust-color.page
+share/gnome/help/f-spot/sl/cd.page
+share/gnome/help/f-spot/sl/colors.page
+share/gnome/help/f-spot/sl/date-search.page
+share/gnome/help/f-spot/sl/enhancements.page
+share/gnome/help/f-spot/sl/extensions.page
+share/gnome/help/f-spot/sl/facebook.page
 share/gnome/help/f-spot/sl/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/sl/figures/f-spot-autocolor.png
 share/gnome/help/f-spot/sl/figures/f-spot-crop.png
@@ -284,28 +364,28 @@ share/gnome/help/f-spot/sl/figures/f-spot-sepia.png
 share/gnome/help/f-spot/sl/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/sl/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/sl/figures/f-spot-straighten.png
-share/gnome/help/f-spot/sv/f-spot.xml
-share/gnome/help/f-spot/sv/figures/f-spot-adjust-colors.png
-share/gnome/help/f-spot/sv/figures/f-spot-autocolor.png
-share/gnome/help/f-spot/sv/figures/f-spot-crop.png
-share/gnome/help/f-spot/sv/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/sv/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/sv/figures/f-spot-red-eye.png
-share/gnome/help/f-spot/sv/figures/f-spot-sepia.png
-share/gnome/help/f-spot/sv/figures/f-spot-slideshow.png
-share/gnome/help/f-spot/sv/figures/f-spot-soft-focus.png
-share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
-share/gnome/help/f-spot/uk/f-spot.xml
-share/gnome/help/f-spot/uk/figures/f-spot-adjust-colors.png
-share/gnome/help/f-spot/uk/figures/f-spot-autocolor.png
-share/gnome/help/f-spot/uk/figures/f-spot-crop.png
-share/gnome/help/f-spot/uk/figures/f-spot-desaturate.png
-share/gnome/help/f-spot/uk/figures/f-spot-fullscreen.png
-share/gnome/help/f-spot/uk/figures/f-spot-red-eye.png
-share/gnome/help/f-spot/uk/figures/f-spot-sepia.png
-share/gnome/help/f-spot/uk/figures/f-spot-slideshow.png
-share/gnome/help/f-spot/uk/figures/f-spot-soft-focus.png
-share/gnome/help/f-spot/uk/figures/f-spot-straighten.png
+share/gnome/help/f-spot/sl/file-management.page
+share/gnome/help/f-spot/sl/flickr.page
+share/gnome/help/f-spot/sl/folder.page
+share/gnome/help/f-spot/sl/general-editing.page
+share/gnome/help/f-spot/sl/import-photos.page
+share/gnome/help/f-spot/sl/import-roll-search.page
+share/gnome/help/f-spot/sl/index.page
+share/gnome/help/f-spot/sl/introduction.page
+share/gnome/help/f-spot/sl/picasa.page
+share/gnome/help/f-spot/sl/rate-search.page
+share/gnome/help/f-spot/sl/ratings.page
+share/gnome/help/f-spot/sl/smugmug.page
+share/gnome/help/f-spot/sl/tag-attach.page
+share/gnome/help/f-spot/sl/tag-creation.page
+share/gnome/help/f-spot/sl/tag-delete.page
+share/gnome/help/f-spot/sl/tag-remove.page
+share/gnome/help/f-spot/sl/tag-search.page
+share/gnome/help/f-spot/sl/tags.page
+share/gnome/help/f-spot/sl/upload-to-web.page
+share/gnome/help/f-spot/sl/versioning.page
+share/gnome/help/f-spot/sl/zooomr.page
+share/icons/hicolor/128x128/apps/f-spot.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
@@ -314,10 +394,12 @@ share/icons/hicolor/32x32/apps/f-spot.png
 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/ast/LC_MESSAGES/f-spot.mo
 share/locale/be@latin/LC_MESSAGES/f-spot.mo
 share/locale/bg/LC_MESSAGES/f-spot.mo
 share/locale/bn_IN/LC_MESSAGES/f-spot.mo
 share/locale/ca/LC_MESSAGES/f-spot.mo
+share/locale/ca@valencia/LC_MESSAGES/f-spot.mo
 share/locale/cs/LC_MESSAGES/f-spot.mo
 share/locale/da/LC_MESSAGES/f-spot.mo
 share/locale/de/LC_MESSAGES/f-spot.mo
@@ -336,6 +418,7 @@ 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/id/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
@@ -370,16 +453,3 @@ share/locale/vi/LC_MESSAGES/f-spot.mo
 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
-share/omf/f-spot/f-spot-oc.omf
-share/omf/f-spot/f-spot-pt_BR.omf
-share/omf/f-spot/f-spot-ru.omf
-share/omf/f-spot/f-spot-sl.omf
-share/omf/f-spot/f-spot-sv.omf
-share/omf/f-spot/f-spot-uk.omf
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index b6141855630..2a97147ab47 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.8 2012/05/10 17:46:34 dholland Exp $
+$NetBSD: distinfo,v 1.9 2015/05/23 10:33:01 kefren Exp $
 
 SHA1 (f-spot-0.8.2.tar.bz2) = 258e30a11ac24f963a47ead19c3d14bf755816e5
 RMD160 (f-spot-0.8.2.tar.bz2) = 658f437cb336fc29a718cf021ba54ee62dbee757
 Size (f-spot-0.8.2.tar.bz2) = 3222712 bytes
+SHA1 (patch-FlickrExport.cs) = 15610c7f0e0d321d8acf4282cb04953e62180c2c
+SHA1 (patch-FlickrRemote.cs) = 63b3e8c6e57ca2c02a38c00fc2f0dcaf69825779
+SHA1 (patch-FolderTreeView.cs) = 0e5804189b8c11caafe0bbcae8faa9a24fa4d5a5
+SHA1 (patch-GdkImageLoader.cs) = 945f8349af0a5cbbfd97cf73641eae268a8aed05
+SHA1 (patch-GroupSelector.cs) = bed9b5e8737f3079037bc0e68898ae765808c01e
 SHA1 (patch-Makefile_in) = 313c3ad5fb9859a2891c38d49776347747949162
diff --git a/graphics/f-spot/patches/patch-FlickrExport.cs b/graphics/f-spot/patches/patch-FlickrExport.cs
new file mode 100644
index 00000000000..02ae442bb40
--- /dev/null
+++ b/graphics/f-spot/patches/patch-FlickrExport.cs
@@ -0,0 +1,45 @@
+$NetBSD: patch-FlickrExport.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $
+
+Make it compile with newer version of flickrnet
+
+--- src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs.orig	2015-05-23 13:03:00.000000000 +0300
++++ src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs	2015-05-23 13:07:29.000000000 +0300
+@@ -124,9 +124,9 @@
+ 					do_export_flickr.Sensitive = true;
+ 					auth_flickr.Sensitive = true;
+ 					auth_label.Text = System.String.Format (Catalog.GetString ("Welcome {0} you are connected to {1}"),
+-										auth.User.Username,
++										auth.User.UserName,
+ 										current_service.Name);
+-					auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.Username);
++					auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.UserName);
+ 					used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro &&
+ 									fr.Connection.PeopleGetUploadStatus().BandwidthMax > 0;
+ 					if (used_bandwidth.Visible) {
+@@ -326,7 +326,7 @@
+ 				progress_dialog.ProgressText = String.Format (Catalog.GetString ("Waiting for response {0} of {1}"),
+ 									      photo_index, selection.Count);
+ 			}
+-			progress_dialog.Fraction = (photo_index - 1.0 + (args.Bytes / (double) info.Length)) / (double) selection.Count;
++			progress_dialog.Fraction = (photo_index - 1.0 + (args.BytesSent / (double) info.Length)) / (double) selection.Count;
+ 		}
+ 
+ 		private class DateComparer : IComparer
+@@ -370,7 +370,7 @@
+ 						App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id,
+ 									      (photo as FSpot.Photo).DefaultVersionId,
+ 									      ExportStore.FlickrExportType,
+-									      auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
++									      auth.User.UserId + ":" + auth.User.UserName + ":" + current_service.Name + ":" + id);
+ 
+ 				} catch (System.Exception e) {
+ 					progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"),
+@@ -393,7 +393,7 @@
+ 			if (open && ids.Count != 0) {
+ 				string view_url;
+ 				if (current_service.Name == "Zooomr.com")
+-					view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.Username);
++					view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.UserName);
+ 				else {
+ 					view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids", current_service.Name);
+ 					bool first = true;
diff --git a/graphics/f-spot/patches/patch-FlickrRemote.cs b/graphics/f-spot/patches/patch-FlickrRemote.cs
new file mode 100644
index 00000000000..56567dd09a3
--- /dev/null
+++ b/graphics/f-spot/patches/patch-FlickrRemote.cs
@@ -0,0 +1,84 @@
+$NetBSD: patch-FlickrRemote.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $
+
+Make it compile with newer flickrnet
+
+--- src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs.orig	2010-12-19 15:34:42.000000000 +0200
++++ src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs	2015-05-23 13:25:26.000000000 +0300
+@@ -11,6 +11,7 @@
+  */
+ using System;
+ using System.IO;
++using System.Linq;
+ using System.Text;
+ using System.Collections;
+ using FlickrNet;
+@@ -22,7 +23,7 @@
+ 
+ namespace FSpot.Exporters.Flickr {
+ public class FlickrRemote {
+-	public static Licenses    licenses;
++	public static LicenseCollection    licenses;
+ 	private string            frob;
+ 	private string            token;
+ 	private Auth              auth;
+@@ -62,28 +63,29 @@
+ 		get { return flickr; }
+ 	}
+ 
+-	public License[] GetLicenses ()
++	public LicenseCollection GetLicenses ()
+ 	{
+ 		// Licenses won't change normally in a user session
+ 		if (licenses == null) {
+ 			try {
+ 				licenses = flickr.PhotosLicensesGetInfo();
+ 			} catch (FlickrNet.FlickrApiException e ) {
+-				Log.Error (e.Code + ": " + e.Verbose );
++				Log.Error (e.Code + ": " + e.Message );
+ 				return null;
+ 			}
+ 		}
+-		return licenses.LicenseCollection;
++		return licenses;
+ 	}
+ 
+ 	public ArrayList Search (string[] tags, int licenseId)
+ 	{
++		var options = new PhotoSearchOptions { Tags = tags.Aggregate((a, b) => a += b + " ") };
+ 		ArrayList photos_url = new ArrayList ();
+ 		// Photos photos = flickr.PhotosSearchText (tags, licenseId);
+-		Photos photos = flickr.PhotosSearch (tags);
++		PhotoCollection photos = flickr.PhotosSearch (options);
+ 
+ 		if (photos != null) {
+-			foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
++			foreach (FlickrNet.Photo photo in photos) {
+ 				photos_url.Add (photo.ThumbnailUrl);
+ 			}
+ 		}
+@@ -93,11 +95,14 @@
+ 
+ 	public ArrayList Search (string tags, int licenseId)
+ 	{
++		var options = new PhotoSearchOptions{Tags = tags};
+ 		ArrayList photos_url = new ArrayList ();
+-		Photos photos = flickr.PhotosSearchText (tags, licenseId);
++		// XXX: ignore license, probably should also set
++		// options.licenses
++		PhotoCollection photos = flickr.PhotosSearch (options);
+ 
+ 		if (photos != null) {
+-			foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
++			foreach (FlickrNet.Photo photo in photos) {
+ 				photos_url.Add (photo.ThumbnailUrl);
+ 			}
+ 		}
+@@ -126,7 +131,7 @@
+ 
+ 				return auth;
+ 			} catch (FlickrNet.FlickrApiException ex) {
+-				Log.Error ("Problems logging in to Flickr - " + ex.Verbose);
++				Log.Error ("Problems logging in to Flickr - " + ex.Message);
+ 				return null;
+ 			}
+ 		}
diff --git a/graphics/f-spot/patches/patch-FolderTreeView.cs b/graphics/f-spot/patches/patch-FolderTreeView.cs
new file mode 100644
index 00000000000..352428d25fc
--- /dev/null
+++ b/graphics/f-spot/patches/patch-FolderTreeView.cs
@@ -0,0 +1,18 @@
+$NetBSD: patch-FolderTreeView.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $
+
+--- src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs.orig	2015-05-23 12:17:48.000000000 +0300
++++ src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs	2015-05-23 12:19:54.000000000 +0300
+@@ -42,11 +42,11 @@
+ 
+ 			CellRendererPixbuf pixbuf_renderer = new CellRendererPixbuf ();
+ 			column.PackStart (pixbuf_renderer, false);
+-			column.SetCellDataFunc (pixbuf_renderer, PixbufDataFunc as TreeCellDataFunc);
++			column.SetCellDataFunc (pixbuf_renderer, PixbufDataFunc);
+ 
+ 			CellRendererTextProgress folder_renderer = new CellRendererTextProgress ();
+ 			column.PackStart (folder_renderer, true);
+-			column.SetCellDataFunc (folder_renderer, FolderDataFunc as TreeCellDataFunc);
++			column.SetCellDataFunc (folder_renderer, FolderDataFunc);
+ 
+ 			AppendColumn (column);
+ 
diff --git a/graphics/f-spot/patches/patch-GdkImageLoader.cs b/graphics/f-spot/patches/patch-GdkImageLoader.cs
new file mode 100644
index 00000000000..b1b7a47417a
--- /dev/null
+++ b/graphics/f-spot/patches/patch-GdkImageLoader.cs
@@ -0,0 +1,13 @@
+$NetBSD: patch-GdkImageLoader.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $
+
+--- src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs.orig	2015-05-23 12:09:54.000000000 +0300
++++ src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs	2015-05-23 12:10:13.000000000 +0300
+@@ -112,7 +112,7 @@
+ 		public new bool Close ()
+ 		{
+ 			lock (sync_handle) {
+-				return base.Close (true);
++				return base.Close ();
+ 			}
+ 		}
+ #endregion
diff --git a/graphics/f-spot/patches/patch-GroupSelector.cs b/graphics/f-spot/patches/patch-GroupSelector.cs
new file mode 100644
index 00000000000..936afc7b067
--- /dev/null
+++ b/graphics/f-spot/patches/patch-GroupSelector.cs
@@ -0,0 +1,13 @@
+$NetBSD: patch-GroupSelector.cs,v 1.1 2015/05/23 10:33:01 kefren Exp $
+
+--- src/Clients/MainApp/FSpot/GroupSelector.cs.orig	2015-05-23 12:11:50.000000000 +0300
++++ src/Clients/MainApp/FSpot/GroupSelector.cs	2015-05-23 12:16:57.000000000 +0300
+@@ -428,6 +428,8 @@
+ 
+ 			public Box (GroupSelector selector, int item)
+ 			{
++				bounds = new Gdk.Rectangle();
++				bar = new Gdk.Rectangle();
+ 				bounds.Height = selector.background.Height;
+ 				bounds.Y = selector.background.Y;
+ 				bounds.X = selector.BoxX (item);