19 files changed, 167 insertions, 105 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 19d674cd8ae5..ee3bb7f651b0 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.4.5
+PORTVERSION=	1.6.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/1.6
 PKGNAMESUFFIX=	-extensions
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -40,14 +40,14 @@ HEADERS_SUFX=
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnometarget
+USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget
 USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-extensions="all"
 
-PLIST_SUB=	VERSION="1.4"
+PLIST_SUB=	VERSION="1.6" EPHY_VERSION="1.6"
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_OPENSP
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index f26d3cf36625..28b6577311cc 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-extensions-1.4.5.tar.bz2) = 8e7edc694283c53bec4d128527a0ecff
-SIZE (gnome2/epiphany-extensions-1.4.5.tar.bz2) = 470431
+MD5 (gnome2/epiphany-extensions-1.6.0.tar.bz2) = c9f6d0e6b817120e8aec671529ad5ee8
+SIZE (gnome2/epiphany-extensions-1.6.0.tar.bz2) = 550293
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 694b55312ee1..5f6f6e1abfd4 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,72 +1,77 @@
-lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.a
+lib/epiphany-%%VERSION%%/extensions/actions.xml
+lib/epiphany-%%VERSION%%/extensions/bookmarks-tray.xml
+lib/epiphany-%%VERSION%%/extensions/certificates.xml
+lib/epiphany-%%VERSION%%/extensions/dashboard.xml
+lib/epiphany-%%VERSION%%/extensions/error-viewer.xml
+lib/epiphany-%%VERSION%%/extensions/extensions-manager-ui.xml
+lib/epiphany-%%VERSION%%/extensions/gestures.xml
+lib/epiphany-%%VERSION%%/extensions/libactionsextension.a
+lib/epiphany-%%VERSION%%/extensions/libactionsextension.so
+lib/epiphany-%%VERSION%%/extensions/libactionsextension.so.0
+lib/epiphany-%%VERSION%%/extensions/libbookmarkstrayextension.so
 lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libdashboardextension.a
 lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so
-lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so.0
-lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.a
 lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so
-lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libgesturesextension.a
+lib/epiphany-%%VERSION%%/extensions/libextensionsmanageruiextension.so
 lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so
-lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.a
 lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so
-lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.a
 lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so
-lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libsidebarextension.a
 lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so
-lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.a
 lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so
-lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.a
 lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so
-lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so.0
-lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.a
 lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so
-lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so.0
+lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.a
+lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.so
+lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.so.0
+lib/epiphany-%%VERSION%%/extensions/tab-states.xml
+lib/epiphany-%%VERSION%%/extensions/page-info.xml
+lib/epiphany-%%VERSION%%/extensions/select-stylesheet.xml
+lib/epiphany-%%VERSION%%/extensions/sidebar.xml
+lib/epiphany-%%VERSION%%/extensions/smart-bookmarks.xml
+lib/epiphany-%%VERSION%%/extensions/tab-groups.xml
+lib/epiphany-%%VERSION%%/extensions/tabsmenu.xml
 share/gnome/epiphany-extensions/ephy-gestures.xml
+share/gnome/epiphany-extensions/glade/action-properties.glade
+share/gnome/epiphany-extensions/glade/actions-editor.glade
 share/gnome/epiphany-extensions/glade/error-viewer.glade
+share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade
 share/gnome/epiphany-extensions/glade/page-info.glade
-share/gnome/epiphany-extensions/glade/smart-bookmarks.glade
+share/gnome/epiphany-extensions/xml/ephy-bookmarks-tray-ui.xml
 share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml
 share/gnome/epiphany-extensions/xml/page-info-context-ui.xml
-share/locale/bg/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/de/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/no/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+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/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 @dirrm share/gnome/epiphany-extensions/xml
 @dirrm share/gnome/epiphany-extensions/glade
 @dirrm share/gnome/epiphany-extensions
-@dirrm lib/epiphany-%%VERSION%%/extensions
-@dirrm lib/epiphany-%%VERSION%%
+@unexec rmdir %D/lib/epiphany-%%VERSION%%/extensions 2>/dev/null || true
+@unexec rmdir %D/lib/epiphany-%%VERSION%% 2>/dev/null || true
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 25d659b03d63..9f3afb06a15b 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.4.8
+PORTVERSION=	1.6.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -36,11 +36,12 @@ HEADERS_SUFX=
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
+GNOME_DESKTOP_VERSION=2
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
 USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
@@ -55,14 +56,10 @@ MAN1=		epiphany.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500000
-# Galeon does not build correctly in -CURRENT if -Werror is passed
-# to the compiler.
 NO_WERROR=	yes
-.endif
 # allow build with more warnings enabled
 .if defined(NO_WERROR)
-CONFIGURE_ARGS+=	--disable-werror
+CONFIGURE_ARGS+=	--enable-compile-warnings=no
 .endif
 
 .if ${OSVERSION} < 500000
@@ -101,6 +98,6 @@ post-configure:
 post-install:
 	@${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin
 	${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin
-	@-update-desktop-database > /dev/null
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index a2b527a3b181..e2a19172bd9c 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-1.4.8.tar.bz2) = bb9bdb92c5b4a7a97029e942304a9373
-SIZE (gnome2/epiphany-1.4.8.tar.bz2) = 3594408
+MD5 (gnome2/epiphany-1.6.0.tar.bz2) = 53eda1c713aec26a51fb806210c8afa7
+SIZE (gnome2/epiphany-1.6.0.tar.bz2) = 2983514
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index c71b7db133e0..9da0f027eb82 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,6 +1,7 @@
 bin/epiphany
 bin/epiphany-bin
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-dialog.h
@@ -10,10 +11,14 @@ include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-single.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed.h
-include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-encodings.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extension.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-history.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-link.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-loader.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node-db.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-notebook.h
@@ -21,11 +26,13 @@ include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-password-manager.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-session.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-shell.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-state.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h
+include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h
 libdata/bonobo/servers/GNOME_Epiphany_Automation.server
-libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+libdata/pkgconfig/epiphany-1.6.pc
 %%DOCSDIR%%/EphyCommandManager.html
 %%DOCSDIR%%/EphyEmbed.html
 %%DOCSDIR%%/EphyEmbedPersist.html
@@ -37,6 +44,7 @@ libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/epiphany-EphyEmbedFactory.html
+%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
 %%DOCSDIR%%/epiphany-EphyGlade.html
 %%DOCSDIR%%/epiphany-ephy-cookie-manager.html
 %%DOCSDIR%%/epiphany-ephy-password-manager.html
@@ -59,13 +67,12 @@ share/gnome/epiphany/art/epiphany-download.png
 share/gnome/epiphany/art/epiphany-entry.png
 share/gnome/epiphany/art/epiphany-history.png
 share/gnome/epiphany/art/epiphany-popup-hidden.png
-share/gnome/epiphany/art/epiphany-secure.png
-share/gnome/epiphany/art/epiphany-unsecure.png
 share/gnome/epiphany/art/hand-open.png
-share/gnome/epiphany/conspiracy.xhtml
 share/gnome/epiphany/default-prefs.js
 share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
+share/gnome/epiphany/epiphany-bookmarks-html.xsl
 share/gnome/epiphany/epiphany-bookmarksbar.xml
+share/gnome/epiphany/epiphany-extension.xsd
 share/gnome/epiphany/epiphany-fs-toolbar.xml
 share/gnome/epiphany/epiphany-history-window-ui.xml
 share/gnome/epiphany/epiphany-toolbar.xml
@@ -104,11 +111,18 @@ share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.p
 share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/ja/figures/ephy-screenshot.png
 share/gnome/help/epiphany/ja/legal.xml
+share/gnome/help/epiphany/uk/epiphany.xml
+share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
+share/gnome/help/epiphany/uk/legal.xml
 share/gnome/omf/epiphany/epiphany-C.omf
 share/gnome/omf/epiphany/epiphany-es.omf
 share/gnome/omf/epiphany/epiphany-eu.omf
 share/gnome/omf/epiphany/epiphany-fi.omf
 share/gnome/omf/epiphany/epiphany-ja.omf
+share/gnome/omf/epiphany/epiphany-uk.omf
 share/gnome/pixmaps/epiphany-bookmarks.png
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
@@ -176,6 +190,8 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/omf/epiphany
+@dirrm share/gnome/help/epiphany/uk/figures
+@dirrm share/gnome/help/epiphany/uk
 @dirrm share/gnome/help/epiphany/ja/figures
 @dirrm share/gnome/help/epiphany/ja
 @dirrm share/gnome/help/epiphany/fi/figures
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index a6837f01eea9..3c14160001dc 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	webcal
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/2.0
+MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/2.2
 PKGNAMEPREFIX=	evolution-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index c9ed8d4cf804..3d7587122a0d 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,2 +1,2 @@
-MD5 (evolution-webcal-2.0.1.tar.bz2) = a29be3b55e6def3b56ffa3c48b349b40
-SIZE (evolution-webcal-2.0.1.tar.bz2) = 144969
+MD5 (evolution-webcal-2.2.0.tar.bz2) = a96ccdc8ec6c937fc87dd2bb650bfdf1
+SIZE (evolution-webcal-2.2.0.tar.bz2) = 139078
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index f841cb7faa8e..21bc932a66b6 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -1,5 +1,4 @@
 libexec/evolution-webcal
-share/gnome/application-registry/evolution-webcal.applications
 share/locale/ar/LC_MESSAGES/evolution-webcal.mo
 share/locale/az/LC_MESSAGES/evolution-webcal.mo
 share/locale/bg/LC_MESSAGES/evolution-webcal.mo
@@ -14,17 +13,22 @@ share/locale/el/LC_MESSAGES/evolution-webcal.mo
 share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo
 share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo
 share/locale/es/LC_MESSAGES/evolution-webcal.mo
+share/locale/et/LC_MESSAGES/evolution-webcal.mo
 share/locale/eu/LC_MESSAGES/evolution-webcal.mo
+share/locale/fa/LC_MESSAGES/evolution-webcal.mo
 share/locale/fi/LC_MESSAGES/evolution-webcal.mo
 share/locale/fr/LC_MESSAGES/evolution-webcal.mo
 share/locale/gu/LC_MESSAGES/evolution-webcal.mo
 share/locale/hi/LC_MESSAGES/evolution-webcal.mo
 share/locale/hu/LC_MESSAGES/evolution-webcal.mo
+share/locale/id/LC_MESSAGES/evolution-webcal.mo
 share/locale/it/LC_MESSAGES/evolution-webcal.mo
 share/locale/ja/LC_MESSAGES/evolution-webcal.mo
 share/locale/ko/LC_MESSAGES/evolution-webcal.mo
+share/locale/lt/LC_MESSAGES/evolution-webcal.mo
 share/locale/ms/LC_MESSAGES/evolution-webcal.mo
 share/locale/nb/LC_MESSAGES/evolution-webcal.mo
+share/locale/ne/LC_MESSAGES/evolution-webcal.mo
 share/locale/nl/LC_MESSAGES/evolution-webcal.mo
 share/locale/no/LC_MESSAGES/evolution-webcal.mo
 share/locale/or/LC_MESSAGES/evolution-webcal.mo
@@ -38,6 +42,7 @@ share/locale/sr/LC_MESSAGES/evolution-webcal.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo
 share/locale/sv/LC_MESSAGES/evolution-webcal.mo
 share/locale/ta/LC_MESSAGES/evolution-webcal.mo
+share/locale/th/LC_MESSAGES/evolution-webcal.mo
 share/locale/tr/LC_MESSAGES/evolution-webcal.mo
 share/locale/uk/LC_MESSAGES/evolution-webcal.mo
 share/locale/vi/LC_MESSAGES/evolution-webcal.mo
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index c121c5312d17..e44a89101dae 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.2.5
+PORTVERSION=	3.6.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.6
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,10 +27,6 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.1"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR}|g' \
-		${WRKSRC}/po/Makefile.in.in
+PLIST_SUB=	VERSION="3.6"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 1ecf07b8d8cc..3809c42806f5 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.2.5.tar.bz2) = 86e1ce32fed536bce5b2d6e8d41b0c65
-SIZE (gnome2/gtkhtml-3.2.5.tar.bz2) = 1315567
+MD5 (gnome2/gtkhtml-3.6.0.tar.bz2) = a53378f57544ef2e2e7b40616dc237a1
+SIZE (gnome2/gtkhtml-3.6.0.tar.bz2) = 1348975
diff --git a/www/gtkhtml3/files/patch-po_Makefile.in.in b/www/gtkhtml3/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..df4fac948548
--- /dev/null
+++ b/www/gtkhtml3/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Tue Nov 23 17:53:53 2004
++++ po/Makefile.in.in	Tue Nov 23 17:58:38 2004
+@@ -31,6 +31,7 @@
+ localedir = $(libdir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ subdir = po
+ 
+ INSTALL = @INSTALL@
diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c
new file mode 100644
index 000000000000..f970e5b654c2
--- /dev/null
+++ b/www/gtkhtml3/files/patch-src_htmltext.c
@@ -0,0 +1,15 @@
+--- src/htmltext.c.orig	Wed Dec  8 01:45:57 2004
++++ src/htmltext.c	Wed Dec  8 01:46:10 2004
+@@ -2433,10 +2433,11 @@
+ gsize
+ html_text_sanitize (const gchar **str, gint *len)
+ {
++	gchar *end;
+ 	g_return_val_if_fail (str != NULL, 0);
+ 	g_return_val_if_fail (len != NULL, 0);
+ 	
+-	gchar *end = offset_to_pointer_validated (*str, *len, len);
++	end = offset_to_pointer_validated (*str, *len, len);
+ 	if (end) {
+ 		return end - *str;
+ 	} else {
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 796491d14ceb..5c4468b4861a 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.12
+lib/libgtkhtml-%%VERSION%%.so.18
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
@@ -179,7 +179,6 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index c121c5312d17..e44a89101dae 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.2.5
+PORTVERSION=	3.6.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.6
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,10 +27,6 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.1"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR}|g' \
-		${WRKSRC}/po/Makefile.in.in
+PLIST_SUB=	VERSION="3.6"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 1ecf07b8d8cc..3809c42806f5 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.2.5.tar.bz2) = 86e1ce32fed536bce5b2d6e8d41b0c65
-SIZE (gnome2/gtkhtml-3.2.5.tar.bz2) = 1315567
+MD5 (gnome2/gtkhtml-3.6.0.tar.bz2) = a53378f57544ef2e2e7b40616dc237a1
+SIZE (gnome2/gtkhtml-3.6.0.tar.bz2) = 1348975
diff --git a/www/gtkhtml38/files/patch-po_Makefile.in.in b/www/gtkhtml38/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..df4fac948548
--- /dev/null
+++ b/www/gtkhtml38/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Tue Nov 23 17:53:53 2004
++++ po/Makefile.in.in	Tue Nov 23 17:58:38 2004
+@@ -31,6 +31,7 @@
+ localedir = $(libdir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ subdir = po
+ 
+ INSTALL = @INSTALL@
diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c
new file mode 100644
index 000000000000..f970e5b654c2
--- /dev/null
+++ b/www/gtkhtml38/files/patch-src_htmltext.c
@@ -0,0 +1,15 @@
+--- src/htmltext.c.orig	Wed Dec  8 01:45:57 2004
++++ src/htmltext.c	Wed Dec  8 01:46:10 2004
+@@ -2433,10 +2433,11 @@
+ gsize
+ html_text_sanitize (const gchar **str, gint *len)
+ {
++	gchar *end;
+ 	g_return_val_if_fail (str != NULL, 0);
+ 	g_return_val_if_fail (len != NULL, 0);
+ 	
+-	gchar *end = offset_to_pointer_validated (*str, *len, len);
++	end = offset_to_pointer_validated (*str, *len, len);
+ 	if (end) {
+ 		return end - *str;
+ 	} else {
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 796491d14ceb..5c4468b4861a 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.12
+lib/libgtkhtml-%%VERSION%%.so.18
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
@@ -179,7 +179,6 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo