5 files changed, 59 insertions, 28 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 8cbf7c6b52c5..614fb9b9b93d 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	f-spot
-PORTVERSION=	0.6.1.5
-PORTREVISION=	3
+PORTVERSION=	0.6.2
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -19,9 +18,11 @@ COMMENT=	Personal photo management to the GNOME desktop
 LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins
 RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus \
-		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
+		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins
 
 USE_BZIP2=	yes
 USE_SQLITE=	yes
@@ -32,6 +33,7 @@ USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
+GCONF_SCHEMAS=	f-spot.schemas
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index 4e04828dee75..507a39456bb7 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,3 +1,3 @@
-MD5 (f-spot-0.6.1.5.tar.bz2) = 411bac8266a60d9a728218d19dd5e735
-SHA256 (f-spot-0.6.1.5.tar.bz2) = cb538e90b5e8c6e6b24af784c084afa2c1712c7606c6e64d4731d6145596ba46
-SIZE (f-spot-0.6.1.5.tar.bz2) = 2902761
+MD5 (f-spot-0.6.2.tar.bz2) = 82d281eb6c5c6b10e75313a897250444
+SHA256 (f-spot-0.6.2.tar.bz2) = f7d836c114af9d7f50903cd79710f079b025f1f8b8495d9117b150d6e746c67e
+SIZE (f-spot-0.6.2.tar.bz2) = 2913007
diff --git a/graphics/f-spot/files/patch-icons_Makefile.in b/graphics/f-spot/files/patch-icons_Makefile.in
deleted file mode 100644
index 11eca93d8d7e..000000000000
--- a/graphics/f-spot/files/patch-icons_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- icons/Makefile.in.orig
-+++ icons/Makefile.in
-@@ -38,7 +38,7 @@
- 	$(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
diff --git a/graphics/f-spot/files/patch-lib_unique-sharp_unique_unique-sharp.dll.config b/graphics/f-spot/files/patch-lib_unique-sharp_unique_unique-sharp.dll.config
new file mode 100644
index 000000000000..7909cef80d33
--- /dev/null
+++ b/graphics/f-spot/files/patch-lib_unique-sharp_unique_unique-sharp.dll.config
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- lib/unique-sharp/unique/unique-sharp.dll.config.orig
++++ lib/unique-sharp/unique/unique-sharp.dll.config
+@@ -1,4 +1,4 @@
+ <configuration>
+-  <dllmap dll="libunique-1.0-0.dll" target="libunique-1.0.so.0"/>
++  <dllmap dll="libunique-1.0-0.dll" target="libunique-1.0.so.2"/>
+ </configuration>
+ 
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index e94f89f4de16..e780dfabf896 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -21,30 +21,25 @@ 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
-lib/f-spot/Mono.Addins.dll
-lib/f-spot/Mono.Addins.dll.config
 lib/f-spot/Mono.Google.dll
 lib/f-spot/Mono.Tabblo.dll
-lib/f-spot/NDesk.Glitz.dll
 lib/f-spot/SemWeb.dll
 lib/f-spot/SmugMugNet.dll
-lib/f-spot/extensions/BeagleService.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/DefaultExporters.addin.xml
 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
@@ -69,6 +64,12 @@ 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/f-spot/libgphoto2glue.a
+lib/f-spot/libgphoto2glue.la
+lib/f-spot/libgphoto2glue.so
+lib/f-spot/libgphoto2glue.so.0
+lib/f-spot/unique-sharp.dll
+lib/f-spot/unique-sharp.dll.config
 libdata/pkgconfig/f-spot.pc
 libexec/gnome-screensaver/f-spot-screensaver
 share/applications/f-spot-import.desktop
@@ -280,6 +281,17 @@ 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/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
+share/gnome/help/f-spot/sl/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/sl/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/sl/figures/f-spot-red-eye.png
+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
@@ -291,6 +303,17 @@ 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/icons/hicolor/16x16/apps/f-spot.png
 share/icons/hicolor/22x22/apps/f-spot.png
 share/icons/hicolor/24x24/apps/f-spot.png
@@ -301,6 +324,7 @@ 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/bn_IN/LC_MESSAGES/f-spot.mo
 share/locale/ca/LC_MESSAGES/f-spot.mo
 share/locale/cs/LC_MESSAGES/f-spot.mo
 share/locale/da/LC_MESSAGES/f-spot.mo
@@ -330,6 +354,7 @@ 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/nds/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
@@ -337,6 +362,7 @@ share/locale/pa/LC_MESSAGES/f-spot.mo
 share/locale/pl/LC_MESSAGES/f-spot.mo
 share/locale/pt/LC_MESSAGES/f-spot.mo
 share/locale/pt_BR/LC_MESSAGES/f-spot.mo
+share/locale/ro/LC_MESSAGES/f-spot.mo
 share/locale/ru/LC_MESSAGES/f-spot.mo
 share/locale/rw/LC_MESSAGES/f-spot.mo
 share/locale/sk/LC_MESSAGES/f-spot.mo
@@ -362,10 +388,16 @@ 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
 @dirrm share/omf/f-spot
+@dirrm share/gnome/help/f-spot/uk/figures
+@dirrm share/gnome/help/f-spot/uk
 @dirrm share/gnome/help/f-spot/sv/figures
 @dirrm share/gnome/help/f-spot/sv
+@dirrm share/gnome/help/f-spot/sl/figures
+@dirrm share/gnome/help/f-spot/sl
 @dirrm share/gnome/help/f-spot/ru/figures
 @dirrm share/gnome/help/f-spot/ru
 @dirrm share/gnome/help/f-spot/pt_BR/figures