6 files changed, 29 insertions, 18 deletions

diff --git a/x11-toolkits/gtksourceview3-reference/Makefile b/x11-toolkits/gtksourceview3-reference/Makefile
index 5867f5b78899..c7afa52936fb 100644
--- a/x11-toolkits/gtksourceview3-reference/Makefile
+++ b/x11-toolkits/gtksourceview3-reference/Makefile
@@ -1,6 +1,5 @@
 # Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtksourceview2-reference/Makefile,v 1.1 2007/06/25 20:59:01 mezz Exp $
 
 PORTREVISION=	0
 
diff --git a/x11-toolkits/gtksourceview3-reference/pkg-descr b/x11-toolkits/gtksourceview3-reference/pkg-descr
index 3065f973f59b..4c7f39439417 100644
--- a/x11-toolkits/gtksourceview3-reference/pkg-descr
+++ b/x11-toolkits/gtksourceview3-reference/pkg-descr
@@ -1 +1 @@
-This port contains the programming reference for x11-toolkits/gtksourceview2.
+This port contains the programming reference for x11-toolkits/gtksourceview3.
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 9e4417cfffe5..c33768eca4b8 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtksourceview
-PORTVERSION=	3.18.2
+PORTVERSION=	3.22.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
@@ -20,8 +20,8 @@ PORTSCOUT=	limitw:1,even
 BUILD_DEPENDS=	vala:lang/vala
 
 USES+=		gettext gmake gnome libtool pathfix pkgconfig
-USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build \
-		libxml2 referencehack
+USE_GNOME=	cairo gdkpixbuf2 gnomeprefix gtk30 intlhack \
+		introspection:build libxml2 referencehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-compile-warnings=no \
diff --git a/x11-toolkits/gtksourceview3/distinfo b/x11-toolkits/gtksourceview3/distinfo
index 2469784370f7..0dba46ee1f8c 100644
--- a/x11-toolkits/gtksourceview3/distinfo
+++ b/x11-toolkits/gtksourceview3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gtksourceview-3.18.2.tar.xz) = 60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2
-SIZE (gnome3/gtksourceview-3.18.2.tar.xz) = 1317804
+TIMESTAMP = 1493211914
+SHA256 (gnome3/gtksourceview-3.22.2.tar.xz) = 6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e
+SIZE (gnome3/gtksourceview-3.22.2.tar.xz) = 1596384
diff --git a/x11-toolkits/gtksourceview3/files/patch-Makefile.in b/x11-toolkits/gtksourceview3/files/patch-Makefile.in
index 93437732d8fa..88e1903427fb 100644
--- a/x11-toolkits/gtksourceview3/files/patch-Makefile.in
+++ b/x11-toolkits/gtksourceview3/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2015-08-31 13:55:15.919297000 +0200
-+++ Makefile.in	2015-08-31 13:55:35.773605000 +0200
-@@ -429,7 +429,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+--- Makefile.in.orig	2017-04-26 15:05:37.460799000 +0200
++++ Makefile.in	2017-04-26 15:06:26.605269000 +0200
+@@ -451,7 +451,7 @@
  top_srcdir = @top_srcdir@
--SUBDIRS = gtksourceview po data docs tests
-+SUBDIRS = gtksourceview po data docs
- pkgconfig_DATA = gtksourceview-3.0.pc
- EXTRA_DIST = \
- 	intltool-extract.in \
+ valgrind_enabled_tools = @valgrind_enabled_tools@
+ valgrind_tools = @valgrind_tools@
+-SUBDIRS = gtksourceview po data docs tests testsuite build
++SUBDIRS = gtksourceview po data docs build
+ AM_DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc		\
+ 	--enable-introspection		\
diff --git a/x11-toolkits/gtksourceview3/pkg-plist b/x11-toolkits/gtksourceview3/pkg-plist
index 8f3abfcae8e3..5b5b9aeac155 100644
--- a/x11-toolkits/gtksourceview3/pkg-plist
+++ b/x11-toolkits/gtksourceview3/pkg-plist
@@ -22,6 +22,7 @@ include/gtksourceview-3.0/gtksourceview/gtksourcemap.h
 include/gtksourceview-3.0/gtksourceview/gtksourcemark.h
 include/gtksourceview-3.0/gtksourceview/gtksourcemarkattributes.h
 include/gtksourceview-3.0/gtksourceview/gtksourceprintcompositor.h
+include/gtksourceview-3.0/gtksourceview/gtksourceregion.h
 include/gtksourceview-3.0/gtksourceview/gtksourcesearchcontext.h
 include/gtksourceview-3.0/gtksourceview/gtksourcesearchsettings.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestyle.h
@@ -30,15 +31,18 @@ include/gtksourceview-3.0/gtksourceview/gtksourcestyleschemechooser.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestyleschemechooserbutton.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestyleschemechooserwidget.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestyleschememanager.h
+include/gtksourceview-3.0/gtksourceview/gtksourcetag.h
 include/gtksourceview-3.0/gtksourceview/gtksourcetypes.h
 include/gtksourceview-3.0/gtksourceview/gtksourceundomanager.h
 include/gtksourceview-3.0/gtksourceview/gtksourceutils.h
+include/gtksourceview-3.0/gtksourceview/gtksourceversion.h
+include/gtksourceview-3.0/gtksourceview/gtksourceview-enumtypes.h
 include/gtksourceview-3.0/gtksourceview/gtksourceview-typebuiltins.h
 include/gtksourceview-3.0/gtksourceview/gtksourceview.h
 lib/girepository-1.0/GtkSource-3.0.typelib
 lib/libgtksourceview-3.0.so
 lib/libgtksourceview-3.0.so.1
-lib/libgtksourceview-3.0.so.1.5.0
+lib/libgtksourceview-3.0.so.1.7.0
 libdata/pkgconfig/gtksourceview-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceBuffer.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletion.html
@@ -62,6 +66,7 @@ libdata/pkgconfig/gtksourceview-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceMark.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceMarkAttributes.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourcePrintCompositor.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceRegion.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceSearchContext.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceSearchSettings.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyle.html
@@ -70,6 +75,7 @@ libdata/pkgconfig/gtksourceview-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeChooserButton.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeChooserWidget.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeManager.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceTag.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceUndoManager.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceView.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/annotation-glossary.html
@@ -85,6 +91,8 @@ libdata/pkgconfig/gtksourceview-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-3-14.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-3-16.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-3-18.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-3-20.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-3-22.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-3-4.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-full.html
@@ -98,6 +106,7 @@ libdata/pkgconfig/gtksourceview-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-3.0/ch08.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/ch09.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/gtksourceview-3.0-GtkSourceUtils.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/gtksourceview-3.0-Version-Information.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/gtksourceview-3.0.devhelp2
 %%PORTDOCS%%%%DOCSDIR%%-3.0/home.png
 %%PORTDOCS%%%%DOCSDIR%%-3.0/index.html
@@ -107,6 +116,8 @@ libdata/pkgconfig/gtksourceview-3.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-3.0/left.png
 %%PORTDOCS%%%%DOCSDIR%%-3.0/object-tree.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/pt01.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/pt02.html
+%%PORTDOCS%%%%DOCSDIR%%-3.0/pt03.html
 %%PORTDOCS%%%%DOCSDIR%%-3.0/right-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%-3.0/right.png
 %%PORTDOCS%%%%DOCSDIR%%-3.0/style-reference.html