5 files changed, 56 insertions, 36 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index c0038c31b1e9..d5b81812f465 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shotwell
-PORTVERSION=	0.18.1
-PORTREVISION=	1
+PORTVERSION=	0.20.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
 
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 707089672e24..3f05239f6686 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shotwell-0.18.1.tar.xz) = af1e1a682a7d293b04970b81f2c25c267f5dd9b2cd7b1ebc84eb0bb45c123317
-SIZE (shotwell-0.18.1.tar.xz) = 1727276
+SHA256 (shotwell-0.20.0.tar.xz) = d698ee59e2b582b4553ff343aa92a5bbc3e56146e5cbd3f2af321be4bca56f70
+SIZE (shotwell-0.20.0.tar.xz) = 1809492
diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile
index 565136b2b6a2..76479fe3b183 100644
--- a/graphics/shotwell/files/patch-Makefile
+++ b/graphics/shotwell/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2013-11-09 18:33:15.000000000 +0100
-+++ Makefile	2013-11-09 18:46:05.000000000 +0100
-@@ -315,7 +315,6 @@
+--- Makefile.orig	2014-09-28 18:41:10.000000000 +0200
++++ Makefile	2014-09-28 18:43:30.000000000 +0200
+@@ -261,7 +261,6 @@
  	gstreamer-base-1.0 \
  	gstreamer-pbutils-1.0 \
  	gtk+-3.0 \
@@ -8,7 +8,7 @@
  	libexif \
  	libgphoto2 \
  	json-glib-1.0 \
-@@ -347,7 +346,6 @@
+@@ -293,7 +292,6 @@
  	gstreamer-plugins-base-1.0 >= 1.0.0 \
  	gstreamer-pbutils-1.0 >= 1.0.0 \
  	gtk+-3.0 >= 3.6.0 \
@@ -16,17 +16,7 @@
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libraw >= 0.13.2 \
-@@ -461,6 +459,9 @@
- # Required for gudev-1.0
- CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
- 
-+# do not forget about libintl
-+LDFLAGS += -lintl
-+
- all: pkgcheck valacheck desktop
- 
- ifdef ENABLE_BUILD_FOR_GLADE
-@@ -591,8 +592,8 @@
+@@ -543,8 +541,8 @@
  	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
  endif
  ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
diff --git a/graphics/shotwell/files/patch-src-camera-CameraTable.vala b/graphics/shotwell/files/patch-src-camera-CameraTable.vala
index 077519b031b7..e146a2bf828c 100644
--- a/graphics/shotwell/files/patch-src-camera-CameraTable.vala
+++ b/graphics/shotwell/files/patch-src-camera-CameraTable.vala
@@ -1,5 +1,5 @@
---- src/camera/CameraTable.vala.orig	2013-11-09 18:20:35.000000000 +0100
-+++ src/camera/CameraTable.vala	2013-11-09 18:24:57.000000000 +0100
+--- src/camera/CameraTable.vala.orig	2014-09-28 18:49:39.000000000 +0200
++++ src/camera/CameraTable.vala	2014-09-28 19:10:01.000000000 +0200
 @@ -26,7 +26,6 @@
      
      private static CameraTable instance = null;
diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist
index bf141a8ce227..4124ff977d2b 100644
--- a/graphics/shotwell/pkg-plist
+++ b/graphics/shotwell/pkg-plist
@@ -5,11 +5,17 @@ lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/flickr.png
 lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade
 lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/gallery3.png
+lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
+lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/picasa.png
 lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/piwigo.png
 lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
 lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/rajce.png
+lib/shotwell/plugins/builtin/rajce_authentication_pane.glade
+lib/shotwell/plugins/builtin/rajce_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/shotwell-data-imports.so
 lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
 lib/shotwell/plugins/builtin/shotwell-publishing.so
@@ -147,6 +153,44 @@ share/gnome/help/shotwell/es/share-upload.page
 share/gnome/help/shotwell/es/view-displaying.page
 share/gnome/help/shotwell/es/view-information.page
 share/gnome/help/shotwell/es/view-sidebar.page
+share/gnome/help/shotwell/hu/edit-adjustments.page
+share/gnome/help/shotwell/hu/edit-crop.page
+share/gnome/help/shotwell/hu/edit-enhance.page
+share/gnome/help/shotwell/hu/edit-external.page
+share/gnome/help/shotwell/hu/edit-nondestructive.page
+share/gnome/help/shotwell/hu/edit-redeye.page
+share/gnome/help/shotwell/hu/edit-rotate.page
+share/gnome/help/shotwell/hu/edit-straighten.page
+share/gnome/help/shotwell/hu/edit-time-date.page
+share/gnome/help/shotwell/hu/edit-undo.page
+share/gnome/help/shotwell/hu/formats.page
+share/gnome/help/shotwell/hu/import-camera.page
+share/gnome/help/shotwell/hu/import-f-spot.page
+share/gnome/help/shotwell/hu/import-file.page
+share/gnome/help/shotwell/hu/import-memorycard.page
+share/gnome/help/shotwell/hu/index.page
+share/gnome/help/shotwell/hu/organize-event.page
+share/gnome/help/shotwell/hu/organize-flag.page
+share/gnome/help/shotwell/hu/organize-rating.page
+share/gnome/help/shotwell/hu/organize-remove.page
+share/gnome/help/shotwell/hu/organize-search.page
+share/gnome/help/shotwell/hu/organize-tag.page
+share/gnome/help/shotwell/hu/organize-title.page
+share/gnome/help/shotwell/hu/other-files.page
+share/gnome/help/shotwell/hu/other-missing.page
+share/gnome/help/shotwell/hu/other-multiple.page
+share/gnome/help/shotwell/hu/other-plugins.page
+share/gnome/help/shotwell/hu/raw.page
+share/gnome/help/shotwell/hu/running.page
+share/gnome/help/shotwell/hu/share-background.page
+share/gnome/help/shotwell/hu/share-export.page
+share/gnome/help/shotwell/hu/share-print.page
+share/gnome/help/shotwell/hu/share-send.page
+share/gnome/help/shotwell/hu/share-slideshow.page
+share/gnome/help/shotwell/hu/share-upload.page
+share/gnome/help/shotwell/hu/view-displaying.page
+share/gnome/help/shotwell/hu/view-information.page
+share/gnome/help/shotwell/hu/view-sidebar.page
 share/icons/hicolor/16x16/apps/shotwell.svg
 share/icons/hicolor/24x24/apps/shotwell.svg
 share/icons/hicolor/scalable/apps/shotwell.svg
@@ -169,6 +213,7 @@ share/locale/et/LC_MESSAGES/shotwell.mo
 share/locale/eu/LC_MESSAGES/shotwell.mo
 share/locale/fi/LC_MESSAGES/shotwell.mo
 share/locale/fr/LC_MESSAGES/shotwell.mo
+share/locale/gd/LC_MESSAGES/shotwell.mo
 share/locale/gl/LC_MESSAGES/shotwell.mo
 share/locale/gu/LC_MESSAGES/shotwell.mo
 share/locale/he/LC_MESSAGES/shotwell.mo
@@ -202,6 +247,7 @@ share/locale/ru/LC_MESSAGES/shotwell.mo
 share/locale/sk/LC_MESSAGES/shotwell.mo
 share/locale/sl/LC_MESSAGES/shotwell.mo
 share/locale/sr/LC_MESSAGES/shotwell.mo
+share/locale/sr@latin/LC_MESSAGES/shotwell.mo
 share/locale/sv/LC_MESSAGES/shotwell.mo
 share/locale/ta/LC_MESSAGES/shotwell.mo
 share/locale/te/LC_MESSAGES/shotwell.mo
@@ -283,18 +329,3 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/ui/tags.ui
 %%DATADIR%%/ui/top.ui
 %%DATADIR%%/ui/trash.ui
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm share/gnome/help/shotwell/C/figures
-@dirrm share/gnome/help/shotwell/C
-@dirrm share/gnome/help/shotwell/es
-@dirrm share/gnome/help/shotwell/el
-@dirrm share/gnome/help/shotwell
-@dirrmtry share/appdata
-@dirrm libexec/shotwell
-@dirrm lib/shotwell/plugins/builtin
-@dirrm lib/shotwell/plugins
-@dirrm lib/shotwell
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true