ports/131492: Update graphics/f-spot to 0.5.0.3, unbreaks port

Christoph Moench-Tegeder cmt at burggraben.net
Sun Feb 8 12:20:09 UTC 2009


>Number:         131492
>Category:       ports
>Synopsis:       Update graphics/f-spot to 0.5.0.3, unbreaks port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 08 12:20:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Moench-Tegeder
>Release:        FreeBSD 7.1-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD elch.haidundneu23.net 7.1-RELEASE-p2 FreeBSD 7.1-RELEASE-p2 #17: Wed Jan 14 19:21:27 CET 2009 cmt at elch.haidundneu23.net:/usr/obj/usr/src/sys/CMT amd64

>Description:
	Attached patch updates graphics/f-spot to version 0.5.0.3 (current as
	of time of writing). Please note that this version of f-spot needs a
	current version of gtk-sharp20, see ports/131491 for an updated port.
	The included patch is also available at
	http://www.burggraben.net/hacks/graphics_f-spot_0400-0503.diff
	the complete port directory can be fetched from
	http://www.burggraben.net/hacks/fspot_port0503.tar.gz

>How-To-Repeat:

>Fix:

diff -Nru graphics/f-spot.orig/Makefile graphics/f-spot/Makefile
--- graphics/f-spot.orig/Makefile	2009-02-02 02:36:00.000000000 +0100
+++ graphics/f-spot/Makefile	2009-02-08 12:07:17.000000000 +0100
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	f-spot
-PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTVERSION=	0.5.0.3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
@@ -21,8 +20,6 @@
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
 
-BROKEN=		does not compile
-
 USE_BZIP2=	yes
 USE_SQLITE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack gnomesharp20
diff -Nru graphics/f-spot.orig/distinfo graphics/f-spot/distinfo
--- graphics/f-spot.orig/distinfo	2007-10-23 05:36:04.000000000 +0200
+++ graphics/f-spot/distinfo	2009-02-08 12:07:54.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (f-spot-0.4.0.tar.bz2) = 0f21ff56d310329185cc17a2fadda5fe
-SHA256 (f-spot-0.4.0.tar.bz2) = c0288df6c83b63698a47ad70ec596d424f1bf40e567c294a677e01f82df5348e
-SIZE (f-spot-0.4.0.tar.bz2) = 2178174
+MD5 (f-spot-0.5.0.3.tar.bz2) = 52db86f1dc715a3958425aa3d006c900
+SHA256 (f-spot-0.5.0.3.tar.bz2) = 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd
+SIZE (f-spot-0.5.0.3.tar.bz2) = 2776582
diff -Nru graphics/f-spot.orig/files/patch-icon-theme-installer graphics/f-spot/files/patch-icon-theme-installer
--- graphics/f-spot.orig/files/patch-icon-theme-installer	1970-01-01 01:00:00.000000000 +0100
+++ graphics/f-spot/files/patch-icon-theme-installer	2008-07-23 22:17:50.000000000 +0200
@@ -0,0 +1,19 @@
+--- icon-theme-installer.orig	2008-07-13 17:30:20.000000000 +0200
++++ icon-theme-installer	2008-07-13 17:29:42.000000000 +0200
+@@ -106,6 +106,7 @@
+ 	exit 1
+ fi
+ 
++INSTALL_DATA_EXEC="/usr/bin/$INSTALL_DATA_EXEC"
+ if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
+ 	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+ 	exit 1
+@@ -161,7 +162,7 @@
+ done
+ 
+ if test "x$INSTALL" = "xyes"; then
+-	gtk_update_icon_cache_bin="$((which gtk-update-icon-cache || echo /opt/gnome/bin/gtk-update-icon-cache)2>/dev/null)"
++	gtk_update_icon_cache_bin="/usr/local/bin/gtk-update-icon-cache"
+ 	gtk_update_icon_cache="$gtk_update_icon_cache_bin -f -t $INSTALL_BASE_DIR"
+ 
+ 	if test -z "$INSTALL_DEST_DIR"; then 
diff -Nru graphics/f-spot.orig/files/patch-mkinstalldirs graphics/f-spot/files/patch-mkinstalldirs
--- graphics/f-spot.orig/files/patch-mkinstalldirs	1970-01-01 01:00:00.000000000 +0100
+++ graphics/f-spot/files/patch-mkinstalldirs	2008-07-23 22:17:50.000000000 +0200
@@ -0,0 +1,41 @@
+--- mkinstalldirs.orig	2008-07-13 17:26:39.000000000 +0200
++++ mkinstalldirs	2008-07-13 17:25:49.000000000 +0200
+@@ -77,9 +77,9 @@
+ # ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+   '')
+-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-      echo "mkdir -p -- $*"
+-      exec mkdir -p -- "$@"
++    if gmkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++      echo "gmkdir -p -- $*"
++      exec gmkdir -p -- "$@"
+     else
+       # On NextStep and OpenStep, the `mkdir' command does not
+       # recognize any option.  It will interpret all options as
+@@ -90,10 +90,10 @@
+     fi
+     ;;
+   *)
+-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++    if gmkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+        test ! -d ./--version; then
+-      echo "mkdir -m $dirmode -p -- $*"
+-      exec mkdir -m "$dirmode" -p -- "$@"
++      echo "gmkdir -m $dirmode -p -- $*"
++      exec gmkdir -m "$dirmode" -p -- "$@"
+     else
+       # Clean up after NextStep and OpenStep mkdir.
+       for d in ./-m ./-p ./--version "./$dirmode";
+@@ -126,9 +126,9 @@
+     esac
+ 
+     if test ! -d "$pathcomp"; then
+-      echo "mkdir $pathcomp"
++      echo "gmkdir $pathcomp"
+ 
+-      mkdir "$pathcomp" || lasterr=$?
++      gmkdir "$pathcomp" || lasterr=$?
+ 
+       if test ! -d "$pathcomp"; then
+ 	errstatus=$lasterr
diff -Nru graphics/f-spot.orig/pkg-plist graphics/f-spot/pkg-plist
--- graphics/f-spot.orig/pkg-plist	2007-10-25 01:35:51.000000000 +0200
+++ graphics/f-spot/pkg-plist	2009-02-08 12:29:05.000000000 +0100
@@ -1,15 +1,21 @@
 bin/f-spot
 bin/f-spot-import
 bin/f-spot-sqlite-upgrade
+lib/f-spot/Cms.dll
+lib/f-spot/Cms.dll.config
+lib/f-spot/FSpot.Core.dll
+lib/f-spot/FSpot.JobScheduler.dll
+lib/f-spot/FSpot.Query.dll
+lib/f-spot/FSpot.Utils.dll
+lib/f-spot/FSpot.Utils.dll.config
+lib/f-spot/FSpot.Widgets.dll
 lib/f-spot/FlickrNet.dll
-lib/f-spot/Mono.Google.dll
+lib/f-spot/Mono.Addins.Gui.dll
+lib/f-spot/Mono.Addins.Setup.dll
 lib/f-spot/Mono.Addins.dll
 lib/f-spot/Mono.Addins.dll.config
-lib/f-spot/Mono.Addins.Setup.dll
-lib/f-spot/Mono.Addins.Gui.dll
-lib/f-spot/NDesk.DBus.GLib.dll
-lib/f-spot/NDesk.DBus.GLib.dll.config
-lib/f-spot/NDesk.DBus.dll
+lib/f-spot/Mono.Google.dll
+lib/f-spot/Mono.Tabblo.dll
 lib/f-spot/NDesk.Glitz.dll
 lib/f-spot/SemWeb.dll
 lib/f-spot/SmugMugNet.dll
@@ -19,9 +25,28 @@
 lib/f-spot/Tao.OpenGl.Glu.dll.config
 lib/f-spot/Tao.OpenGl.dll
 lib/f-spot/Tao.OpenGl.dll.config
+lib/f-spot/extensions/BeagleService.dll
+lib/f-spot/extensions/CDExport.dll
+lib/f-spot/extensions/ChangePhotoPath.dll
+lib/f-spot/extensions/DBusService.dll
+lib/f-spot/extensions/DefaultExporters.addin.xml
+lib/f-spot/extensions/DevelopInUFRaw.dll
+lib/f-spot/extensions/FacebookExport.dll
+lib/f-spot/extensions/FlickrExport.dll
+lib/f-spot/extensions/FolderExport.dll
+lib/f-spot/extensions/GalleryExport.dll
+lib/f-spot/extensions/HashJob.dll
+lib/f-spot/extensions/MergeDb.dll
+lib/f-spot/extensions/PicasaWebExport.dll
+lib/f-spot/extensions/RawPlusJpeg.dll
+lib/f-spot/extensions/SmugMugExport.dll
+lib/f-spot/extensions/TabbloExport.dll
+lib/f-spot/extensions/ZipExport.dll
 lib/f-spot/f-spot.exe
 lib/f-spot/f-spot.exe.config
 lib/f-spot/f-spot.global.addins
+lib/f-spot/gio-sharp.dll
+lib/f-spot/gio-sharp.dll.config
 lib/f-spot/gnome-keyring-sharp.dll
 lib/f-spot/libfspot.a
 lib/f-spot/libfspot.la
@@ -37,12 +62,15 @@
 lib/f-spot/libfspotjpegtran.so.0
 lib/f-spot/libgphoto2-sharp.dll
 lib/f-spot/libgphoto2-sharp.dll.config
-lib/f-spot/extensions/DefaultExporters.addin.xml
+lib/gio-sharp-unstable/gio-sharp.dll
+lib/gio-sharp-unstable/gio-sharp.dll.config
 libdata/pkgconfig/f-spot.pc
+libdata/pkgconfig/gio-sharp-unstable.pc
 libexec/gnome-screensaver/f-spot-screensaver
-share/gnome-screensaver/themes/f-spot-screensaver.desktop
+share/applications/f-spot-import.desktop
 share/applications/f-spot-view.desktop
 share/applications/f-spot.desktop
+share/applications/screensavers/f-spot-screensaver.desktop
 share/gnome/help/f-spot/C/f-spot.xml
 share/gnome/help/f-spot/C/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/C/figures/f-spot-autocolor.png
@@ -98,6 +126,17 @@
 share/gnome/help/f-spot/it/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/it/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/it/figures/f-spot-straighten.png
+share/gnome/help/f-spot/oc/f-spot.xml
+share/gnome/help/f-spot/oc/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/oc/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/oc/figures/f-spot-crop.png
+share/gnome/help/f-spot/oc/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/oc/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/oc/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/oc/figures/f-spot-sepia.png
+share/gnome/help/f-spot/oc/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/oc/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/oc/figures/f-spot-straighten.png
 share/gnome/help/f-spot/pt_BR/f-spot.xml
 share/gnome/help/f-spot/pt_BR/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/pt_BR/figures/f-spot-autocolor.png
@@ -109,6 +148,17 @@
 share/gnome/help/f-spot/pt_BR/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/pt_BR/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/pt_BR/figures/f-spot-straighten.png
+share/gnome/help/f-spot/ru/f-spot.xml
+share/gnome/help/f-spot/ru/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/ru/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/ru/figures/f-spot-crop.png
+share/gnome/help/f-spot/ru/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/ru/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/ru/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/ru/figures/f-spot-sepia.png
+share/gnome/help/f-spot/ru/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/ru/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/ru/figures/f-spot-straighten.png
 share/gnome/help/f-spot/sv/f-spot.xml
 share/gnome/help/f-spot/sv/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/sv/figures/f-spot-autocolor.png
@@ -120,23 +170,13 @@
 share/gnome/help/f-spot/sv/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/sv/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
-share/omf/f-spot/f-spot-C.omf
-share/omf/f-spot/f-spot-da.omf
-share/omf/f-spot/f-spot-es.omf
-share/omf/f-spot/f-spot-fr.omf
-share/omf/f-spot/f-spot-it.omf
-share/omf/f-spot/f-spot-pt_BR.omf
-share/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
-share/icons/hicolor/22x22/apps/f-spot.svg
 share/icons/hicolor/24x24/apps/f-spot.png
 share/icons/hicolor/32x32/apps/f-spot.png
-share/icons/hicolor/32x32/apps/f-spot.svg
-share/icons/hicolor/48x48/apps/f-spot.png
-share/icons/hicolor/48x48/apps/f-spot.svg
+share/icons/hicolor/scalable/apps/f-spot.svg
 share/locale/ar/LC_MESSAGES/f-spot.mo
+share/locale/be at latin/LC_MESSAGES/f-spot.mo
 share/locale/bg/LC_MESSAGES/f-spot.mo
 share/locale/ca/LC_MESSAGES/f-spot.mo
 share/locale/cs/LC_MESSAGES/f-spot.mo
@@ -153,37 +193,53 @@
 share/locale/fi/LC_MESSAGES/f-spot.mo
 share/locale/fr/LC_MESSAGES/f-spot.mo
 share/locale/gl/LC_MESSAGES/f-spot.mo
+share/locale/he/LC_MESSAGES/f-spot.mo
 share/locale/hi/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/ka/LC_MESSAGES/f-spot.mo
+share/locale/ko/LC_MESSAGES/f-spot.mo
 share/locale/lt/LC_MESSAGES/f-spot.mo
 share/locale/lv/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/oc/LC_MESSAGES/f-spot.mo
 share/locale/pa/LC_MESSAGES/f-spot.mo
 share/locale/pl/LC_MESSAGES/f-spot.mo
 share/locale/pt/LC_MESSAGES/f-spot.mo
 share/locale/pt_BR/LC_MESSAGES/f-spot.mo
 share/locale/ru/LC_MESSAGES/f-spot.mo
 share/locale/rw/LC_MESSAGES/f-spot.mo
+share/locale/sk/LC_MESSAGES/f-spot.mo
 share/locale/sr/LC_MESSAGES/f-spot.mo
-share/locale/sr at Latn/LC_MESSAGES/f-spot.mo
+share/locale/sr at latin/LC_MESSAGES/f-spot.mo
 share/locale/sv/LC_MESSAGES/f-spot.mo
 share/locale/th/LC_MESSAGES/f-spot.mo
+share/locale/uk/LC_MESSAGES/f-spot.mo
 share/locale/vi/LC_MESSAGES/f-spot.mo
 share/locale/zh_CN/LC_MESSAGES/f-spot.mo
+share/locale/zh_HK/LC_MESSAGES/f-spot.mo
 share/locale/zh_TW/LC_MESSAGES/f-spot.mo
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
+share/omf/f-spot/f-spot-C.omf
+share/omf/f-spot/f-spot-da.omf
+share/omf/f-spot/f-spot-es.omf
+share/omf/f-spot/f-spot-fr.omf
+share/omf/f-spot/f-spot-it.omf
+share/omf/f-spot/f-spot-oc.omf
+share/omf/f-spot/f-spot-pt_BR.omf
+share/omf/f-spot/f-spot-ru.omf
+share/omf/f-spot/f-spot-sv.omf
 @dirrm share/omf/f-spot
 @dirrm share/gnome/help/f-spot/sv/figures
 @dirrm share/gnome/help/f-spot/sv
+ at dirrm share/gnome/help/f-spot/ru/figures
+ at dirrm share/gnome/help/f-spot/ru
 @dirrm share/gnome/help/f-spot/pt_BR/figures
 @dirrm share/gnome/help/f-spot/pt_BR
+ at dirrm share/gnome/help/f-spot/oc/figures
+ at dirrm share/gnome/help/f-spot/oc
 @dirrm share/gnome/help/f-spot/it/figures
 @dirrm share/gnome/help/f-spot/it
 @dirrm share/gnome/help/f-spot/fr/figures
@@ -195,9 +251,7 @@
 @dirrm share/gnome/help/f-spot/C/figures
 @dirrm share/gnome/help/f-spot/C
 @dirrm share/gnome/help/f-spot
- at dirrmtry share/gnome-screensaver/themes
- at dirrmtry share/gnome-screensaver
 @dirrmtry libexec/gnome-screensaver
+ at dirrm lib/gio-sharp-unstable
 @dirrm lib/f-spot/extensions
 @dirrm lib/f-spot
- at dirrmtry share/applications


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list