4 files changed, 21 insertions, 45 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 607277a09c56..70d451877d34 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.39 2007/01/26 02:49:02 tmclau02 Exp $
+#   $Id: Makefile,v 1.43 2007/03/11 19:24:30 killfill Exp $
 #
 
 PORTNAME=	f-spot
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.5
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -28,6 +28,7 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index 70eef869cdab..25b08f7820f2 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,3 +1,3 @@
-MD5 (f-spot-0.3.2.tar.bz2) = 1084f359ee7de5a4d24ed37a72b1342a
-SHA256 (f-spot-0.3.2.tar.bz2) = a1ffa2d3c97cc0727902021e44f8476d90d503cc2376f39b2e6a132e9aee78a4
-SIZE (f-spot-0.3.2.tar.bz2) = 1709277
+MD5 (f-spot-0.3.5.tar.bz2) = dafa8ac8149b80d010cecee3629e39b5
+SHA256 (f-spot-0.3.5.tar.bz2) = 441997d27f0155ab2090b14dd6f29ccdf850f3565fa951dac5e589c75980a72b
+SIZE (f-spot-0.3.5.tar.bz2) = 1770616
diff --git a/graphics/f-spot/files/patch-src_f-spot.in b/graphics/f-spot/files/patch-src_f-spot.in
index b79bfdf277c3..e2345df6bb21 100644
--- a/graphics/f-spot/files/patch-src_f-spot.in
+++ b/graphics/f-spot/files/patch-src_f-spot.in
@@ -6,46 +6,6 @@
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
-@@ -16,23 +16,22 @@
- [ -n "$FSPOT_PROFILE" ] && FSPOT_PROFILE="--profile=$FSPOT_PROFILE"
- 
- for arg in $*; do
--    case "x--debug" in ("x$arg")
--        FSPOT_DEBUG=$arg
--    esac
--
--    case "x--trace=" in ("x${arg:0:8}")
--        FSPOT_TRACE=$arg
--    esac
--
--    case "x--profile=" in ("x${arg:0:10}")
--        FSPOT_PROFILE=$arg
--    esac
--
--    case "x--uninstalled" in ("x$arg")
--        echo "*** Running uninstalled f-spot ***"
--        EXE_TO_RUN="./f-spot.exe"
--        export MONO_PATH=../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../dbus-sharp:../dbus-sharp-glib:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:$MONO_PATH
--    esac
-+    case "x$arg" in
-+        x--debug)
-+            FSPOT_DEBUG="$arg"
-+            ;;
-+        x--trace=*)
-+		    FSPOT_TRACE="$arg"
-+            ;;
-+        x--profile=*)
-+            FSPOT_PROFILE="$arg"
-+            ;;
-+        x--uninstalled)
-+            echo "*** Running uninstalled f-spot ***"
-+            EXE_TO_RUN="./f-spot.exe"
-+            export MONO_PATH=../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../dbus-sharp:../dbus-sharp-glib:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:$MONO_PATH
-+            ;;
-+        esac
- done
- 
- if [ -n "$FSPOT_DEBUG" ]; then
 @@ -44,4 +43,4 @@
      echo "** Running Mono with $MONO_OPTIONS **"
  fi
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index 3f37ee491165..ee903ea141fa 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -39,9 +39,19 @@ share/gnome/applications/f-spot.desktop
 share/gnome/help/f-spot/C/f-spot.xml
 share/gnome/help/f-spot/C/figures/f-spot-fullscreen.png
 share/gnome/help/f-spot/C/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/da/f-spot.xml
+share/gnome/help/f-spot/da/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/da/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/fr/f-spot.xml
+share/gnome/help/f-spot/fr/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/fr/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/sv/f-spot.xml
 share/gnome/help/f-spot/sv/figures/f-spot-fullscreen.png
 share/gnome/help/f-spot/sv/figures/f-spot-slideshow.png
+share/gnome/omf/f-spot/f-spot-C.omf
+share/gnome/omf/f-spot/f-spot-da.omf
+share/gnome/omf/f-spot/f-spot-fr.omf
+share/gnome/omf/f-spot/f-spot-sv.omf
 share/icons/hicolor/16x16/apps/f-spot.png
 share/icons/hicolor/16x16/apps/f-spot.svg
 share/icons/hicolor/22x22/apps/f-spot.png
@@ -111,8 +121,13 @@ share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrm share/gnome/omf/f-spot
 @dirrm share/gnome/help/f-spot/sv/figures
 @dirrm share/gnome/help/f-spot/sv
+@dirrm share/gnome/help/f-spot/fr/figures
+@dirrm share/gnome/help/f-spot/fr
+@dirrm share/gnome/help/f-spot/da/figures
+@dirrm share/gnome/help/f-spot/da
 @dirrm share/gnome/help/f-spot/C/figures
 @dirrm share/gnome/help/f-spot/C
 @dirrm share/gnome/help/f-spot