6 files changed, 37 insertions, 11 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 3ba13f9b6044..c1bd0f608160 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.14.1
-PORTREVISION=	1
+PORTVERSION=	2.14.1.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index c9bac805d778..8aebb85f91ab 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 8be9c522284b0a9d7ba2797e141cf26e
-SHA256 (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 6b97e1160203869741c57c6720b2d1e5d16ad104b83d0391f73169542e72305c
-SIZE (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 820099
+MD5 (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = 3e807a83f068e41ce34c3c653a3353b6
+SHA256 (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = a83b5e0e38afc254a22a430697f29f1fa7db9d6e52ebc16ee793f39a28a310d2
+SIZE (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = 789039
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index f724bdaaaab7..1c4008cdd651 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -119,6 +119,7 @@ share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/th/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/vi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 86c0768bd03a..6cffa2d59021 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.14.1
+PORTVERSION=	2.14.1.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -39,7 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 GCONF_SCHEMAS=	epiphany-lockdown.schemas epiphany.schemas \
 		epiphany-fonts.schemas epiphany-pango.schemas
 
-PLIST_SUB+=	EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \
+PLIST_SUB+=	EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}" \
 		EPHY_PREFIX="${PREFIX}"
 
 MAN1=		epiphany.1
@@ -50,7 +50,7 @@ WITH_GNOME=	yes
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 NO_WERROR=	yes
 # allow build with more warnings enabled
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index a9a5409eca81..f81aee48f966 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.14.1.tar.bz2) = 69f9760646b736d953f24442e0e38f7b
-SHA256 (gnome2/epiphany-2.14.1.tar.bz2) = 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2
-SIZE (gnome2/epiphany-2.14.1.tar.bz2) = 3520979
+MD5 (gnome2/epiphany-2.14.1.1.tar.bz2) = f5770a6a934997382b91349bdc40af04
+SHA256 (gnome2/epiphany-2.14.1.1.tar.bz2) = 19e222e522d252dde8c341a959a913bc0b01f212075b85a836b048e54970b158
+SIZE (gnome2/epiphany-2.14.1.1.tar.bz2) = 3598994
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 0b2ebe191533..f964181f6237 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -38,6 +38,32 @@ lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
 libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
 share/aclocal/epiphany.m4
 share/dbus-1/services/org.gnome.Epiphany.service
+%%DOCSDIR%%/EphyCommandManager.html
+%%DOCSDIR%%/EphyEmbed.html
+%%DOCSDIR%%/EphyNodeDb.html
+%%DOCSDIR%%/EphyTab.html
+%%DOCSDIR%%/EphyWindow.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
+%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
+%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
+%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
+%%DOCSDIR%%/epiphany-EphyGlade.html
+%%DOCSDIR%%/epiphany-EphyPermissionManager.html
+%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
+%%DOCSDIR%%/epiphany-ephy-password-manager.html
+%%DOCSDIR%%/epiphany-ephy-session.html
+%%DOCSDIR%%/epiphany-ephy-shell.html
+%%DOCSDIR%%/epiphany.devhelp
+%%DOCSDIR%%/epiphany.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/gnome/applications/bme.desktop
 share/gnome/applications/epiphany.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true