3 files changed, 72 insertions, 48 deletions

diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index da389ca0ffa8..95d1e90d8266 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/mail/geary/Makefile 20050 2014-11-10 09:22:41Z gusi $
 
 PORTNAME=	geary
-PORTVERSION=	0.10.0
+PORTVERSION=	0.12.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,30 +11,33 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mail client for GNOME 3
 
-LICENSE=	LGPL21+
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	BSD2CLAUSE CC-BY-3.0 LGPL21+
+LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	vapigen:lang/vala \
-		bash:shells/bash
+BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
-		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \
+		libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libnotify.so:devel/libnotify \
 		libgee-0.8.so:devel/libgee \
-		libgcr-3.so:security/gcr
-
-USES=		cmake desktop-file-utils gettext \
-		libtool localbase:ldflags pkgconfig shebangfix tar:xz
-USE_GNOME=	gnomedocutils gnomeprefix gtk30 intlhack
+		libgcr-3.so:security/gcr \
+		libsecret-1.so:security/libsecret \
+		libp11-kit.so:security/p11-kit \
+		libsoup-2.4.so:devel/libsoup \
+		libenchant.so:textproc/enchant
+
+USES=		cmake:outsource desktop-file-utils gettext libtool \
+		localbase:ldflags pkgconfig shebangfix sqlite tar:xz
+USE_GNOME=	cairo gnomedocutils gnomeprefix gtk30 intlhack introspection
 SHEBANG_FILES=	desktop/geary-attach
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-CMAKE_ARGS=	-DNO_FATAL_WARNINGS:BOOL=ON
-
-GLIB_SCHEMAS=	org.yorba.geary.gschema.xml
+CMAKE_ARGS=	-DNO_FATAL_WARNINGS:BOOL=ON \
+		-DISO_CODE_639_XML:STRING=${LOCALBASE}/share/xml/iso-codes/iso_639.xml \
+		-DISO_CODE_3166_XML:STRING=${LOCALBASE}/share/xml/iso-codes/iso_3166.xml
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|abort $$option||g' \
-		${WRKSRC}/configure
+GLIB_SCHEMAS=	org.gnome.Geary.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/mail/geary/distinfo b/mail/geary/distinfo
index 0ccca3db9ffe..9c6869a7d38c 100644
--- a/mail/geary/distinfo
+++ b/mail/geary/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/geary-0.10.0.tar.xz) = 46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5
-SIZE (gnome3/geary-0.10.0.tar.xz) = 917376
+TIMESTAMP = 1507156458
+SHA256 (gnome3/geary-0.12.0.tar.xz) = cef1093033ddfb52942b45c901562539cee7a192e981c7f19e2075ecb0c22446
+SIZE (gnome3/geary-0.12.0.tar.xz) = 1064064
diff --git a/mail/geary/pkg-plist b/mail/geary/pkg-plist
index 79c543c071d5..bc864da8fe64 100644
--- a/mail/geary/pkg-plist
+++ b/mail/geary/pkg-plist
@@ -1,8 +1,9 @@
 bin/geary
 bin/geary-attach
-share/appdata/geary.appdata.xml
+lib/geary/web-extensions/libgeary-web-process.so
+share/appdata/org.gnome.Geary.appdata.xml
 share/applications/geary-autostart.desktop
-share/applications/geary.desktop
+share/applications/org.gnome.Geary.desktop
 share/contractor/geary-attach.contract
 %%DATADIR%%/sql/version-001.sql
 %%DATADIR%%/sql/version-002.sql
@@ -28,26 +29,7 @@ share/contractor/geary-attach.contract
 %%DATADIR%%/sql/version-022.sql
 %%DATADIR%%/sql/version-023.sql
 %%DATADIR%%/sql/version-024.sql
-%%DATADIR%%/theming/message-viewer.css
-%%DATADIR%%/theming/message-viewer.html
-%%DATADIR%%/ui/accelerators.ui
-%%DATADIR%%/ui/account_cannot_remove.glade
-%%DATADIR%%/ui/account_list.glade
-%%DATADIR%%/ui/account_spinner.glade
-%%DATADIR%%/ui/app_menu.interface
-%%DATADIR%%/ui/certificate_warning_dialog.glade
-%%DATADIR%%/ui/composer.glade
-%%DATADIR%%/ui/composer_accelerators.ui
-%%DATADIR%%/ui/edit_alternate_emails.glade
-%%DATADIR%%/ui/find_bar.glade
-%%DATADIR%%/ui/login.glade
-%%DATADIR%%/ui/message.glade
-%%DATADIR%%/ui/password-dialog.glade
-%%DATADIR%%/ui/preferences.glade
-%%DATADIR%%/ui/remove_confirm.glade
-%%DATADIR%%/ui/toolbar_empty_menu.ui
-%%DATADIR%%/ui/toolbar_mark_menu.ui
-%%DATADIR%%/ui/upgrade_dialog.glade
+%%DATADIR%%/sql/version-025.sql
 share/gnome/help/geary/C/accounts.page
 share/gnome/help/geary/C/archive.page
 share/gnome/help/geary/C/bugs.page
@@ -133,6 +115,42 @@ share/gnome/help/geary/it/search.page
 share/gnome/help/geary/it/shortcuts.page
 share/gnome/help/geary/it/star.page
 share/gnome/help/geary/it/write.page
+share/gnome/help/geary/pl/accounts.page
+share/gnome/help/geary/pl/archive.page
+share/gnome/help/geary/pl/bugs.page
+share/gnome/help/geary/pl/index.page
+share/gnome/help/geary/pl/label.page
+share/gnome/help/geary/pl/limits.page
+share/gnome/help/geary/pl/overview.page
+share/gnome/help/geary/pl/preferences.page
+share/gnome/help/geary/pl/search.page
+share/gnome/help/geary/pl/shortcuts.page
+share/gnome/help/geary/pl/star.page
+share/gnome/help/geary/pl/write.page
+share/gnome/help/geary/pt_BR/accounts.page
+share/gnome/help/geary/pt_BR/archive.page
+share/gnome/help/geary/pt_BR/bugs.page
+share/gnome/help/geary/pt_BR/index.page
+share/gnome/help/geary/pt_BR/label.page
+share/gnome/help/geary/pt_BR/limits.page
+share/gnome/help/geary/pt_BR/overview.page
+share/gnome/help/geary/pt_BR/preferences.page
+share/gnome/help/geary/pt_BR/search.page
+share/gnome/help/geary/pt_BR/shortcuts.page
+share/gnome/help/geary/pt_BR/star.page
+share/gnome/help/geary/pt_BR/write.page
+share/gnome/help/geary/sv/accounts.page
+share/gnome/help/geary/sv/archive.page
+share/gnome/help/geary/sv/bugs.page
+share/gnome/help/geary/sv/index.page
+share/gnome/help/geary/sv/label.page
+share/gnome/help/geary/sv/limits.page
+share/gnome/help/geary/sv/overview.page
+share/gnome/help/geary/sv/preferences.page
+share/gnome/help/geary/sv/search.page
+share/gnome/help/geary/sv/shortcuts.page
+share/gnome/help/geary/sv/star.page
+share/gnome/help/geary/sv/write.page
 share/icons/hicolor/16x16/apps/geary.png
 share/icons/hicolor/24x24/apps/geary.png
 share/icons/hicolor/256x256/apps/geary.png
@@ -144,22 +162,23 @@ share/icons/hicolor/scalable/actions/detach-symbolic.svg
 share/icons/hicolor/scalable/actions/edit-symbolic.svg
 share/icons/hicolor/scalable/actions/format-text-remove-symbolic.svg
 share/icons/hicolor/scalable/actions/mail-archive-symbolic.svg
-share/icons/hicolor/scalable/actions/mail-forward-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mail-drafts-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/mail-drafts-symbolic.svg
+share/icons/hicolor/scalable/actions/mail-forward-symbolic-rtl.svg
 share/icons/hicolor/scalable/actions/mail-forward-symbolic.svg
 share/icons/hicolor/scalable/actions/mail-inbox-symbolic.svg
 share/icons/hicolor/scalable/actions/mail-outbox-symbolic.svg
-share/icons/hicolor/scalable/actions/mail-reply-all-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mail-reply-all-symbolic-rtl.svg
 share/icons/hicolor/scalable/actions/mail-reply-all-symbolic.svg
-share/icons/hicolor/scalable/actions/mail-reply-sender-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mail-reply-sender-symbolic-rtl.svg
 share/icons/hicolor/scalable/actions/mail-reply-sender-symbolic.svg
-share/icons/hicolor/scalable/actions/mail-sent-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/mail-sent-symbolic-rtl.svg
 share/icons/hicolor/scalable/actions/mail-sent-symbolic.svg
-share/icons/hicolor/scalable/actions/mail-spam-rtl-symbolic.svg
-share/icons/hicolor/scalable/actions/mail-spam-symbolic.svg
 share/icons/hicolor/scalable/actions/marker-symbolic.svg
-share/icons/hicolor/scalable/actions/tag-rtl-symbolic.svg
+share/icons/hicolor/scalable/actions/tag-symbolic-rtl.svg
 share/icons/hicolor/scalable/actions/tag-symbolic.svg
 share/icons/hicolor/scalable/actions/text-x-generic-symbolic.svg
+share/icons/hicolor/symbolic/apps/geary-symbolic.svg
 share/locale/ar/LC_MESSAGES/geary.mo
 share/locale/bs/LC_MESSAGES/geary.mo
 share/locale/ca/LC_MESSAGES/geary.mo
@@ -190,6 +209,7 @@ share/locale/lt/LC_MESSAGES/geary.mo
 share/locale/ms/LC_MESSAGES/geary.mo
 share/locale/nb/LC_MESSAGES/geary.mo
 share/locale/nl/LC_MESSAGES/geary.mo
+share/locale/oc/LC_MESSAGES/geary.mo
 share/locale/pl/LC_MESSAGES/geary.mo
 share/locale/pt/LC_MESSAGES/geary.mo
 share/locale/pt_BR/LC_MESSAGES/geary.mo