- fix linking a bit more

- specify license for gio-sharp

x11/gnome/f-spot/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2009/01/31 09:15:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2009/01/31 11:07:59 jasper Exp $
 
 BROKEN=			segfault on startup
 
@@ -6,7 +6,7 @@ COMMENT=		personal photo management application for GNOME
 
 GNOME_VERSION=		0.5.0.3
 GNOME_PROJECT=		f-spot
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 SHARED_LIBS +=	fspoteog             0.0      # .0.0
 SHARED_LIBS +=	fspotjpegtran        0.0      # .0.0
 SHARED_LIBS +=	fspot                0.0      # .0.0
@@ -15,6 +15,7 @@ CATEGORIES=		graphics
 HOMEPAGE=		http://www.f-spot.org/
 
 # GPLv2
+# gio-sharp: LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -29,18 +30,25 @@ USE_X11=		Yes
 DESKTOP_FILES=		Yes
 MODGNOME_HELP_FILES=	Yes
 
-WANTLIB=		jpeg m
+WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
+WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
+WANTLIB += Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation
+WANTLIB += bonoboui-2 cairo crypto dbus-1 dbus-glib-1 expat fontconfig
+WANTLIB += freetype gailutil gc gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring
+WANTLIB += gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png popt ssl util xml2 z
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
-
 RUN_DEPENDS=		::graphics/libgphoto2 \
-			::lang/mono \
 			::sysutils/ndesk-dbus-glib \
 			::x11/gnome/doc-utils \
 			::x11/gnome/mono-gnome \
 			::x11/gnome/screensaver
 LIB_DEPENDS+=		exif::graphics/libexif \
-			lcms::graphics/lcms
+			lcms::graphics/lcms \
+			mono::lang/mono
 
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/f-spot \

x11/gnome/f-spot/patches/patch-libeog_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libeog_Makefile_in,v 1.1 2009/01/31 11:07:59 jasper Exp $
+
+Correct linking, from debian_libfspoteog-linkage.dpatch
+
+--- libeog/Makefile.in.orig	Sat Jan 31 11:26:09 2009
++++ libeog/Makefile.in	Sat Jan 31 11:26:54 2009
+@@ -51,7 +51,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(fspotlibdir)"
+ fspotlibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(fspotlib_LTLIBRARIES)
+-libfspoteog_la_LIBADD =
++libfspoteog_la_LIBADD = $(F_LIBS) $(LCMS_LIBS)
+ am__objects_1 = access.lo accessible-image-view-factory.lo \
+ 	accessible-image-view.lo eog-image.lo eog-pixbuf-util.lo \
+ 	eog-scroll-view.lo image-view.lo libeog-marshal.lo uta.lo \

x11/gnome/f-spot/patches/patch-libfspot_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libfspot_Makefile_in,v 1.1 2009/01/31 11:07:59 jasper Exp $
+
+Correct linking, from debian_libfspot-linkage.dpatch
+
+--- libfspot/Makefile.in.orig	Sat Jan 31 11:23:12 2009
++++ libfspot/Makefile.in	Sat Jan 31 11:23:38 2009
+@@ -320,6 +320,8 @@ libfspot_la_SOURCES = \
+ 	f-utils.h
+ 
+ libfspot_la_LIBADD = \
++	-lX11						\
++	$(F_LIBS)					\
+ 	$(LCMS_LIBS)					\
+ 	$(EXIF_LIBS)					\
+ 	$(top_builddir)/libjpegtran/libfspotjpegtran.la	\

x11/gnome/f-spot/patches/patch-libjpegtran_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libjpegtran_Makefile_in,v 1.1 2009/01/31 11:07:59 jasper Exp $
+
+Correct linking, from fix_libfspotjpegtran_linkage.dpatch
+
+--- libjpegtran/Makefile.in.orig	Sat Jan 31 11:27:07 2009
++++ libjpegtran/Makefile.in	Sat Jan 31 11:27:23 2009
+@@ -51,7 +51,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(fspotlibdir)"
+ fspotlibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(fspotlib_LTLIBRARIES)
+-libfspotjpegtran_la_LIBADD =
++libfspotjpegtran_la_LIBADD = $(F_LIBS)
+ am__objects_1 = jpeg-data.lo jpeg-marker.lo jpegtran.lo transupp.lo
+ am_libfspotjpegtran_la_OBJECTS = $(am__objects_1)
+ libfspotjpegtran_la_OBJECTS = $(am_libfspotjpegtran_la_OBJECTS)