diff options
| -rw-r--r-- | graphics/f-spot/Makefile | 10 | ||||
| -rw-r--r-- | graphics/f-spot/distinfo | 6 | ||||
| -rw-r--r-- | graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs | 11 | ||||
| -rw-r--r-- | graphics/f-spot/files/patch-libgphoto2-sharp::Port.cs | 187 | ||||
| -rw-r--r-- | graphics/f-spot/files/patch-libgphoto2-sharp::PortInfoList.cs | 74 | ||||
| -rw-r--r-- | graphics/f-spot/files/patch-src_f-spot.in | 12 | ||||
| -rw-r--r-- | graphics/f-spot/files/patch-src_main.cs | 11 | ||||
| -rw-r--r-- | graphics/f-spot/pkg-plist | 5 |
8 files changed, 22 insertions, 294 deletions
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile index 172e5073cd42..b0a233a9f9f4 100644 --- a/graphics/f-spot/Makefile +++ b/graphics/f-spot/Makefile @@ -3,15 +3,15 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ -# $Id: Makefile,v 1.28 2006/04/05 01:11:37 tmclau02 Exp $ +# $Id: Makefile,v 1.31 2006/10/03 02:37:44 tmclau02 Exp $ # PORTNAME= f-spot -PORTVERSION= 0.1.11 -PORTREVISION= 4 +PORTVERSION= 0.2.1 +PORTVERSION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.1 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 MAINTAINER= bsd-sharp-list@forge.novell.com COMMENT= Personal photo management to the GNOME desktop @@ -38,6 +38,8 @@ post-patch: @${REINPLACE_CMD} 's|target="liblcms.so.1"|target="liblcms.so"|g ; \ s|target="libexif.so.@EXIF_SOVERSION@"|target="libexif.so"|g' \ ${WRKSRC}/src/f-spot.exe.config.in + @${REINPLACE_CMD} 's|target="libgphoto2.so.2"|target="libgphoto2.so"|g'\ + ${WRKSRC}/libgphoto2-sharp/libgphoto2-sharp.dll.config .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include <bsd.port.mk> diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo index f6716feab534..cb490fbc6d59 100644 --- a/graphics/f-spot/distinfo +++ b/graphics/f-spot/distinfo @@ -1,3 +1,3 @@ -MD5 (f-spot-0.1.11.tar.bz2) = d4d75f6a5272fa15b5658abdf708b050 -SHA256 (f-spot-0.1.11.tar.bz2) = a278c1633301ba1eb83836f225eef8e7ff189fac7669d6f1b0b9bd377548e655 -SIZE (f-spot-0.1.11.tar.bz2) = 936744 +MD5 (f-spot-0.2.1.tar.bz2) = 75e9823a1cb32ebba43c533556d12bdb +SHA256 (f-spot-0.2.1.tar.bz2) = e7ae11735d006a648c08aab300ed853c7426ac6bb6ce383ddf4ac3d3340e24e4 +SIZE (f-spot-0.2.1.tar.bz2) = 996972 diff --git a/graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs b/graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs deleted file mode 100644 index 540ef7b804aa..000000000000 --- a/graphics/f-spot/files/patch-libgphoto2-sharp::ErrorCodes.cs +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 1f3157b4ace4..000000000000 --- a/graphics/f-spot/files/patch-libgphoto2-sharp::Port.cs +++ /dev/null @@ -1,187 +0,0 @@ ---- 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 deleted file mode 100644 index 24f4b6989974..000000000000 --- a/graphics/f-spot/files/patch-libgphoto2-sharp::PortInfoList.cs +++ /dev/null @@ -1,74 +0,0 @@ ---- 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/files/patch-src_f-spot.in b/graphics/f-spot/files/patch-src_f-spot.in index 9acd06472903..0f1ee54e83f4 100644 --- a/graphics/f-spot/files/patch-src_f-spot.in +++ b/graphics/f-spot/files/patch-src_f-spot.in @@ -1,6 +1,12 @@ ---- src/f-spot.in.orig Wed Mar 1 02:51:19 2006 -+++ src/f-spot.in Mon Apr 24 09:31:17 2006 -@@ -17,4 +17,4 @@ +--- src/f-spot.in.orig Thu Sep 7 17:56:20 2006 ++++ src/f-spot.in Mon Oct 2 22:35:40 2006 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +@@ -24,4 +24,4 @@ echo "*** Running F-Spot in Debug Mode ***" esac diff --git a/graphics/f-spot/files/patch-src_main.cs b/graphics/f-spot/files/patch-src_main.cs deleted file mode 100644 index 8385fcc5c773..000000000000 --- a/graphics/f-spot/files/patch-src_main.cs +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.cs.orig Sun Feb 26 17:37:08 2006 -+++ src/main.cs Wed Apr 5 16:22:56 2006 -@@ -142,6 +142,8 @@ - } - } catch (DllNotFoundException de) { - /* noop */ -+ } catch (EntryPointNotFoundException de) { -+ /* noop */ - } - } - } diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist index dbb0896cee5c..c86af40273f7 100644 --- a/graphics/f-spot/pkg-plist +++ b/graphics/f-spot/pkg-plist @@ -4,6 +4,8 @@ lib/f-spot/FlickrNet.dll lib/f-spot/SemWeb.dll lib/f-spot/f-spot.exe lib/f-spot/f-spot.exe.config +lib/f-spot/gnome-keyring-sharp.dll +lib/f-spot/google-sharp.dll lib/f-spot/libfspot.a lib/f-spot/libfspot.la lib/f-spot/libfspot.so @@ -34,6 +36,7 @@ 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/fa/LC_MESSAGES/f-spot.mo share/locale/fi/LC_MESSAGES/f-spot.mo share/locale/fr/LC_MESSAGES/f-spot.mo share/locale/gl/LC_MESSAGES/f-spot.mo @@ -41,9 +44,9 @@ 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/mk/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/pa/LC_MESSAGES/f-spot.mo share/locale/pl/LC_MESSAGES/f-spot.mo share/locale/pt_BR/LC_MESSAGES/f-spot.mo |