3 files changed, 33 insertions, 33 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 21baaceb1f6d..d1b33ec2de5d 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,9 +1,8 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-terminal/Makefile 20059 2014-11-10 21:24:07Z gusi $
 
 PORTNAME=	gnome-terminal
-PORTVERSION=	3.14.3
+PORTVERSION=	3.16.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,17 +12,18 @@ COMMENT=	Terminal component for the GNOME 3 Desktop
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool \
-		appdata-tools>=0:${PORTSDIR}/devel/appdata-tools \
+		appdata-validate:${PORTSDIR}/devel/appstream-glib \
 		vala:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
+PORTSCOUT=	limitw:1,even
+
 USES=		cpe gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	dconf gnomeprefix gtk30 intlhack nautilus3 vte3
+USE_GNOME=	dconf gtk30 intlhack nautilus3 vte3
 USE_XORG=	sm ice
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-search-provider
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
@@ -31,12 +31,16 @@ CPE_VENDOR=	gnome
 
 GLIB_SCHEMAS=	org.gnome.Terminal.gschema.xml
 
-OPTIONS_SUB=			yes
-OPTIONS_DEFINE=			MIGRATION
-OPTIONS_DEFAULT=		MIGRATION
+OPTIONS_SUB=		yes
+OPTIONS_DEFINE=		MIGRATION SEARCHPROVIDER
+OPTIONS_DEFAULT=	SEARCHPROVIDER
+SEARCHPROVIDER_DESC=	Gnome-shell search provider
+SEARCHPROVIDER_CONFIGURE_ENABLE=	search-provider
+SEARCHPROVIDER_BUILD_DEPENDS=	gnome-shell:${PORTSDIR}/x11/gnome-shell
+SEARCHPROVIDER_RUN_DEPENDS=	gnome-shell:${PORTSDIR}/x11/gnome-shell
 MIGRATION_CONFIGURE_ENABLE=	migration
-MIGRATION_USE=			GNOME=gconf2
-MIGRATION_DESC=			Profile migration to gsettings (pulls in gconf2)
+MIGRATION_USE=		GNOME=gconf2
+MIGRATION_DESC=		Profile migration to gsettings (pulls in gconf2)
 
 .include <bsd.port.options.mk>
 
@@ -50,4 +54,9 @@ post-patch:
 EXTRA_PATCHES+=	${FILESDIR}/extra-src_terminal-screen.c
 .endif
 
+post-install:
+.for i in cs de el es fi fr gl hu pt_BR ru
+	@${RMDIR} ${STAGEDIR}${PREFIX}/share/help/${i}/gnome-terminal/figures
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 9d1a2590d890..d076e587b6ff 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-terminal-3.14.3.tar.xz) = db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3
-SIZE (gnome3/gnome-terminal-3.14.3.tar.xz) = 1781712
+SHA256 (gnome3/gnome-terminal-3.16.2.tar.xz) = 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0
+SIZE (gnome3/gnome-terminal-3.16.2.tar.xz) = 1798620
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 2246fd26e737..9f8bed743115 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -6,6 +6,7 @@ libexec/gnome-terminal-server
 share/appdata/gnome-terminal.appdata.xml
 share/applications/gnome-terminal.desktop
 share/dbus-1/services/org.gnome.Terminal.service
+%%SEARCHPROVIDER%%share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
 share/help/C/gnome-terminal/adv-keyboard-shortcuts.page
 share/help/C/gnome-terminal/app-colors.page
 share/help/C/gnome-terminal/app-cursor.page
@@ -32,7 +33,7 @@ share/help/C/gnome-terminal/pref-profile-encoding.page
 share/help/C/gnome-terminal/pref-profiles.page
 share/help/C/gnome-terminal/pref-scrolling.page
 share/help/C/gnome-terminal/pref-tab-window.page
-share/help/C/gnome-terminal/pref-theme.page
+share/help/C/gnome-terminal/pref-user-input.page
 share/help/C/gnome-terminal/pref.page
 share/help/C/gnome-terminal/prob-reset.page
 share/help/C/gnome-terminal/profile.page
@@ -64,7 +65,7 @@ share/help/cs/gnome-terminal/pref-profile-encoding.page
 share/help/cs/gnome-terminal/pref-profiles.page
 share/help/cs/gnome-terminal/pref-scrolling.page
 share/help/cs/gnome-terminal/pref-tab-window.page
-share/help/cs/gnome-terminal/pref-theme.page
+share/help/cs/gnome-terminal/pref-user-input.page
 share/help/cs/gnome-terminal/pref.page
 share/help/cs/gnome-terminal/prob-reset.page
 share/help/cs/gnome-terminal/profile.page
@@ -96,7 +97,7 @@ share/help/de/gnome-terminal/pref-profile-encoding.page
 share/help/de/gnome-terminal/pref-profiles.page
 share/help/de/gnome-terminal/pref-scrolling.page
 share/help/de/gnome-terminal/pref-tab-window.page
-share/help/de/gnome-terminal/pref-theme.page
+share/help/de/gnome-terminal/pref-user-input.page
 share/help/de/gnome-terminal/pref.page
 share/help/de/gnome-terminal/prob-reset.page
 share/help/de/gnome-terminal/profile.page
@@ -128,7 +129,7 @@ share/help/el/gnome-terminal/pref-profile-encoding.page
 share/help/el/gnome-terminal/pref-profiles.page
 share/help/el/gnome-terminal/pref-scrolling.page
 share/help/el/gnome-terminal/pref-tab-window.page
-share/help/el/gnome-terminal/pref-theme.page
+share/help/el/gnome-terminal/pref-user-input.page
 share/help/el/gnome-terminal/pref.page
 share/help/el/gnome-terminal/prob-reset.page
 share/help/el/gnome-terminal/profile.page
@@ -160,7 +161,7 @@ share/help/es/gnome-terminal/pref-profile-encoding.page
 share/help/es/gnome-terminal/pref-profiles.page
 share/help/es/gnome-terminal/pref-scrolling.page
 share/help/es/gnome-terminal/pref-tab-window.page
-share/help/es/gnome-terminal/pref-theme.page
+share/help/es/gnome-terminal/pref-user-input.page
 share/help/es/gnome-terminal/pref.page
 share/help/es/gnome-terminal/prob-reset.page
 share/help/es/gnome-terminal/profile.page
@@ -192,7 +193,7 @@ share/help/fi/gnome-terminal/pref-profile-encoding.page
 share/help/fi/gnome-terminal/pref-profiles.page
 share/help/fi/gnome-terminal/pref-scrolling.page
 share/help/fi/gnome-terminal/pref-tab-window.page
-share/help/fi/gnome-terminal/pref-theme.page
+share/help/fi/gnome-terminal/pref-user-input.page
 share/help/fi/gnome-terminal/pref.page
 share/help/fi/gnome-terminal/prob-reset.page
 share/help/fi/gnome-terminal/profile.page
@@ -224,7 +225,7 @@ share/help/fr/gnome-terminal/pref-profile-encoding.page
 share/help/fr/gnome-terminal/pref-profiles.page
 share/help/fr/gnome-terminal/pref-scrolling.page
 share/help/fr/gnome-terminal/pref-tab-window.page
-share/help/fr/gnome-terminal/pref-theme.page
+share/help/fr/gnome-terminal/pref-user-input.page
 share/help/fr/gnome-terminal/pref.page
 share/help/fr/gnome-terminal/prob-reset.page
 share/help/fr/gnome-terminal/profile.page
@@ -256,7 +257,7 @@ share/help/gl/gnome-terminal/pref-profile-encoding.page
 share/help/gl/gnome-terminal/pref-profiles.page
 share/help/gl/gnome-terminal/pref-scrolling.page
 share/help/gl/gnome-terminal/pref-tab-window.page
-share/help/gl/gnome-terminal/pref-theme.page
+share/help/gl/gnome-terminal/pref-user-input.page
 share/help/gl/gnome-terminal/pref.page
 share/help/gl/gnome-terminal/prob-reset.page
 share/help/gl/gnome-terminal/profile.page
@@ -288,7 +289,7 @@ share/help/hu/gnome-terminal/pref-profile-encoding.page
 share/help/hu/gnome-terminal/pref-profiles.page
 share/help/hu/gnome-terminal/pref-scrolling.page
 share/help/hu/gnome-terminal/pref-tab-window.page
-share/help/hu/gnome-terminal/pref-theme.page
+share/help/hu/gnome-terminal/pref-user-input.page
 share/help/hu/gnome-terminal/pref.page
 share/help/hu/gnome-terminal/prob-reset.page
 share/help/hu/gnome-terminal/profile.page
@@ -320,7 +321,7 @@ share/help/pt_BR/gnome-terminal/pref-profile-encoding.page
 share/help/pt_BR/gnome-terminal/pref-profiles.page
 share/help/pt_BR/gnome-terminal/pref-scrolling.page
 share/help/pt_BR/gnome-terminal/pref-tab-window.page
-share/help/pt_BR/gnome-terminal/pref-theme.page
+share/help/pt_BR/gnome-terminal/pref-user-input.page
 share/help/pt_BR/gnome-terminal/pref.page
 share/help/pt_BR/gnome-terminal/prob-reset.page
 share/help/pt_BR/gnome-terminal/profile.page
@@ -352,7 +353,7 @@ share/help/ru/gnome-terminal/pref-profile-encoding.page
 share/help/ru/gnome-terminal/pref-profiles.page
 share/help/ru/gnome-terminal/pref-scrolling.page
 share/help/ru/gnome-terminal/pref-tab-window.page
-share/help/ru/gnome-terminal/pref-theme.page
+share/help/ru/gnome-terminal/pref-user-input.page
 share/help/ru/gnome-terminal/pref.page
 share/help/ru/gnome-terminal/prob-reset.page
 share/help/ru/gnome-terminal/profile.page
@@ -454,13 +455,3 @@ share/locale/xh/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dir share/help/cs/gnome-terminal/figures
-@dir share/help/de/gnome-terminal/figures
-@dir share/help/el/gnome-terminal/figures
-@dir share/help/es/gnome-terminal/figures
-@dir share/help/fi/gnome-terminal/figures
-@dir share/help/fr/gnome-terminal/figures
-@dir share/help/gl/gnome-terminal/figures
-@dir share/help/hu/gnome-terminal/figures
-@dir share/help/pt_BR/gnome-terminal/figures
-@dir share/help/ru/gnome-terminal/figures