Update to 0.20.2:

Shotwell 0.20.2 - 31 October 2014
---------------------------------

  * Set Desktop Slideshow dialog resource now included in distribution (#739095)
  * Check for rendering failure in video thumbnailer (#738245)
  * Updated translations


Shotwell 0.20.1 - 2 October 2014
--------------------------------

  * Corrects problems with navigating photos in full-screen mode (#737092)
  * Better memory utilization via more conservative pixbuf cache (#715198)
  * Fixes minor bugs detected by better Vala code analysis


Shotwell 0.20.0 - 16 September 2014
-----------------------------------

  * Fix crash when deleting a photo in Shotwell Photo Viewer
  * Fix crash when deleting a photo
  * Better detection of corrupt files while importing
  * Updated translations


Shotwell 0.19.0 - 21 August 2014
--------------------------------

  * Support for Rajce.net and Gallery 3 photo services added
  * Set background image for lock screen
  * Better detection of corrupt images during import
  * Various bug fixes
  * Updated translations


Shotwell 0.18.1 - 30 Jun 2014
-----------------------------

  * Fix Flickr publishing errors due to Flickr moving to HTTPs-only
  * Fix crash when updating photo data/time
  * Fix crash due to nested tag and changing sidebar selection
  * Corrected URLs to point to new gnome.org pages


Shotwell 0.18.0 - 17 March 2014
-------------------------------

  * Compile and install translated help files
  * Updated translations


Shotwell 0.17.2 - 4 March 2014
------------------------------

  * UNIX pipe unnecessarily left open for each imported video
  * Improved searching for event comments and diacritics
  * Update translations


Shotwell 0.17.1 - 17 February 2014
----------------------------------

  * Updated translations
  * Parent folder names as search keywords rolled back (see bgo#722756)


Shotwell 0.17.0 - 4 February 2014
---------------------------------

  * Include parent folder names for keyword search
  * Tumblr publishing fixed
  * Bug fixes
  * Updated translations

4 files changed, 141 insertions, 88 deletions

diff --git a/graphics/shotwell-gtk3/Makefile b/graphics/shotwell-gtk3/Makefile
index b1d23d6b57f..639727b06f0 100644
--- a/graphics/shotwell-gtk3/Makefile
+++ b/graphics/shotwell-gtk3/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.32 2014/11/03 18:45:43 prlw1 Exp $
+# $NetBSD: Makefile,v 1.33 2014/11/24 16:08:38 wiz Exp $
 
-DISTNAME=		shotwell-0.15.1
-PKGREVISION=		6
+DISTNAME=		shotwell-0.20.2
 CATEGORIES=		graphics
-MASTER_SITES=		http://yorba.org/download/shotwell/0.15/
+MASTER_SITES=		https://download.gnome.org/sources/shotwell/0.20/
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
-HOMEPAGE=		http://yorba.org/shotwell/
+HOMEPAGE=		https://wiki.gnome.org/Apps/Shotwell
 COMMENT=		Shotwell is a photo organizer for the GNOME desktop
 LICENSE=		gnu-lgpl-v2.1
 
+BUILD_DEPENDS+=		gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils
+
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake bash pkg-config msgfmt
 
@@ -38,7 +39,7 @@ BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
 # Required for dealing with .svg icons. Spotted on a clean box
 .include "../../graphics/librsvg/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
-.include "../../lang/vala020/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/graphics/shotwell-gtk3/PLIST b/graphics/shotwell-gtk3/PLIST
index 7f43fc71b53..6d83c45e7c1 100644
--- a/graphics/shotwell-gtk3/PLIST
+++ b/graphics/shotwell-gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/12/04 12:57:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/11/24 16:08:38 wiz Exp $
 bin/shotwell
 lib/shotwell/plugins/builtin/f-spot-24.png
 lib/shotwell/plugins/builtin/facebook.png
@@ -6,11 +6,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
@@ -72,132 +78,186 @@ share/gnome/help/shotwell/C/share-upload.page
 share/gnome/help/shotwell/C/view-displaying.page
 share/gnome/help/shotwell/C/view-information.page
 share/gnome/help/shotwell/C/view-sidebar.page
+share/gnome/help/shotwell/el/edit-adjustments.page
+share/gnome/help/shotwell/el/edit-crop.page
+share/gnome/help/shotwell/el/edit-enhance.page
+share/gnome/help/shotwell/el/edit-external.page
+share/gnome/help/shotwell/el/edit-nondestructive.page
+share/gnome/help/shotwell/el/edit-redeye.page
+share/gnome/help/shotwell/el/edit-rotate.page
+share/gnome/help/shotwell/el/edit-straighten.page
+share/gnome/help/shotwell/el/edit-time-date.page
+share/gnome/help/shotwell/el/edit-undo.page
+share/gnome/help/shotwell/el/formats.page
+share/gnome/help/shotwell/el/import-camera.page
+share/gnome/help/shotwell/el/import-f-spot.page
+share/gnome/help/shotwell/el/import-file.page
+share/gnome/help/shotwell/el/import-memorycard.page
+share/gnome/help/shotwell/el/index.page
+share/gnome/help/shotwell/el/organize-event.page
+share/gnome/help/shotwell/el/organize-flag.page
+share/gnome/help/shotwell/el/organize-rating.page
+share/gnome/help/shotwell/el/organize-remove.page
+share/gnome/help/shotwell/el/organize-search.page
+share/gnome/help/shotwell/el/organize-tag.page
+share/gnome/help/shotwell/el/organize-title.page
+share/gnome/help/shotwell/el/other-files.page
+share/gnome/help/shotwell/el/other-missing.page
+share/gnome/help/shotwell/el/other-multiple.page
+share/gnome/help/shotwell/el/other-plugins.page
+share/gnome/help/shotwell/el/raw.page
+share/gnome/help/shotwell/el/running.page
+share/gnome/help/shotwell/el/share-background.page
+share/gnome/help/shotwell/el/share-export.page
+share/gnome/help/shotwell/el/share-print.page
+share/gnome/help/shotwell/el/share-send.page
+share/gnome/help/shotwell/el/share-slideshow.page
+share/gnome/help/shotwell/el/share-upload.page
+share/gnome/help/shotwell/el/view-displaying.page
+share/gnome/help/shotwell/el/view-information.page
+share/gnome/help/shotwell/el/view-sidebar.page
+share/gnome/help/shotwell/es/edit-adjustments.page
+share/gnome/help/shotwell/es/edit-crop.page
+share/gnome/help/shotwell/es/edit-enhance.page
+share/gnome/help/shotwell/es/edit-external.page
+share/gnome/help/shotwell/es/edit-nondestructive.page
+share/gnome/help/shotwell/es/edit-redeye.page
+share/gnome/help/shotwell/es/edit-rotate.page
+share/gnome/help/shotwell/es/edit-straighten.page
+share/gnome/help/shotwell/es/edit-time-date.page
+share/gnome/help/shotwell/es/edit-undo.page
+share/gnome/help/shotwell/es/formats.page
+share/gnome/help/shotwell/es/import-camera.page
+share/gnome/help/shotwell/es/import-f-spot.page
+share/gnome/help/shotwell/es/import-file.page
+share/gnome/help/shotwell/es/import-memorycard.page
+share/gnome/help/shotwell/es/index.page
+share/gnome/help/shotwell/es/organize-event.page
+share/gnome/help/shotwell/es/organize-flag.page
+share/gnome/help/shotwell/es/organize-rating.page
+share/gnome/help/shotwell/es/organize-remove.page
+share/gnome/help/shotwell/es/organize-search.page
+share/gnome/help/shotwell/es/organize-tag.page
+share/gnome/help/shotwell/es/organize-title.page
+share/gnome/help/shotwell/es/other-files.page
+share/gnome/help/shotwell/es/other-missing.page
+share/gnome/help/shotwell/es/other-multiple.page
+share/gnome/help/shotwell/es/other-plugins.page
+share/gnome/help/shotwell/es/raw.page
+share/gnome/help/shotwell/es/running.page
+share/gnome/help/shotwell/es/share-background.page
+share/gnome/help/shotwell/es/share-export.page
+share/gnome/help/shotwell/es/share-print.page
+share/gnome/help/shotwell/es/share-send.page
+share/gnome/help/shotwell/es/share-slideshow.page
+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
 share/locale/af/LC_MESSAGES/shotwell.mo
-share/locale/af_ZA/LC_MESSAGES/shotwell.mo
-share/locale/ar/LC_MESSAGES/shotwell-extras.mo
 share/locale/ar/LC_MESSAGES/shotwell.mo
-share/locale/as/LC_MESSAGES/shotwell-extras.mo
 share/locale/as/LC_MESSAGES/shotwell.mo
-share/locale/ast/LC_MESSAGES/shotwell-extras.mo
 share/locale/ast/LC_MESSAGES/shotwell.mo
-share/locale/bg/LC_MESSAGES/shotwell-extras.mo
 share/locale/bg/LC_MESSAGES/shotwell.mo
-share/locale/bn/LC_MESSAGES/shotwell-extras.mo
 share/locale/bn/LC_MESSAGES/shotwell.mo
-share/locale/bn_IN/LC_MESSAGES/shotwell-extras.mo
 share/locale/bn_IN/LC_MESSAGES/shotwell.mo
-share/locale/ca/LC_MESSAGES/shotwell-extras.mo
 share/locale/ca/LC_MESSAGES/shotwell.mo
-share/locale/cs/LC_MESSAGES/shotwell-extras.mo
 share/locale/cs/LC_MESSAGES/shotwell.mo
-share/locale/da/LC_MESSAGES/shotwell-extras.mo
 share/locale/da/LC_MESSAGES/shotwell.mo
-share/locale/de/LC_MESSAGES/shotwell-extras.mo
 share/locale/de/LC_MESSAGES/shotwell.mo
-share/locale/el/LC_MESSAGES/shotwell-extras.mo
 share/locale/el/LC_MESSAGES/shotwell.mo
-share/locale/en_GB/LC_MESSAGES/shotwell-extras.mo
 share/locale/en_GB/LC_MESSAGES/shotwell.mo
-share/locale/eo/LC_MESSAGES/shotwell-extras.mo
-share/locale/es/LC_MESSAGES/shotwell-extras.mo
+share/locale/eo/LC_MESSAGES/shotwell.mo
 share/locale/es/LC_MESSAGES/shotwell.mo
-share/locale/et/LC_MESSAGES/shotwell-extras.mo
 share/locale/et/LC_MESSAGES/shotwell.mo
-share/locale/eu/LC_MESSAGES/shotwell-extras.mo
 share/locale/eu/LC_MESSAGES/shotwell.mo
-share/locale/fi/LC_MESSAGES/shotwell-extras.mo
 share/locale/fi/LC_MESSAGES/shotwell.mo
-share/locale/fr/LC_MESSAGES/shotwell-extras.mo
 share/locale/fr/LC_MESSAGES/shotwell.mo
-share/locale/gl/LC_MESSAGES/shotwell-extras.mo
+share/locale/gd/LC_MESSAGES/shotwell.mo
 share/locale/gl/LC_MESSAGES/shotwell.mo
-share/locale/gu/LC_MESSAGES/shotwell-extras.mo
 share/locale/gu/LC_MESSAGES/shotwell.mo
-share/locale/he/LC_MESSAGES/shotwell-extras.mo
 share/locale/he/LC_MESSAGES/shotwell.mo
-share/locale/hi/LC_MESSAGES/shotwell-extras.mo
 share/locale/hi/LC_MESSAGES/shotwell.mo
-share/locale/hr/LC_MESSAGES/shotwell-extras.mo
 share/locale/hr/LC_MESSAGES/shotwell.mo
-share/locale/hu/LC_MESSAGES/shotwell-extras.mo
 share/locale/hu/LC_MESSAGES/shotwell.mo
 share/locale/ia/LC_MESSAGES/shotwell.mo
-share/locale/id/LC_MESSAGES/shotwell-extras.mo
 share/locale/id/LC_MESSAGES/shotwell.mo
-share/locale/id_ID/LC_MESSAGES/shotwell-extras.mo
-share/locale/id_ID/LC_MESSAGES/shotwell.mo
-share/locale/it/LC_MESSAGES/shotwell-extras.mo
 share/locale/it/LC_MESSAGES/shotwell.mo
-share/locale/ja/LC_MESSAGES/shotwell-extras.mo
 share/locale/ja/LC_MESSAGES/shotwell.mo
-share/locale/kk/LC_MESSAGES/shotwell-extras.mo
 share/locale/kk/LC_MESSAGES/shotwell.mo
 share/locale/km/LC_MESSAGES/shotwell.mo
-share/locale/kn/LC_MESSAGES/shotwell-extras.mo
 share/locale/kn/LC_MESSAGES/shotwell.mo
-share/locale/ko/LC_MESSAGES/shotwell-extras.mo
 share/locale/ko/LC_MESSAGES/shotwell.mo
 share/locale/ky/LC_MESSAGES/shotwell.mo
-share/locale/lt/LC_MESSAGES/shotwell-extras.mo
 share/locale/lt/LC_MESSAGES/shotwell.mo
-share/locale/lv/LC_MESSAGES/shotwell-extras.mo
 share/locale/lv/LC_MESSAGES/shotwell.mo
-share/locale/mk/LC_MESSAGES/shotwell-extras.mo
 share/locale/mk/LC_MESSAGES/shotwell.mo
-share/locale/ml/LC_MESSAGES/shotwell-extras.mo
 share/locale/ml/LC_MESSAGES/shotwell.mo
-share/locale/mr/LC_MESSAGES/shotwell-extras.mo
 share/locale/mr/LC_MESSAGES/shotwell.mo
-share/locale/nb/LC_MESSAGES/shotwell-extras.mo
 share/locale/nb/LC_MESSAGES/shotwell.mo
-share/locale/nl/LC_MESSAGES/shotwell-extras.mo
 share/locale/nl/LC_MESSAGES/shotwell.mo
-share/locale/nn_NO/LC_MESSAGES/shotwell-extras.mo
-share/locale/nn_NO/LC_MESSAGES/shotwell.mo
-share/locale/or/LC_MESSAGES/shotwell-extras.mo
+share/locale/nn/LC_MESSAGES/shotwell.mo
 share/locale/or/LC_MESSAGES/shotwell.mo
-share/locale/pa/LC_MESSAGES/shotwell-extras.mo
 share/locale/pa/LC_MESSAGES/shotwell.mo
-share/locale/pl/LC_MESSAGES/shotwell-extras.mo
 share/locale/pl/LC_MESSAGES/shotwell.mo
-share/locale/pt/LC_MESSAGES/shotwell-extras.mo
 share/locale/pt/LC_MESSAGES/shotwell.mo
-share/locale/pt_BR/LC_MESSAGES/shotwell-extras.mo
 share/locale/pt_BR/LC_MESSAGES/shotwell.mo
-share/locale/ro/LC_MESSAGES/shotwell-extras.mo
 share/locale/ro/LC_MESSAGES/shotwell.mo
-share/locale/ru/LC_MESSAGES/shotwell-extras.mo
 share/locale/ru/LC_MESSAGES/shotwell.mo
-share/locale/sk/LC_MESSAGES/shotwell-extras.mo
 share/locale/sk/LC_MESSAGES/shotwell.mo
-share/locale/sl/LC_MESSAGES/shotwell-extras.mo
 share/locale/sl/LC_MESSAGES/shotwell.mo
-share/locale/sr/LC_MESSAGES/shotwell-extras.mo
 share/locale/sr/LC_MESSAGES/shotwell.mo
-share/locale/sv/LC_MESSAGES/shotwell-extras.mo
+share/locale/sr@latin/LC_MESSAGES/shotwell.mo
 share/locale/sv/LC_MESSAGES/shotwell.mo
-share/locale/ta/LC_MESSAGES/shotwell-extras.mo
 share/locale/ta/LC_MESSAGES/shotwell.mo
-share/locale/ta_IN/LC_MESSAGES/shotwell.mo
-share/locale/te/LC_MESSAGES/shotwell-extras.mo
 share/locale/te/LC_MESSAGES/shotwell.mo
-share/locale/te_IN/LC_MESSAGES/shotwell.mo
-share/locale/th/LC_MESSAGES/shotwell-extras.mo
 share/locale/th/LC_MESSAGES/shotwell.mo
-share/locale/tr/LC_MESSAGES/shotwell-extras.mo
 share/locale/tr/LC_MESSAGES/shotwell.mo
-share/locale/tr_TR/LC_MESSAGES/shotwell-extras.mo
-share/locale/tr_TR/LC_MESSAGES/shotwell.mo
-share/locale/uk/LC_MESSAGES/shotwell-extras.mo
 share/locale/uk/LC_MESSAGES/shotwell.mo
-share/locale/vi/LC_MESSAGES/shotwell-extras.mo
 share/locale/vi/LC_MESSAGES/shotwell.mo
-share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
-share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo
+share/locale/zh_HK/LC_MESSAGES/shotwell.mo
 share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 share/shotwell/icons/all-rejected.png
 share/shotwell/icons/crop-pivot-reticle.png
@@ -263,6 +323,7 @@ share/shotwell/ui/savedsearch.ui
 share/shotwell/ui/search_bar.ui
 share/shotwell/ui/search_sidebar_context.ui
 share/shotwell/ui/set_background_dialog.glade
+share/shotwell/ui/set_background_slideshow_dialog.glade
 share/shotwell/ui/shotwell.glade
 share/shotwell/ui/shotwell.xml
 share/shotwell/ui/sidebar_default_context.ui
diff --git a/graphics/shotwell-gtk3/distinfo b/graphics/shotwell-gtk3/distinfo
index 493765027f0..42c20d407c5 100644
--- a/graphics/shotwell-gtk3/distinfo
+++ b/graphics/shotwell-gtk3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/12/04 12:57:47 drochner Exp $
+$NetBSD: distinfo,v 1.8 2014/11/24 16:08:38 wiz Exp $
 
-SHA1 (shotwell-0.15.1.tar.xz) = 73cace6b81eb273edff13ce0aeeeeba85edfad7f
-RMD160 (shotwell-0.15.1.tar.xz) = 3d16687fdb2bcc39c61b680f9497d586de0860f9
-Size (shotwell-0.15.1.tar.xz) = 1676428 bytes
-SHA1 (patch-aa) = 3651a0b2f426440ee2cedf030ad90cf383eeadef
+SHA1 (shotwell-0.20.2.tar.xz) = f69ea2a2fc6ae1dad0f56bf85d1a3275dd8a6f1e
+RMD160 (shotwell-0.20.2.tar.xz) = 25c282de74f5dd35f0f44f05067eec4db6f4d33e
+Size (shotwell-0.20.2.tar.xz) = 1815580 bytes
+SHA1 (patch-aa) = 23f6982e1ba135c706afc6983c48602f6060dfad
 SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
 SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
diff --git a/graphics/shotwell-gtk3/patches/patch-aa b/graphics/shotwell-gtk3/patches/patch-aa
index 4d4120c6d5b..22d921d6e4a 100644
--- a/graphics/shotwell-gtk3/patches/patch-aa
+++ b/graphics/shotwell-gtk3/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2013/12/04 12:57:47 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2014/11/24 16:08:38 wiz Exp $
 
 --- Makefile.orig	2013-11-19 02:16:36.000000000 +0000
 +++ Makefile
-@@ -10,7 +10,7 @@ BUILD_ROOT = 1
- ifndef VALAC
- VALAC := $(shell which valac)
- else
--VALAC := $(shell which $VALAC)
-+#VALAC := $(shell which $VALAC)
- endif
- 
- VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
 @@ -315,7 +315,6 @@ EXT_PKGS = \
  	gstreamer-base-1.0 \
  	gstreamer-pbutils-1.0 \
@@ -45,7 +36,7 @@ $NetBSD: patch-aa,v 1.4 2013/12/04 12:57:47 drochner Exp $
  misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
  	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
  	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
-@@ -736,7 +734,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
+@@ -736,7 +732,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
  
  .PHONY: $(PLUGINS_DIR)
  $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)