update to 0.6.2

changes: fixes, cleanup, translation updates

6 files changed, 67 insertions, 69 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 67e074d6f90..829b746d9c5 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/04/22 07:39:54 kefren Exp $
+# $NetBSD: Makefile,v 1.21 2010/05/17 17:46:44 drochner Exp $
 #
 
-DISTNAME=	f-spot-0.6.1.5
-PKGREVISION=	4
+DISTNAME=	f-spot-0.6.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,6 +38,9 @@ SUBST_FILES.fix-x11=		src/FSpot.Utils.dll.config
 SUBST_FILES.fix-x11+=		src/f-spot.exe.config.in
 SUBST_SED.fix-x11=		-e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
 
+GCONF_SCHEMAS=	f-spot.schemas
+
+.include "../../devel/GConf/schemas.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -49,12 +51,14 @@ SUBST_SED.fix-x11=		-e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
+.include "../../devel/mono-addins/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../x11/gnome-desktop-sharp/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/f-spot/PLIST b/graphics/f-spot/PLIST
index 67968d003b9..736b07399ac 100644
--- a/graphics/f-spot/PLIST
+++ b/graphics/f-spot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/10/24 13:13:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/05/17 17:46:44 drochner Exp $
 bin/f-spot
 bin/f-spot-import
 bin/f-spot-sqlite-upgrade
@@ -22,30 +22,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
@@ -64,6 +59,9 @@ 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
 libexec/gnome-screensaver/f-spot-screensaver
 share/applications/f-spot-import.desktop
@@ -164,6 +162,7 @@ share/f-spot/icons/hicolor/scalable/actions/view-restore.svg
 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/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/C/figures/f-spot-autocolor.png
@@ -274,6 +273,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
@@ -285,6 +295,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
@@ -295,6 +316,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
@@ -324,6 +346,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
@@ -331,6 +354,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
@@ -356,4 +380,6 @@ 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 f060e1bb4ef..7c802db58ab 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2010/02/16 12:16:23 drochner Exp $
+$NetBSD: distinfo,v 1.7 2010/05/17 17:46:44 drochner Exp $
 
-SHA1 (f-spot-0.6.1.5.tar.bz2) = 712aa5ce0a8844403a751456ae467117d1ab71da
-RMD160 (f-spot-0.6.1.5.tar.bz2) = f132d1b6d044521d0550f982e006f99ad8fc05ac
-Size (f-spot-0.6.1.5.tar.bz2) = 2902761 bytes
-SHA1 (patch-aa) = 7f2d5aaca2b0685c1460afaef3d9a34b230412c8
+SHA1 (f-spot-0.6.2.tar.bz2) = bafd3edfac716769ac6f230c5d9f359550e624e1
+RMD160 (f-spot-0.6.2.tar.bz2) = ed26ef728c920e5fe05e9bb0b5951ea0b4ec3f49
+Size (f-spot-0.6.2.tar.bz2) = 2913007 bytes
 SHA1 (patch-ab) = 2c4744ff8915c7e98ceb9a402447e168c2b972b5
-SHA1 (patch-ac) = a37283a80a0067b1486c2f49f5dd9894888b486b
+SHA1 (patch-ac) = b572e3dde7fb572b5b772492e32c75b1e9b9a517
+SHA1 (patch-ad) = 4aec4a1c7a08f169f7909143e9e8e1120ac53a42
diff --git a/graphics/f-spot/patches/patch-aa b/graphics/f-spot/patches/patch-aa
deleted file mode 100644
index 6c0337e5827..00000000000
--- a/graphics/f-spot/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/02/16 12:16:23 drochner Exp $
-
---- lib/libgphoto2-sharp/CameraFile.cs.orig	2009-11-04 19:34:32.000000000 +0000
-+++ lib/libgphoto2-sharp/CameraFile.cs
-@@ -76,11 +76,19 @@ namespace LibGPhoto2
- 		}
- 		
- 		[DllImport ("libgphoto2.so")]
-+#if LONG_IS_64BITS
- 		internal static extern ErrorCode gp_file_append (HandleRef file, byte[] data, ulong size);
-+#else
-+		internal static extern ErrorCode gp_file_append (HandleRef file, byte[] data, uint size);
-+#endif
- 
- 		public void Append (byte[] data)
- 		{
-+#if LONG_IS_64BITS
- 			Error.CheckError (gp_file_append (this.Handle, data, (ulong)data.Length));
-+#else
-+			Error.CheckError (gp_file_append (this.Handle, data, (uint)data.Length));
-+#endif
- 		}
- 		
- 		[DllImport ("libgphoto2.so")]
-@@ -223,11 +231,19 @@ namespace LibGPhoto2
- 		}
- 		
- 		[DllImport ("libgphoto2.so")]
-+#if LONG_IS_64BITS
- 		internal static extern ErrorCode gp_file_set_data_and_size (HandleRef file, byte[] data, ulong size);
-+#else
-+		internal static extern ErrorCode gp_file_set_data_and_size (HandleRef file, byte[] data, uint size);
-+#endif
- 
- 		public void SetDataAndSize (byte[] data)
- 		{
-+#if LONG_IS_64BITS
- 			Error.CheckError (gp_file_set_data_and_size (this.Handle, data, (ulong)data.Length));
-+#else
-+			Error.CheckError (gp_file_set_data_and_size (this.Handle, data, (uint)data.Length));
-+#endif
- 		}
- 		
- 		[DllImport ("libgphoto2.so")]
diff --git a/graphics/f-spot/patches/patch-ac b/graphics/f-spot/patches/patch-ac
index a77ee1e727e..3d721e33756 100644
--- a/graphics/f-spot/patches/patch-ac
+++ b/graphics/f-spot/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2010/02/16 12:16:23 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2010/05/17 17:46:44 drochner Exp $
 
---- configure.orig	2009-11-04 19:35:17.000000000 +0000
+--- configure.orig	2010-05-14 18:39:34.000000000 +0000
 +++ configure
-@@ -19761,7 +19761,7 @@ $as_echo "yes" >&6; }
- fi
- 
- if pkg-config --atleast-version=2.4 libgphoto2; then
--	CSC_DEFINES="$CSC_DEFINES -d:GPHOTO2_2_4"
-+	CSC_DEFINES="$CSC_DEFINES -d:GPHOTO2_2_4 $EXTRACSDEFINES"
+@@ -17786,6 +17786,7 @@ if pkg-config --at-least-version=2.16 gt
+ 	CSC_DEFINES="$CSC_DEFINES -d:GTK_2_16"
  fi
  
++CSC_DEFINES="$CSC_DEFINES $EXTRACSDEFINES"
  
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NDESK_DBUS" >&5
diff --git a/graphics/f-spot/patches/patch-ad b/graphics/f-spot/patches/patch-ad
new file mode 100644
index 00000000000..6b586681f6c
--- /dev/null
+++ b/graphics/f-spot/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/05/17 17:46:44 drochner Exp $
+
+--- Makefile.in.orig	2010-05-17 17:12:48.000000000 +0000
++++ Makefile.in
+@@ -367,7 +367,7 @@ desktop_in_files = \
+ desktop_files = $(desktop_in_files:.desktop.in=.desktop)
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = f-spot.pc
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = $(GCONF_SCHEMA_FILE_DIR)
+ schema_in_files = f-spot.schemas.in
+ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+ Applicationsdir = $(datadir)/applications