4 files changed, 17 insertions, 16 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index c11ec313798c..98e7cd48fc35 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gdk-pixbuf
-PORTVERSION=	2.32.3
-PORTREVISION=	1
+PORTVERSION=	2.36.6
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
@@ -13,22 +12,19 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graphic library for GTK+
 
 LICENSE=	LGPL20+
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	xt xi x11
-USES=		cpe gmake gnome libtool pathfix pkgconfig tar:xz
+USES=		cpe gmake gnome libtool localbase pathfix pkgconfig tar:xz
 CPE_VENDOR=	gnome
 USE_GNOME+=	glib20 introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=yes --with-x11
 INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JASPER JPEG PNG TIFF NLS
-OPTIONS_DEFAULT=JASPER JPEG PNG TIFF
+OPTIONS_DEFAULT=JASPER JPEG PNG TIFF NLS
 JASPER_CONFIGURE_WITH=	libjasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JPEG_CONFIGURE_WITH=	libjpeg
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index a59d740fd810..1a1adcbe59c0 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome2/gdk-pixbuf-2.32.3.tar.xz) = 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031
-SIZE (gnome2/gdk-pixbuf-2.32.3.tar.xz) = 2430720
+TIMESTAMP = 1491988486
+SHA256 (gnome2/gdk-pixbuf-2.36.6.tar.xz) = 455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c
+SIZE (gnome2/gdk-pixbuf-2.36.6.tar.xz) = 5166980
diff --git a/graphics/gdk-pixbuf2/files/patch-Makefile.in b/graphics/gdk-pixbuf2/files/patch-Makefile.in
index 8649d44a09c4..3259dab4e7a9 100644
--- a/graphics/gdk-pixbuf2/files/patch-Makefile.in
+++ b/graphics/gdk-pixbuf2/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2014-03-10 08:25:16.881789221 +0000
-+++ Makefile.in	2014-03-10 08:25:46.652787373 +0000
-@@ -438,7 +438,7 @@
+--- Makefile.in.orig	2017-04-12 11:14:48.226620000 +0200
++++ Makefile.in	2017-04-12 11:15:12.061124000 +0200
+@@ -449,7 +449,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = gdk-pixbuf po docs tests contrib build
-+SUBDIRS = gdk-pixbuf po contrib build
+-SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32
++SUBDIRS = gdk-pixbuf po thumbnailer contrib win32
  EXTRA_DIST = \
  	config.h.win32 		\
  	glib-tap.mk		\
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index d4aefdbef8b9..7ff9f26b68b1 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -1,6 +1,7 @@
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
+bin/gdk-pixbuf-thumbnailer
 include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -10,6 +11,7 @@ include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-macros.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
@@ -32,10 +34,10 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/girepository-1.0/GdkPixbuf-2.0.typelib
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.3200.3
+lib/libgdk_pixbuf-2.0.so.0.3600.6
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.3200.3
+lib/libgdk_pixbuf_xlib-2.0.so.0.3600.6
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 man/man1/gdk-pixbuf-csource.1.gz
@@ -74,6 +76,7 @@ share/gir-1.0/GdkPixbuf-2.0.gir
 %%NLS%%share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
+%%NLS%%share/locale/fur/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
@@ -146,5 +149,6 @@ share/gir-1.0/GdkPixbuf-2.0.gir
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
+share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer
 @postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
 @postunexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true