3 files changed, 21 insertions, 87 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 9bf6a8c4844d..5394ade810d4 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	epiphany
-PORTVERSION=	3.22.7
+PORTVERSION=	3.24.2
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,6 +22,8 @@ LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libgcr-3.so:security/gcr \
 		libstartup-notification-1.so:x11/startup-notification \
 		libnss3.so:security/nss \
+		libjson-glib-1.0.so:devel/json-glib \
+		libicuuc.so:devel/icu \
 		libavahi-gobject.so:net/avahi-app \
 		libnotify.so:devel/libnotify \
 		libsecret-1.so:security/libsecret \
@@ -33,8 +35,8 @@ RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		cpe desktop-file-utils gettext gmake libtool localbase pathfix \
-		pkgconfig python:3.3+ sqlite tar:xz
+USES=		compiler:c++11-lib cpe desktop-file-utils gettext gmake gnome \
+		libtool localbase pathfix pkgconfig python:3.3+ sqlite tar:xz
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gnomedesktop3 intlhack libwnck3 libxml2 libxslt
 USE_XORG=	x11
@@ -47,15 +49,10 @@ CONFIGURE_ARGS+=\
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.Epiphany.enums.xml \
-		org.gnome.epiphany.host.gschema.xml \
 		org.gnome.epiphany.gschema.xml
 
 PLIST_SUB+=	EPHY_VERSION=${PORTVERSION:R}
 
-CONFIGURE_ARGS+=	--enable-compile-warnings=no
-# for webkit2-gtk3
-USES+=		compiler:c++11-lib
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; s|-ldl"$$|"|g' \
 		${WRKSRC}/configure
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 9336fe1a296c..dc709511b025 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493375389
-SHA256 (gnome3/epiphany-3.22.7.tar.xz) = a15b7ec19644eec8d40ce11286bbca28ac188202b47e2b9fc593ab0974e9c784
-SIZE (gnome3/epiphany-3.22.7.tar.xz) = 2293224
+TIMESTAMP = 1494537247
+SHA256 (gnome3/epiphany-3.24.2.tar.xz) = 5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d
+SIZE (gnome3/epiphany-3.24.2.tar.xz) = 3439968
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 8373872ff109..921da01ae9da 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,24 +1,15 @@
-bin/ephy-profile-migrator
 bin/epiphany
-lib/epiphany/%%EPHY_VERSION%%/web-extensions/libephywebextension.so
+lib/epiphany/libephymain.so
+lib/epiphany/libephymisc.so
+lib/epiphany/web-extensions/libephywebextension.so
 libexec/epiphany-search-provider
+libexec/epiphany/ephy-profile-migrator
 man/man1/epiphany.1.gz
-share/GConf/gsettings/epiphany.convert
-share/appdata/epiphany.appdata.xml
-share/applications/epiphany.desktop
-share/dbus-1/services/org.gnome.Epiphany.service
-%%DATADIR%%/about.ini
+share/appdata/org.gnome.Epiphany.appdata.xml
+share/applications/org.gnome.Epiphany.desktop
+share/dbus-1/services/org.gnome.EpiphanySearchProvider.service
 %%DATADIR%%/default-bookmarks.rdf
-%%DATADIR%%/epiphany-bookmarks-html.xsl
-%%DATADIR%%/mime-types-permissions.xml
-%%DATADIR%%/pages/error.css
 share/gnome-shell/search-providers/epiphany-search-provider.ini
-share/help/C/epiphany/bookmark-add.page
-share/help/C/epiphany/bookmark-delete.page
-share/help/C/epiphany/bookmark-edit.page
-share/help/C/epiphany/bookmark-smart.page
-share/help/C/epiphany/bookmark-topic.page
-share/help/C/epiphany/bookmark.page
 share/help/C/epiphany/browse-local.page
 share/help/C/epiphany/browse-private.page
 share/help/C/epiphany/browse-tab.page
@@ -47,12 +38,6 @@ share/help/C/epiphany/pref-passwords.page
 share/help/C/epiphany/pref.page
 share/help/C/epiphany/prob-restore-closed-page.page
 share/help/C/epiphany/proxy.page
-share/help/cs/epiphany/bookmark-add.page
-share/help/cs/epiphany/bookmark-delete.page
-share/help/cs/epiphany/bookmark-edit.page
-share/help/cs/epiphany/bookmark-smart.page
-share/help/cs/epiphany/bookmark-topic.page
-share/help/cs/epiphany/bookmark.page
 share/help/cs/epiphany/browse-local.page
 share/help/cs/epiphany/browse-private.page
 share/help/cs/epiphany/browse-tab.page
@@ -81,12 +66,6 @@ share/help/cs/epiphany/pref-passwords.page
 share/help/cs/epiphany/pref.page
 share/help/cs/epiphany/prob-restore-closed-page.page
 share/help/cs/epiphany/proxy.page
-share/help/de/epiphany/bookmark-add.page
-share/help/de/epiphany/bookmark-delete.page
-share/help/de/epiphany/bookmark-edit.page
-share/help/de/epiphany/bookmark-smart.page
-share/help/de/epiphany/bookmark-topic.page
-share/help/de/epiphany/bookmark.page
 share/help/de/epiphany/browse-local.page
 share/help/de/epiphany/browse-private.page
 share/help/de/epiphany/browse-tab.page
@@ -115,12 +94,6 @@ share/help/de/epiphany/pref-passwords.page
 share/help/de/epiphany/pref.page
 share/help/de/epiphany/prob-restore-closed-page.page
 share/help/de/epiphany/proxy.page
-share/help/el/epiphany/bookmark-add.page
-share/help/el/epiphany/bookmark-delete.page
-share/help/el/epiphany/bookmark-edit.page
-share/help/el/epiphany/bookmark-smart.page
-share/help/el/epiphany/bookmark-topic.page
-share/help/el/epiphany/bookmark.page
 share/help/el/epiphany/browse-local.page
 share/help/el/epiphany/browse-private.page
 share/help/el/epiphany/browse-tab.page
@@ -149,12 +122,6 @@ share/help/el/epiphany/pref-passwords.page
 share/help/el/epiphany/pref.page
 share/help/el/epiphany/prob-restore-closed-page.page
 share/help/el/epiphany/proxy.page
-share/help/es/epiphany/bookmark-add.page
-share/help/es/epiphany/bookmark-delete.page
-share/help/es/epiphany/bookmark-edit.page
-share/help/es/epiphany/bookmark-smart.page
-share/help/es/epiphany/bookmark-topic.page
-share/help/es/epiphany/bookmark.page
 share/help/es/epiphany/browse-local.page
 share/help/es/epiphany/browse-private.page
 share/help/es/epiphany/browse-tab.page
@@ -183,12 +150,6 @@ share/help/es/epiphany/pref-passwords.page
 share/help/es/epiphany/pref.page
 share/help/es/epiphany/prob-restore-closed-page.page
 share/help/es/epiphany/proxy.page
-share/help/fr/epiphany/bookmark-add.page
-share/help/fr/epiphany/bookmark-delete.page
-share/help/fr/epiphany/bookmark-edit.page
-share/help/fr/epiphany/bookmark-smart.page
-share/help/fr/epiphany/bookmark-topic.page
-share/help/fr/epiphany/bookmark.page
 share/help/fr/epiphany/browse-local.page
 share/help/fr/epiphany/browse-private.page
 share/help/fr/epiphany/browse-tab.page
@@ -217,12 +178,6 @@ share/help/fr/epiphany/pref-passwords.page
 share/help/fr/epiphany/pref.page
 share/help/fr/epiphany/prob-restore-closed-page.page
 share/help/fr/epiphany/proxy.page
-share/help/hu/epiphany/bookmark-add.page
-share/help/hu/epiphany/bookmark-delete.page
-share/help/hu/epiphany/bookmark-edit.page
-share/help/hu/epiphany/bookmark-smart.page
-share/help/hu/epiphany/bookmark-topic.page
-share/help/hu/epiphany/bookmark.page
 share/help/hu/epiphany/browse-local.page
 share/help/hu/epiphany/browse-private.page
 share/help/hu/epiphany/browse-tab.page
@@ -251,12 +206,6 @@ share/help/hu/epiphany/pref-passwords.page
 share/help/hu/epiphany/pref.page
 share/help/hu/epiphany/prob-restore-closed-page.page
 share/help/hu/epiphany/proxy.page
-share/help/ko/epiphany/bookmark-add.page
-share/help/ko/epiphany/bookmark-delete.page
-share/help/ko/epiphany/bookmark-edit.page
-share/help/ko/epiphany/bookmark-smart.page
-share/help/ko/epiphany/bookmark-topic.page
-share/help/ko/epiphany/bookmark.page
 share/help/ko/epiphany/browse-local.page
 share/help/ko/epiphany/browse-private.page
 share/help/ko/epiphany/browse-tab.page
@@ -285,12 +234,6 @@ share/help/ko/epiphany/pref-passwords.page
 share/help/ko/epiphany/pref.page
 share/help/ko/epiphany/prob-restore-closed-page.page
 share/help/ko/epiphany/proxy.page
-share/help/pt_BR/epiphany/bookmark-add.page
-share/help/pt_BR/epiphany/bookmark-delete.page
-share/help/pt_BR/epiphany/bookmark-edit.page
-share/help/pt_BR/epiphany/bookmark-smart.page
-share/help/pt_BR/epiphany/bookmark-topic.page
-share/help/pt_BR/epiphany/bookmark.page
 share/help/pt_BR/epiphany/browse-local.page
 share/help/pt_BR/epiphany/browse-private.page
 share/help/pt_BR/epiphany/browse-tab.page
@@ -319,12 +262,6 @@ share/help/pt_BR/epiphany/pref-passwords.page
 share/help/pt_BR/epiphany/pref.page
 share/help/pt_BR/epiphany/prob-restore-closed-page.page
 share/help/pt_BR/epiphany/proxy.page
-share/help/ru/epiphany/bookmark-add.page
-share/help/ru/epiphany/bookmark-delete.page
-share/help/ru/epiphany/bookmark-edit.page
-share/help/ru/epiphany/bookmark-smart.page
-share/help/ru/epiphany/bookmark-topic.page
-share/help/ru/epiphany/bookmark.page
 share/help/ru/epiphany/browse-local.page
 share/help/ru/epiphany/browse-private.page
 share/help/ru/epiphany/browse-tab.page
@@ -353,12 +290,6 @@ share/help/ru/epiphany/pref-passwords.page
 share/help/ru/epiphany/pref.page
 share/help/ru/epiphany/prob-restore-closed-page.page
 share/help/ru/epiphany/proxy.page
-share/help/sv/epiphany/bookmark-add.page
-share/help/sv/epiphany/bookmark-delete.page
-share/help/sv/epiphany/bookmark-edit.page
-share/help/sv/epiphany/bookmark-smart.page
-share/help/sv/epiphany/bookmark-topic.page
-share/help/sv/epiphany/bookmark.page
 share/help/sv/epiphany/browse-local.page
 share/help/sv/epiphany/browse-private.page
 share/help/sv/epiphany/browse-tab.page
@@ -387,6 +318,12 @@ share/help/sv/epiphany/pref-passwords.page
 share/help/sv/epiphany/pref.page
 share/help/sv/epiphany/prob-restore-closed-page.page
 share/help/sv/epiphany/proxy.page
+share/icons/hicolor/16x16/apps/org.gnome.Epiphany.png
+share/icons/hicolor/24x24/apps/org.gnome.Epiphany.png
+share/icons/hicolor/32x32/apps/org.gnome.Epiphany.png
+share/icons/hicolor/48x48/apps/org.gnome.Epiphany.png
+share/icons/hicolor/512x512/apps/org.gnome.Epiphany.png
+share/icons/hicolor/symbolic/apps/org.gnome.Epiphany-symbolic.svg
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/an/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo