6 files changed, 34 insertions, 85 deletions
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 55ac815211f..a77e96b8e67 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2012/04/27 12:31:50 obache Exp $
+# $NetBSD: Makefile,v 1.38 2012/05/10 17:46:34 dholland Exp $
 #
 
-DISTNAME=	f-spot-0.6.2
-PKGREVISION=	15
+DISTNAME=	f-spot-0.8.2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,24 +18,26 @@ USE_TOOLS+=	gmake intltool pkg-config bash:run msgfmt
 
 MAKE_JOBS_SAFE=	no
 
-.include "../../mk/bsd.prefs.mk"
-.for platform in ${LP64PLATFORMS}
-.  if ${MACHINE_PLATFORM:M${platform}}
-CONFIGURE_ENV+=	EXTRACSDEFINES=-define:LONG_IS_64BITS
-.  endif
-.endfor
+#.include "../../mk/bsd.prefs.mk"
+#.for platform in ${LP64PLATFORMS}
+#.  if ${MACHINE_PLATFORM:M${platform}}
+#CONFIGURE_ENV+=	EXTRACSDEFINES=-define:LONG_IS_64BITS
+#.  endif
+#.endfor
 
 PKGCONFIG_OVERRIDE+=	f-spot.pc.in
 
 REPLACE_BASH+=	icon-theme-installer
-REPLACE_BASH+=	src/f-spot.in
+REPLACE_BASH+=	src/Clients/MainApp/f-spot.in
 REPLACE_BASH+=	tools/f-spot-import
 
 SUBST_CLASSES+=			fix-x11
 SUBST_STAGE.fix-x11=		post-patch
 SUBST_MESSAGE.fix-x11=		Fixing libX11 references
-SUBST_FILES.fix-x11=		src/FSpot.Utils.dll.config
-SUBST_FILES.fix-x11+=		src/f-spot.exe.config.in
+SUBST_FILES.fix-x11=		src/Core/FSpot.Utils/FSpot.Utils.dll.config.in
+SUBST_FILES.fix-x11+=		src/Core/FSpot.Utils/FSpot.Utils.dll.config
+SUBST_FILES.fix-x11+=		build/DllMapVerifier.cs
+SUBST_FILES.fix-x11+=		lib/Hyena/build/DllMapVerifier.cs
 SUBST_SED.fix-x11=		-e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
 
 GCONF_SCHEMAS=	f-spot.schemas
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index 7c802db58ab..b6141855630 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2010/05/17 17:46:44 drochner Exp $
+$NetBSD: distinfo,v 1.8 2012/05/10 17:46:34 dholland Exp $
 
-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) = b572e3dde7fb572b5b772492e32c75b1e9b9a517
-SHA1 (patch-ad) = 4aec4a1c7a08f169f7909143e9e8e1120ac53a42
+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-Makefile_in) = 313c3ad5fb9859a2891c38d49776347747949162
diff --git a/graphics/f-spot/patches/patch-Makefile_in b/graphics/f-spot/patches/patch-Makefile_in
new file mode 100644
index 00000000000..e5192ee639a
--- /dev/null
+++ b/graphics/f-spot/patches/patch-Makefile_in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile_in,v 1.1 2012/05/10 17:46:34 dholland Exp $
+
+Do gconf schemas the pkgsrc way.
+
+--- Makefile.in~	2010-12-19 13:55:19.000000000 +0000
++++ Makefile.in
+@@ -391,7 +391,7 @@ SUBDIRS = \
+ 	src			\
+ 	tests
+ 
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = $(GCONF_SCHEMA_FILE_DIR)
+ schema_in_files = f-spot.schemas.in
+ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+ CLEANFILES = \
diff --git a/graphics/f-spot/patches/patch-ab b/graphics/f-spot/patches/patch-ab
deleted file mode 100644
index fb2caad5b12..00000000000
--- a/graphics/f-spot/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/02/16 12:16:23 drochner Exp $
-
---- lib/libgphoto2-sharp/CameraFilesystem.cs.orig	2009-11-04 19:34:32.000000000 +0000
-+++ lib/libgphoto2-sharp/CameraFilesystem.cs
-@@ -45,7 +45,11 @@ namespace LibGPhoto2
- 	{
- 		public CameraFileInfoFields fields;
- 		public CameraFileStatus status;
-+#if LONG_IS_64BITS
- 		public ulong size;
-+#else
-+		public uint size;
-+#endif
- 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
- 	}
- 	
-@@ -54,7 +58,11 @@ namespace LibGPhoto2
- 	{
- 		public CameraFileInfoFields fields;
- 		public CameraFileStatus status;
-+#if LONG_IS_64BITS
- 		public ulong size;
-+#else
-+		public uint size;
-+#endif
- 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
- 		
- 		public uint width, height;
-@@ -65,7 +73,11 @@ namespace LibGPhoto2
- 	{
- 		public CameraFileInfoFields fields;
- 		public CameraFileStatus status;
-+#if LONG_IS_64BITS
- 		public ulong size;
-+#else
-+		public uint size;
-+#endif
- 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
- 		
- 		public uint width, height;
diff --git a/graphics/f-spot/patches/patch-ac b/graphics/f-spot/patches/patch-ac
deleted file mode 100644
index 3d721e33756..00000000000
--- a/graphics/f-spot/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/05/17 17:46:44 drochner Exp $
-
---- configure.orig	2010-05-14 18:39:34.000000000 +0000
-+++ configure
-@@ -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
deleted file mode 100644
index 6b586681f6c..00000000000
--- a/graphics/f-spot/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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