11 files changed, 98 insertions, 97 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 568ea60fc482..bb5a4c2afdf6 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	epiphany
-PORTVERSION=	3.24.2
-PORTREVISION=	7
+PORTVERSION=	3.28.3.1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -20,6 +19,7 @@ BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libsoup-2.4.so:devel/libsoup \
 		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libsoup-2.4.so:devel/libsoup \
 		libgcr-3.so:security/gcr \
 		libstartup-notification-1.so:x11/startup-notification \
 		libnss3.so:security/nss \
@@ -27,6 +27,8 @@ LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libicuuc.so:devel/icu \
 		libavahi-gobject.so:net/avahi-app \
 		libnotify.so:devel/libnotify \
+		libgmp.so:math/gmp \
+		libnettle.so:security/nettle \
 		libsecret-1.so:security/libsecret \
 		libp11-kit.so:security/p11-kit
 RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
@@ -36,26 +38,20 @@ RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c++11-lib cpe desktop-file-utils gettext gmake gnome \
-		libtool localbase pathfix pkgconfig python:3.3+ sqlite tar:xz
+USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome \
+		localbase:ldflags meson pkgconfig python:3.4+ shebangfix \
+		sqlite tar:xz
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gnomedesktop3 intlhack libwnck3 libxml2 libxslt
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=\
-		--with-distributor-name="FreeBSD GNOME Project"
-#		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-INSTALL_TARGET=	install-strip
-
+MESON_ARGS=	-Ddistributor_name="GNOME Web by the FreeBSD GNOME Project" \
+		-Dunit_tests=false
 GLIB_SCHEMAS=	org.gnome.Epiphany.enums.xml \
 		org.gnome.epiphany.gschema.xml
+SHEBANG_FILES=	post_install.py
 
 PLIST_SUB+=	EPHY_VERSION=${PORTVERSION:R}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; s|-ldl"$$|"|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index dc709511b025..a8edff3de36a 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494537247
-SHA256 (gnome3/epiphany-3.24.2.tar.xz) = 5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d
-SIZE (gnome3/epiphany-3.24.2.tar.xz) = 3439968
+TIMESTAMP = 1528490824
+SHA256 (gnome3/epiphany-3.28.3.1.tar.xz) = 690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7
+SIZE (gnome3/epiphany-3.28.3.1.tar.xz) = 4475124
diff --git a/www/epiphany/files/patch-src_ephy-window.c b/www/epiphany/files/patch-src_ephy-window.c
deleted file mode 100644
index 6f2eb9d22356..000000000000
--- a/www/epiphany/files/patch-src_ephy-window.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/ephy-window.c.orig	2018-03-27 15:41:00 UTC
-+++ src/ephy-window.c
-@@ -1301,13 +1301,6 @@ webkit_context_menu_item_new_from_gaction_with_paramet
- #pragma GCC diagnostic pop
- }
- 
--static WebKitContextMenuItem *
--webkit_context_menu_item_new_from_gaction (GAction    *action,
--                                           const char *label)
--{
--  return webkit_context_menu_item_new_from_gaction_with_parameter (action, label, NULL);
--}
--
- static char *
- ellipsize_string (const char *string,
-                   glong       max_length)
-@@ -1380,7 +1373,7 @@ add_action_to_context_menu (WebKitContextMenu *context
-   action = g_action_map_lookup_action (G_ACTION_MAP (action_group), name);
-   label = g_hash_table_lookup (window->action_labels, name);
-   if (strcmp (label, "search-selection-placeholder") != 0) {
--    webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction (action, _(label)));
-+    webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction_with_parameter (action, _(label), NULL));
-   } else {
-     search_term = g_variant_get_string (target, NULL);
-     search_label = format_search_label (search_term);
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 921da01ae9da..23156071452d 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,15 +1,15 @@
 bin/epiphany
 lib/epiphany/libephymain.so
 lib/epiphany/libephymisc.so
+lib/epiphany/libephysync.so
 lib/epiphany/web-extensions/libephywebextension.so
 libexec/epiphany-search-provider
 libexec/epiphany/ephy-profile-migrator
 man/man1/epiphany.1.gz
-share/appdata/org.gnome.Epiphany.appdata.xml
 share/applications/org.gnome.Epiphany.desktop
-share/dbus-1/services/org.gnome.EpiphanySearchProvider.service
+share/dbus-1/services/org.gnome.Epiphany.SearchProvider.service
 %%DATADIR%%/default-bookmarks.rdf
-share/gnome-shell/search-providers/epiphany-search-provider.ini
+share/gnome-shell/search-providers/org.gnome.Epiphany.search-provider.ini
 share/help/C/epiphany/browse-local.page
 share/help/C/epiphany/browse-private.page
 share/help/C/epiphany/browse-tab.page
@@ -178,6 +178,34 @@ 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/gl/epiphany/browse-local.page
+share/help/gl/epiphany/browse-private.page
+share/help/gl/epiphany/browse-tab.page
+share/help/gl/epiphany/browse-web.page
+share/help/gl/epiphany/browse-webapps-del.page
+share/help/gl/epiphany/browse-webapps.page
+share/help/gl/epiphany/cert.page
+share/help/gl/epiphany/cookies.xml
+share/help/gl/epiphany/data-cookies.page
+share/help/gl/epiphany/data-passwords.page
+share/help/gl/epiphany/history-delete.page
+share/help/gl/epiphany/history.page
+share/help/gl/epiphany/index.page
+share/help/gl/epiphany/introduction.page
+share/help/gl/epiphany/keyboard-shortcut.page
+share/help/gl/epiphany/legal.xml
+share/help/gl/epiphany/media/epiphany-3-12.png
+share/help/gl/epiphany/media/private-browsing-3-12.png
+share/help/gl/epiphany/media/web-browser.png
+share/help/gl/epiphany/pref-cookies.page
+share/help/gl/epiphany/pref-css.page
+share/help/gl/epiphany/pref-do-not-track.page
+share/help/gl/epiphany/pref-downloads.page
+share/help/gl/epiphany/pref-font.page
+share/help/gl/epiphany/pref-passwords.page
+share/help/gl/epiphany/pref.page
+share/help/gl/epiphany/prob-restore-closed-page.page
+share/help/gl/epiphany/proxy.page
 share/help/hu/epiphany/browse-local.page
 share/help/hu/epiphany/browse-private.page
 share/help/hu/epiphany/browse-tab.page
@@ -234,6 +262,34 @@ 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/pl/epiphany/browse-local.page
+share/help/pl/epiphany/browse-private.page
+share/help/pl/epiphany/browse-tab.page
+share/help/pl/epiphany/browse-web.page
+share/help/pl/epiphany/browse-webapps-del.page
+share/help/pl/epiphany/browse-webapps.page
+share/help/pl/epiphany/cert.page
+share/help/pl/epiphany/cookies.xml
+share/help/pl/epiphany/data-cookies.page
+share/help/pl/epiphany/data-passwords.page
+share/help/pl/epiphany/history-delete.page
+share/help/pl/epiphany/history.page
+share/help/pl/epiphany/index.page
+share/help/pl/epiphany/introduction.page
+share/help/pl/epiphany/keyboard-shortcut.page
+share/help/pl/epiphany/legal.xml
+share/help/pl/epiphany/media/epiphany-3-12.png
+share/help/pl/epiphany/media/private-browsing-3-12.png
+share/help/pl/epiphany/media/web-browser.png
+share/help/pl/epiphany/pref-cookies.page
+share/help/pl/epiphany/pref-css.page
+share/help/pl/epiphany/pref-do-not-track.page
+share/help/pl/epiphany/pref-downloads.page
+share/help/pl/epiphany/pref-font.page
+share/help/pl/epiphany/pref-passwords.page
+share/help/pl/epiphany/pref.page
+share/help/pl/epiphany/prob-restore-closed-page.page
+share/help/pl/epiphany/proxy.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
@@ -324,6 +380,7 @@ 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/af/LC_MESSAGES/epiphany.mo
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/an/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
@@ -425,3 +482,4 @@ share/locale/yo/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_HK/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
+share/metainfo/org.gnome.Epiphany.appdata.xml
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index ab8abbc97d41..741125e859ad 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -1,27 +1,28 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/www/libepc/Makefile 19822 2014-08-20 08:57:46Z gusi $
 
 PORTNAME=	libepc
-PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTVERSION=	0.4.6
 CATEGORIES=	www
 MASTER_SITES=	GNOME
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	The Easy Publish and Consume library
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libfribidi.so:converters/fribidi \
 		libsoup-2.4.so:devel/libsoup \
 		libgnutls.so:security/gnutls \
+		libavahi-common.so:net/avahi-app \
 		libavahi-ui-gtk3.so:net/avahi-gtk3
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix gtk30 intltool
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix cairo gdkpixbuf2 gtk30 intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/www/libepc/distinfo b/www/libepc/distinfo
index c819410a1122..e944982fe54e 100644
--- a/www/libepc/distinfo
+++ b/www/libepc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libepc-0.4.4.tar.xz) = 4f98fc306c0f9d361e1381484744246efd084053732924741078270c49afc33b
-SIZE (libepc-0.4.4.tar.xz) = 375332
+TIMESTAMP = 1507321953
+SHA256 (libepc-0.4.6.tar.xz) = 215990847a8526c85774cb74fbcaea4c46866df58281b21dce5a62aac5da7ae8
+SIZE (libepc-0.4.6.tar.xz) = 400464
diff --git a/www/libepc/pkg-plist b/www/libepc/pkg-plist
index 9c5646163539..fedd21c59b78 100644
--- a/www/libepc/pkg-plist
+++ b/www/libepc/pkg-plist
@@ -20,33 +20,8 @@ lib/libepc-ui-1.0.so.3
 lib/libepc-ui-1.0.so.3.0.0
 libdata/pkgconfig/libepc-1.0.pc
 libdata/pkgconfig/libepc-ui-1.0.pc
-%%DOCSDIR%%/EpcProtocol.html
-%%DOCSDIR%%/EpcServiceInfo.html
-%%DOCSDIR%%/consuming.html
-%%DOCSDIR%%/dns-sd-support.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/internal-api.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libepc-1.0-EpcServiceType.html
-%%DOCSDIR%%/libepc-1.0-EpcShell.html
-%%DOCSDIR%%/libepc-1.0-EpcTls.html
-%%DOCSDIR%%/libepc-1.0-auth-context.html
-%%DOCSDIR%%/libepc-1.0-consumer.html
-%%DOCSDIR%%/libepc-1.0-contents.html
-%%DOCSDIR%%/libepc-1.0-dispatcher.html
-%%DOCSDIR%%/libepc-1.0-password-dialog.html
-%%DOCSDIR%%/libepc-1.0-progress-window.html
-%%DOCSDIR%%/libepc-1.0-publisher.html
-%%DOCSDIR%%/libepc-1.0-service-monitor.html
-%%DOCSDIR%%/libepc-1.0.devhelp2
-%%DOCSDIR%%/publishing.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/widgets.html
 share/locale/ar/LC_MESSAGES/libepc.mo
+share/locale/bs/LC_MESSAGES/libepc.mo
 share/locale/ca/LC_MESSAGES/libepc.mo
 share/locale/cs/LC_MESSAGES/libepc.mo
 share/locale/da/LC_MESSAGES/libepc.mo
@@ -57,15 +32,21 @@ share/locale/es/LC_MESSAGES/libepc.mo
 share/locale/fi/LC_MESSAGES/libepc.mo
 share/locale/fr/LC_MESSAGES/libepc.mo
 share/locale/gl/LC_MESSAGES/libepc.mo
+share/locale/hu/LC_MESSAGES/libepc.mo
 share/locale/id/LC_MESSAGES/libepc.mo
 share/locale/it/LC_MESSAGES/libepc.mo
 share/locale/ja/LC_MESSAGES/libepc.mo
 share/locale/lv/LC_MESSAGES/libepc.mo
 share/locale/nb/LC_MESSAGES/libepc.mo
+share/locale/oc/LC_MESSAGES/libepc.mo
 share/locale/pl/LC_MESSAGES/libepc.mo
+share/locale/pt/LC_MESSAGES/libepc.mo
 share/locale/pt_BR/LC_MESSAGES/libepc.mo
+share/locale/ro/LC_MESSAGES/libepc.mo
 share/locale/ru/LC_MESSAGES/libepc.mo
 share/locale/sl/LC_MESSAGES/libepc.mo
+share/locale/sr/LC_MESSAGES/libepc.mo
+share/locale/sr@latin/LC_MESSAGES/libepc.mo
 share/locale/sv/LC_MESSAGES/libepc.mo
 share/locale/th/LC_MESSAGES/libepc.mo
 share/locale/zh_CN/LC_MESSAGES/libepc.mo
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index 2a02f010481b..4bed1a6b55ea 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.20.3
-PORTREVISION=	2
+PORTVERSION=	2.20.5
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo
index f310c51d7392..419a1db4349d 100644
--- a/www/webkit2-gtk3/distinfo
+++ b/www/webkit2-gtk3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529262397
-SHA256 (webkitgtk-2.20.3.tar.xz) = 579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8
-SIZE (webkitgtk-2.20.3.tar.xz) = 16623456
+TIMESTAMP = 1534713029
+SHA256 (webkitgtk-2.20.5.tar.xz) = 15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990
+SIZE (webkitgtk-2.20.5.tar.xz) = 16625200
diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt
deleted file mode 100644
index 838aeedc7ce2..000000000000
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/JavaScriptCore/CMakeLists.txt.orig	2018-02-20 11:38:51 UTC
-+++ Source/JavaScriptCore/CMakeLists.txt
-@@ -253,6 +253,7 @@ add_executable(LLIntOffsetsExtractor
-     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h
- )
- target_link_libraries(LLIntOffsetsExtractor WTF)
-+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders) 
- 
- # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
- # LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist
index 237fce7702ee..9b5320b6618a 100644
--- a/www/webkit2-gtk3/pkg-plist
+++ b/www/webkit2-gtk3/pkg-plist
@@ -199,10 +199,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.7.11
+lib/libjavascriptcoregtk-4.0.so.18.7.13
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.28.3
+lib/libwebkit2gtk-4.0.so.37.28.5
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-4.0.pc