- Update to 0.18.0.

- Pass maintainership to submitter.

PR:		191196
Submitted by:	cmt@burggraben.net

3 files changed, 88 insertions, 86 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 60267b63be5a..dbb07280f13c 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	shotwell
-PORTVERSION=	0.15.1
-PORTREVISION=	2
+PORTVERSION=	0.18.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cmt@burggraben.net
 COMMENT=	Open source photo manager for GNOME
 
 LICENSE=	LGPL21
@@ -27,7 +26,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		librest-0.7.so:${PORTSDIR}/devel/librest
 
 USES=		shebangfix gettext desktop-file-utils gmake pkgconfig tar:xz
-USE_GNOME=	gnomehier gconf2 gtk20 librsvg2
+USE_GNOME=	gnomehier gconf2 gtk20 gnomedocutils librsvg2
 USE_SQLITE=	3
 USE_GSTREAMER1=	yes
 HAS_CONFIGURE=	yes
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index f11aad378bd7..182e41ba6172 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shotwell-0.15.1.tar.xz) = eb48a0398774f172feaa4461146cc81a99540147bd8751c1e2091b21d4c20b8b
-SIZE (shotwell-0.15.1.tar.xz) = 1676428
+SHA256 (shotwell-0.18.0.tar.xz) = 6717b73cb243918ae71d251fddae27d0967a1d26727b43beefc40d3782fe0033
+SIZE (shotwell-0.18.0.tar.xz) = 1727216
diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist
index e4a1fac42881..bf141a8ce227 100644
--- a/graphics/shotwell/pkg-plist
+++ b/graphics/shotwell/pkg-plist
@@ -23,9 +23,11 @@ lib/shotwell/plugins/builtin/youtube.png
 lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade
 libexec/shotwell/shotwell-settings-migrator
 libexec/shotwell/shotwell-video-thumbnailer
+share/GConf/gsettings/shotwell.convert
 share/appdata/shotwell.appdata.xml
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
+share/glib-2.0/schemas/gschemas.compiled
 share/gnome/help/shotwell/C/edit-adjustments.page
 share/gnome/help/shotwell/C/edit-crop.page
 share/gnome/help/shotwell/C/edit-enhance.page
@@ -69,134 +71,147 @@ 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/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/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/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/GConf/gsettings/shotwell.convert
 %%DATADIR%%/icons/all-rejected.png
 %%DATADIR%%/icons/crop-pivot-reticle.png
 %%DATADIR%%/icons/crop.svg
@@ -271,22 +286,10 @@ share/GConf/gsettings/shotwell.convert
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/tr_TR/LC_MESSAGES
-@dirrmtry share/locale/tr_TR
-@dirrmtry share/locale/te_IN/LC_MESSAGES
-@dirrmtry share/locale/te_IN
-@dirrmtry share/locale/ta_IN/LC_MESSAGES
-@dirrmtry share/locale/ta_IN
-@dirrmtry share/locale/nn_NO/LC_MESSAGES
-@dirrmtry share/locale/nn_NO
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/id_ID/LC_MESSAGES
-@dirrmtry share/locale/id_ID
-@dirrmtry share/locale/af_ZA/LC_MESSAGES
-@dirrmtry share/locale/af_ZA
 @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