From 323fabe2d9edcc3864cdd2227581cfd05e4f5180 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sat, 31 Jan 2009 09:15:33 +0000
Subject: [PATCH] - set missing MODGNOME_HELP_FILES - re-order dependencies -
 don't install f-spot-import (needs HAL) (still doesn't work though)

ok ajacoutot@
---
 x11/gnome/f-spot/Makefile                        | 10 ++++++----
 x11/gnome/f-spot/patches/patch-tools_Makefile_in | 16 ++++++++++++++++
 x11/gnome/f-spot/pkg/PLIST                       |  3 +--
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 x11/gnome/f-spot/patches/patch-tools_Makefile_in

diff --git a/x11/gnome/f-spot/Makefile b/x11/gnome/f-spot/Makefile
index 7d5c8b35d27..f262e5b9a6e 100644
--- a/x11/gnome/f-spot/Makefile
+++ b/x11/gnome/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/01/26 14:40:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2009/01/31 09:15:33 jasper Exp $
 
 BROKEN=			segfault on startup
 
@@ -6,6 +6,7 @@ COMMENT=		personal photo management application for GNOME
 
 GNOME_VERSION=		0.5.0.3
 GNOME_PROJECT=		f-spot
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS +=	fspoteog             0.0      # .0.0
 SHARED_LIBS +=	fspotjpegtran        0.0      # .0.0
 SHARED_LIBS +=	fspot                0.0      # .0.0
@@ -26,17 +27,18 @@ MODULES=		devel/gettext \
 USE_X11=		Yes
 
 DESKTOP_FILES=		Yes
+MODGNOME_HELP_FILES=	Yes
 
 WANTLIB=		jpeg m
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
 
-RUN_DEPENDS=		::lang/mono \
+RUN_DEPENDS=		::graphics/libgphoto2 \
+			::lang/mono \
 			::sysutils/ndesk-dbus-glib \
-			::x11/gnome/screensaver \
 			::x11/gnome/doc-utils \
 			::x11/gnome/mono-gnome \
-			::graphics/libgphoto2
+			::x11/gnome/screensaver
 LIB_DEPENDS+=		exif::graphics/libexif \
 			lcms::graphics/lcms
 
diff --git a/x11/gnome/f-spot/patches/patch-tools_Makefile_in b/x11/gnome/f-spot/patches/patch-tools_Makefile_in
new file mode 100644
index 00000000000..de9ab37affb
--- /dev/null
+++ b/x11/gnome/f-spot/patches/patch-tools_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-tools_Makefile_in,v 1.1 2009/01/31 09:15:33 jasper Exp $
+
+The f-spot-import script needs HAL to work, which we don't have.
+
+--- tools/Makefile.in.orig	Sat Jan 31 09:53:44 2009
++++ tools/Makefile.in	Sat Jan 31 09:53:53 2009
+@@ -288,8 +288,7 @@ DISTCLEANFILES = \
+ 
+ saverdir = @GNOME_SCREENSAVER_SAVERDIR@
+ saver_SCRIPTS = f-spot-screensaver
+-bin_SCRIPTS = f-spot-import	\
+-	f-spot-sqlite-upgrade
++bin_SCRIPTS = f-spot-sqlite-upgrade
+ 
+ all: all-am
+ 
diff --git a/x11/gnome/f-spot/pkg/PLIST b/x11/gnome/f-spot/pkg/PLIST
index eeed95b3fb6..b4db6e73a6a 100644
--- a/x11/gnome/f-spot/pkg/PLIST
+++ b/x11/gnome/f-spot/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/01/26 14:40:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2009/01/31 09:15:33 jasper Exp $
 %%SHARED%%
 bin/f-spot
-bin/f-spot-import
 bin/f-spot-sqlite-upgrade
 lib/f-spot/
 lib/f-spot/Cms.dll