6 files changed, 290 insertions, 7 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 63526d2fe5a6..2416ad5a4179 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -2,15 +2,15 @@
 # Date created:					20041008
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
-# $Id: Makefile,v 1.5 2005/05/16 03:31:37 mezz7 Exp $
 # $FreeBSD$
+#   $Id: Makefile,v 1.17 2005/10/22 21:17:46 tmclau02 Exp $
 #
 
 PORTNAME=	f-spot
-PORTVERSION=	0.0.13
+PORTVERSION=	0.1.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.1
 
 MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Personal photo management to the GNOME desktop
@@ -19,8 +19,10 @@ LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		sqlite.2:${PORTSDIR}/databases/sqlite2 \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
-RUN_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10
+BUILD_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
+		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
+RUN_DEPENDS=	gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
+		${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack
@@ -31,4 +33,5 @@ USE_GMAKE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index 1d8f76293c63..0d807a274ea8 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,2 +1,2 @@
-MD5 (f-spot-0.0.13.tar.bz2) = 4666af7dfea7aeeef7c7cd5697a378c0
-SIZE (f-spot-0.0.13.tar.bz2) = 705222
+MD5 (f-spot-0.1.3.tar.bz2) = 3c08f01ca24ae2847f11bf47db878c29
+SIZE (f-spot-0.1.3.tar.bz2) = 736561
diff --git a/graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs b/graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs
new file mode 100644
index 000000000000..540ef7b804aa
--- /dev/null
+++ b/graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs
@@ -0,0 +1,11 @@
+--- libgphoto2-sharp/ErrorCodes.cs.orig	Sun Feb 20 16:37:12 2005
++++ libgphoto2-sharp/ErrorCodes.cs	Mon Aug 22 22:15:18 2005
+@@ -79,7 +79,7 @@
+ 		[DllImport ("libgphoto2.so")]
+ 		internal static extern IntPtr gp_result_as_string (ErrorCode result);
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern IntPtr gp_port_result_as_string (ErrorCode result);
+ 	}
+ 	
diff --git a/graphics/f-spot/files/patch-libgphoto2-sharp::Port.cs b/graphics/f-spot/files/patch-libgphoto2-sharp::Port.cs
new file mode 100644
index 000000000000..1f3157b4ace4
--- /dev/null
+++ b/graphics/f-spot/files/patch-libgphoto2-sharp::Port.cs
@@ -0,0 +1,187 @@
+--- libgphoto2-sharp/Port.cs.orig	Wed Apr 27 15:38:18 2005
++++ libgphoto2-sharp/Port.cs	Mon Aug 22 22:12:52 2005
+@@ -83,49 +83,49 @@
+ 		PortPrivateLibrary *pl;
+ 		PortPrivateCore *pc;
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_new (out _Port *port);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_free (_Port *port);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_info (_Port *port, ref _PortInfo info);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_info (_Port *port, out _PortInfo info);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_open (_Port *port);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_close (_Port *port);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_read (_Port *port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_write (_Port *port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_settings (_Port *port, out PortSettings settings);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_settings (_Port *port, PortSettings settings);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_timeout (_Port *port, int *timeout);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_timeout (_Port *port, int timeout);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_pin (_Port *port, Pin pin, Level *level);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_pin (_Port *port, Pin pin, Level level);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern char* gp_port_get_error (_Port *port);
+ 
+ 		//[DllImport ("libgphoto2.so")]
+@@ -135,7 +135,7 @@
+ 
+ 	public class Port : Object
+ 	{
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_new (out IntPtr port);
+ 
+ 		public Port()
+@@ -147,7 +147,7 @@
+ 			this.handle = new HandleRef (this, native);
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_free (HandleRef port);
+ 		
+ 		protected override void Cleanup ()
+@@ -155,7 +155,7 @@
+ 			Error.CheckError (gp_port_free (this.handle));
+ 		}
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_info (HandleRef port, ref _PortInfo info);
+ 
+ 		public void SetInfo (PortInfo info)
+@@ -163,7 +163,7 @@
+ 		Error.CheckError (gp_port_set_info (this.Handle, ref info.Handle));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_info (HandleRef port, out _PortInfo info);
+ 
+ 		public PortInfo GetInfo ()
+@@ -175,7 +175,7 @@
+ 			return info;
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_open (HandleRef port);
+ 
+ 		public void Open ()
+@@ -183,7 +183,7 @@
+ 			Error.CheckError (gp_port_open (this.Handle));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_close (HandleRef port);
+ 
+ 		public void Close ()
+@@ -191,7 +191,7 @@
+ 			Error.CheckError (gp_port_close (this.Handle));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_read (HandleRef port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size);
+ 
+ 		public byte[] Read (int size)
+@@ -203,7 +203,7 @@
+ 			return data;
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_write (HandleRef port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size);
+ 
+ 		public void Write (byte[] data)
+@@ -212,7 +212,7 @@
+ 		}
+ 		
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_settings (HandleRef port, PortSettings settings);
+ 
+ 		public void SetSettings (PortSettings settings)
+@@ -220,7 +220,7 @@
+ 			Error.CheckError (gp_port_set_settings (this.Handle, settings));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_settings (HandleRef port, out PortSettings settings);
+ 
+ 		public PortSettings GetSettings ()
+@@ -232,10 +232,10 @@
+ 			return settings;
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_timeout (HandleRef port, out int timeout);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_timeout (HandleRef port, int timeout);
+ 
+ 		public int Timeout
+@@ -252,13 +252,13 @@
+ 			}
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_get_pin (HandleRef port, Pin pin, out Level level);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_set_pin (HandleRef port, Pin pin, Level level);
+ 
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern string gp_port_get_error (HandleRef port);
+ 	}
+ }
diff --git a/graphics/f-spot/files/patch-libgphoto2-sharp::PortInfoList.cs b/graphics/f-spot/files/patch-libgphoto2-sharp::PortInfoList.cs
new file mode 100644
index 000000000000..24f4b6989974
--- /dev/null
+++ b/graphics/f-spot/files/patch-libgphoto2-sharp::PortInfoList.cs
@@ -0,0 +1,74 @@
+--- libgphoto2-sharp/PortInfoList.cs.orig	Sun Feb 20 16:37:12 2005
++++ libgphoto2-sharp/PortInfoList.cs	Mon Aug 22 22:01:37 2005
+@@ -5,7 +5,7 @@
+ {
+ 	public class PortInfoList : Object 
+ 	{
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_info_list_new (out IntPtr handle);
+ 		
+ 		public PortInfoList()
+@@ -17,7 +17,7 @@
+ 			this.handle = new HandleRef (this, native);
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_info_list_free (HandleRef handle);
+ 		
+ 		protected override void Cleanup ()
+@@ -25,7 +25,7 @@
+ 			Error.CheckError (gp_port_info_list_free (this.Handle));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_info_list_load (HandleRef handle);
+ 
+ 		public void Load ()
+@@ -36,7 +36,7 @@
+ 				throw Error.ErrorException (result);
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_info_list_count (HandleRef handle);
+ 
+ 		public int Count()
+@@ -44,7 +44,7 @@
+ 			return (int) Error.CheckError (gp_port_info_list_count (this.Handle));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal unsafe static extern ErrorCode gp_port_info_list_get_info (HandleRef handle, int n, out _PortInfo info);
+ 
+ 		public PortInfo GetInfo (int n)
+@@ -56,7 +56,7 @@
+ 			return info;
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_info_list_lookup_path (HandleRef handle, [MarshalAs(UnmanagedType.LPTStr)]string path);
+ 
+ 		public int LookupPath (string path)
+@@ -64,7 +64,7 @@
+ 			return (int) Error.CheckError (gp_port_info_list_lookup_path(this.handle, path));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal static extern ErrorCode gp_port_info_list_lookup_name (HandleRef handle, string name);
+ 
+ 		public int LookupName(string name)
+@@ -72,7 +72,7 @@
+ 			return (int) Error.CheckError (gp_port_info_list_lookup_name (this.Handle, name));
+ 		}
+ 		
+-		[DllImport ("libgphoto2.so")]
++		[DllImport ("libgphoto2_port.so")]
+ 		internal unsafe static extern ErrorCode gp_port_info_list_append (HandleRef handle, _PortInfo info);
+ 
+ 		public int Append (PortInfo info)
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index 6d9f0e9368e2..cd817dee68ac 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -1,4 +1,5 @@
 bin/f-spot
+lib/f-spot/SemWeb.dll
 lib/f-spot/f-spot.exe
 lib/f-spot/f-spot.exe.config
 lib/f-spot/libfspot.a
@@ -12,6 +13,7 @@ lib/f-spot/libfspotjpegtran.so
 lib/f-spot/libfspotjpegtran.so.0
 lib/f-spot/libgphoto2-sharp.dll
 lib/f-spot/libgphoto2-sharp.dll.config
+share/gnome/applications/f-spot-view.desktop
 share/gnome/applications/f-spot.desktop
 share/gnome/pixmaps/f-spot-logo.png
 share/locale/bg/LC_MESSAGES/f-spot.mo
@@ -23,18 +25,24 @@ share/locale/el/LC_MESSAGES/f-spot.mo
 share/locale/en_CA/LC_MESSAGES/f-spot.mo
 share/locale/en_GB/LC_MESSAGES/f-spot.mo
 share/locale/es/LC_MESSAGES/f-spot.mo
+share/locale/et/LC_MESSAGES/f-spot.mo
 share/locale/eu/LC_MESSAGES/f-spot.mo
+share/locale/fi/LC_MESSAGES/f-spot.mo
 share/locale/fr/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/lt/LC_MESSAGES/f-spot.mo
 share/locale/nb/LC_MESSAGES/f-spot.mo
 share/locale/nl/LC_MESSAGES/f-spot.mo
 share/locale/no/LC_MESSAGES/f-spot.mo
 share/locale/pl/LC_MESSAGES/f-spot.mo
 share/locale/rw/LC_MESSAGES/f-spot.mo
+share/locale/sr/LC_MESSAGES/f-spot.mo
+share/locale/sr@Latn/LC_MESSAGES/f-spot.mo
 share/locale/sv/LC_MESSAGES/f-spot.mo
 share/locale/zh_CN/LC_MESSAGES/f-spot.mo
+share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @dirrm lib/f-spot