Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.218 2015/06/12 10:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.219 2015/07/01 12:41:20 wiz Exp $

-PKGREVISION= 1
 .include "Makefile.common"

 PKGNAME=	ImageMagick-${DISTVERSION}
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.114 2015/06/07 09:13:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.116 2015/07/08 11:51:50 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile

 IM_MAJOR_VER=		6.9.1
-IM_MINOR_VER=		4
+IM_MINOR_VER=		7
 IM_MAJOR_LIB_VER=	6

 .if (${IM_MINOR_VER} != NONE)
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.132 2015/06/07 09:13:11 wiz Exp $
+$NetBSD: distinfo,v 1.134 2015/07/08 11:51:50 wiz Exp $

-SHA1 (ImageMagick-6.9.1-4.tar.xz) = ed0743e1a999461433a45a10f8afe6bf2c62a884
-RMD160 (ImageMagick-6.9.1-4.tar.xz) = 506b22aa5ab9e453a7894a24a2abb0e6406ec7ef
-Size (ImageMagick-6.9.1-4.tar.xz) = 7978216 bytes
+SHA1 (ImageMagick-6.9.1-7.tar.xz) = d58a448e6026cb2ecc2cc5804e35d6bc09924081
+RMD160 (ImageMagick-6.9.1-7.tar.xz) = 79d903b831d72dce50712dfc2632260b263a94b5
+Size (ImageMagick-6.9.1-7.tar.xz) = 8284892 bytes
+SHA1 (patch-magick_property.c) = bffd5d465bb000d83de76ba81c3913e003b26299
--- a/graphics/ImageMagick/patches/patch-magick_property.c
+++ b/graphics/ImageMagick/patches/patch-magick_property.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-magick_property.c,v 1.4 2015/07/01 12:41:20 wiz Exp $
+
+Adapt for pkgsrc path of lcms2.
+
+--- magick/property.c.orig	2015-06-06 13:46:25.000000000 +0000
+++ magick/property.c
+@@ -81,8 +81,8 @@
+ #include "magick/version.h"
+ #include "magick/xml-tree.h"
+ #if defined(MAGICKCORE_LCMS_DELEGATE)
+-#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
+-#include <lcms/lcms2.h>
+#if defined(MAGICKCORE_HAVE_LCMS2_LCMS2_H)
+#include <lcms2/lcms2.h>
+ #elif defined(MAGICKCORE_HAVE_LCMS2_H)
+ #include "lcms2.h"
+ #elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H)
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.709 2015/05/27 22:06:54 markd Exp $
+# $NetBSD: Makefile,v 1.717 2015/09/15 13:35:08 wiz Exp $
 #

 COMMENT=	Graphics tools and libraries
@@ -110,7 +110,6 @@ SUBDIR+=	f4l
 SUBDIR+=	fbm
 SUBDIR+=	feh
 SUBDIR+=	flickrnet
-SUBDIR+=	flphoto
 SUBDIR+=	fly
 SUBDIR+=	fnlib
 SUBDIR+=	fotoxx
@@ -132,8 +131,10 @@ SUBDIR+=	gdk-pixbuf2-jasper
 SUBDIR+=	gdk-pixbuf2-xlib
 SUBDIR+=	geeqie
 SUBDIR+=	gegl
+SUBDIR+=	gegl0.2
 SUBDIR+=	geomview
 SUBDIR+=	get_ds7
+SUBDIR+=	gexiv2
 SUBDIR+=	gfract
 SUBDIR+=	gif2png
 SUBDIR+=	gif320
@@ -272,7 +273,6 @@ SUBDIR+=	libepoxy
 SUBDIR+=	libexif
 SUBDIR+=	libexif-gtk
 SUBDIR+=	libgdiplus
-SUBDIR+=	libgexiv2
 SUBDIR+=	libggi
 SUBDIR+=	libggigcp
 SUBDIR+=	libggimisc
@@ -369,12 +369,12 @@ SUBDIR+=	pdiff
 SUBDIR+=	pear-Image_Canvas
 SUBDIR+=	pear-Image_Color
 SUBDIR+=	pear-Image_Graph
-SUBDIR+=	pfstmo
 SUBDIR+=	pfstools
 SUBDIR+=	pgraf
 SUBDIR+=	photopc
 SUBDIR+=	php-exif
 SUBDIR+=	php-gd
+SUBDIR+=	php-imagick
 SUBDIR+=	php-jpgraph
 SUBDIR+=	pixmap
 SUBDIR+=	ploticus
@@ -483,6 +483,8 @@ SUBDIR+=	tex-automata
 SUBDIR+=	tex-automata-doc
 SUBDIR+=	tex-bbcard
 SUBDIR+=	tex-bbcard-doc
+SUBDIR+=	tex-bclogo
+SUBDIR+=	tex-bclogo-doc
 SUBDIR+=	tex-blockdraw_mp
 SUBDIR+=	tex-blockdraw_mp-doc
 SUBDIR+=	tex-bpolynomial
@@ -522,6 +524,8 @@ SUBDIR+=	tex-hatching
 SUBDIR+=	tex-hatching-doc
 SUBDIR+=	tex-latexmp
 SUBDIR+=	tex-latexmp-doc
+SUBDIR+=	tex-mcf2graph
+SUBDIR+=	tex-mcf2graph-doc
 SUBDIR+=	tex-metago
 SUBDIR+=	tex-metago-doc
 SUBDIR+=	tex-metaobj
@@ -609,6 +613,10 @@ SUBDIR+=	tex-pstricks-doc
 SUBDIR+=	tex-repere
 SUBDIR+=	tex-repere-doc
 SUBDIR+=	tex-roex
+SUBDIR+=	tex-roundrect
+SUBDIR+=	tex-roundrect-doc
+SUBDIR+=	tex-shapes
+SUBDIR+=	tex-shapes-doc
 SUBDIR+=	tex-slideshow
 SUBDIR+=	tex-slideshow-doc
 SUBDIR+=	tex-splines
@@ -621,6 +629,8 @@ SUBDIR+=	tex-textpath
 SUBDIR+=	tex-textpath-doc
 SUBDIR+=	tex-threeddice
 SUBDIR+=	tex-threeddice-doc
+SUBDIR+=	tex-tikzposter
+SUBDIR+=	tex-tikzposter-doc
 SUBDIR+=	tex-xypic
 SUBDIR+=	tex-xypic-doc
 SUBDIR+=	tgif
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2015/04/25 14:23:06 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2015/09/11 16:54:56 tnn Exp $

 DISTNAME=	mesa-demos-8.2.0
 PKGNAME=	${DISTNAME:S/mesa-demos/MesaDemos/}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +17,15 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++

+SUBST_CLASSES+=		bitmap
+SUBST_STAGE.bitmap=	pre-configure
+SUBST_MESSAGE.bitmap=	Avoid conflict with x11/bitmap and graphics/glx-utils
+SUBST_FILES.bitmap=	src/glsl/Makefile.in
+SUBST_FILES.bitmap+=	src/xdemos/Makefile.in
+SUBST_SED.bitmap=	-e 's/bitmap$$(EXEEXT)/bitmap_mesademos$$(EXEEXT)/g'
+SUBST_SED.bitmap+=	-e 's/glxgears$$(EXEEXT)/glxgears_mesademos$$(EXEEXT)/g'
+SUBST_SED.bitmap+=	-e 's/glxinfo$$(EXEEXT)/glxinfo_mesademos$$(EXEEXT)/g'
+
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.15 2015/04/03 01:57:40 tnn Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/09/11 16:54:56 tnn Exp $
 bin/arbfplight
 bin/arbfslight
 bin/arbocclude
 bin/arbocclude2
 bin/array
 bin/bezier
-bin/bitmap
+bin/bitmap_mesademos
 bin/blinking-teapot
 bin/bounce
 bin/brick
@@ -77,11 +77,11 @@ bin/gltestperf
 bin/glthreads
 bin/glxcontexts
 bin/glxdemo
-bin/glxgears
+bin/glxgears_mesademos
 bin/glxgears_fbconfig
 bin/glxgears_pixmap
 bin/glxheads
-bin/glxinfo
+bin/glxinfo_mesademos
 bin/glxpbdemo
 bin/glxpixmap
 bin/glxsnoop
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2015/04/13 14:00:17 tnn Exp $
+$NetBSD: distinfo,v 1.23 2015/09/11 00:10:43 tnn Exp $

 SHA1 (mesa-demos-8.2.0.tar.bz2) = e1a66ac63eebba4f950f95d830f34a6005167116
 RMD160 (mesa-demos-8.2.0.tar.bz2) = e6804e480ed5d227ba689cb9b3ea95cc85353889
 Size (mesa-demos-8.2.0.tar.bz2) = 10071635 bytes
+SHA1 (patch-src_Makefile.in) = ab349abae606c4b0f8dae4604e96fc51c02828ac
 SHA1 (patch-src_xdemos_glinfo__common.c) = 1f657daf58f2ae08a161cd7ab73285af441f17b0
--- a/graphics/MesaDemos/patches/patch-src_Makefile.in
+++ b/graphics/MesaDemos/patches/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2015/09/11 00:10:43 tnn Exp $
+
+egl subdir doesn't build with current Mesa release.
+
+--- src/Makefile.in.orig	2014-07-05 09:13:27.000000000 +0000
+++ src/Makefile.in
+@@ -354,7 +354,6 @@ SUBDIRS = \
+ 	util \
+ 	data \
+ 	demos \
+-	egl \
+ 	fp \
+ 	fpglsl \
+ 	glsl \
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2015/06/07 15:48:12 tnn Exp $
+# $NetBSD: Makefile,v 1.109 2015/09/15 00:24:26 tnn Exp $

-DISTNAME=	mesa-10.5.7
+DISTNAME=	mesa-10.6.7
+PKGREVISION=	2
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
@@ -26,7 +27,6 @@ PKGCONFIG_OVERRIDE+=	src/gallium/targets/xa/xatracker.pc.in
 PKGCONFIG_OVERRIDE+=	src/gbm/main/gbm.pc.in
 PKGCONFIG_OVERRIDE+=	src/mapi/es1api/glesv1_cm.pc.in
 PKGCONFIG_OVERRIDE+=	src/mapi/es2api/glesv2.pc.in
-PKGCONFIG_OVERRIDE+=	src/mapi/vgapi/vg.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/drivers/dri/dri.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/drivers/osmesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/gl.pc.in
@@ -45,6 +45,13 @@ SUBST_SED.wrapper-bug=		-e 's,shared-glapi/libglapi.la,shared-glapi/libglapi_sha
 SUBST_SED.wrapper-bug+=		-e 's,libglapi.la,libglapi_static.la,g'
 SUBST_SED.wrapper-bug+=		-e 's,libglapi_shared.la,libglapi.la,g'

+# Replace /etc/drirc with ${PREFIX}/etc/drirc
+SUBST_CLASSES+=			drirc
+SUBST_STAGE.drirc=		post-patch
+SUBST_MESSAGE.drirc=		Fixing hardcoded /etc/drirc references
+SUBST_FILES.drirc+=		src/mesa/drivers/dri/common/xmlconfig.c
+SUBST_SED.drirc+=		 -e 's|/etc/|${PREFIX}/etc/|g'
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 .include "options.mk"
@@ -60,6 +67,7 @@ SUBST_SED.tr1+=		-e 's,include <tr1/,include <,g'
 .endif

 PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # as of 10.6.7
 BUILD_DEPENDS+=		${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 .include "../../lang/python/tool.mk"

@@ -68,7 +76,7 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 # which breaks the build with -Wl,--no-undefined.
 # So we piggy back on -lpthread and inject -lc after it.
 .if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
-BUILDLINK_TRANSFORM+=   l:pthread:pthread:c
+BUILDLINK_TRANSFORM+=   l:pthread:pthread:c l:m:m:c
 .endif

 # Handle platforms without exp2
@@ -77,6 +85,11 @@ CPPFLAGS+=	-Dexp2\(x\)=exp\(\(x\)\*M_LN2\)
 CPPFLAGS+=	-Dexp2f\(x\)=expf\(\(x\)\*M_LN2\)
 .endif

+INSTALLATION_DIRS+=	share/examples/MesaLib
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/dri/common/drirc ${DESTDIR}${PREFIX}/share/examples/MesaLib
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.27 2015/04/25 11:19:18 tnn Exp $
-include/EGL/egl.h
-include/EGL/eglext.h
-include/EGL/eglextchromium.h
-include/EGL/eglmesaext.h
-include/EGL/eglplatform.h
+@comment $NetBSD: PLIST,v 1.29 2015/09/11 15:30:35 tnn Exp $
+${PLIST.dri}include/EGL/egl.h
+${PLIST.dri}include/EGL/eglext.h
+${PLIST.dri}include/EGL/eglextchromium.h
+${PLIST.dri}include/EGL/eglmesaext.h
+${PLIST.dri}include/EGL/eglplatform.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glcorearb.h
@@ -14,8 +14,7 @@ include/GL/glxext.h
 ${PLIST.dri}include/GL/internal/dri_interface.h
 include/GL/osmesa.h
 include/GL/wglext.h
-include/GL/wmesa.h
-include/KHR/khrplatform.h
+${PLIST.dri}include/KHR/khrplatform.h
 ${PLIST.dri}include/gbm.h
 ${PLIST.i915_dri}lib/dri/i915_dri.so
 ${PLIST.i965_dri}lib/dri/i965_dri.so
@@ -30,11 +29,12 @@ ${PLIST.radeon_dri}lib/dri/radeon_dri.so
 ${PLIST.radeonsi}lib/dri/radeonsi_dri.so
 ${PLIST.swrast_dri}lib/dri/swrast_dri.so
 ${PLIST.svga}lib/dri/vmwgfx_dri.so
-lib/libEGL.la
+${PLIST.dri}lib/libEGL.la
 lib/libGL.la
 ${PLIST.dri}lib/libgbm.la
 ${PLIST.dri}lib/libglapi.la
 ${PLIST.dri}lib/pkgconfig/dri.pc
-lib/pkgconfig/egl.pc
+${PLIST.dri}lib/pkgconfig/egl.pc
 ${PLIST.dri}lib/pkgconfig/gbm.pc
 lib/pkgconfig/gl.pc
+share/examples/MesaLib/drirc
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2015/04/25 11:19:18 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2015/09/16 12:28:53 tnn Exp $

 BUILDLINK_TREE+=	MesaLib

@@ -35,6 +35,13 @@ PKG_BUILD_OPTIONS.MesaLib+=	dri
 .  include "../../graphics/MesaLib/dri.mk"
 .endif

+.if	${X11_TYPE} == "modular" && !empty(PKG_BUILD_OPTIONS.MesaLib:Mdri) ||	\
+	${X11_TYPE} == "native"  && exists(${X11BASE}/include/EGL/egl.h)
+MESALIB_SUPPORTS_EGL=	yes
+.else
+MESALIB_SUPPORTS_EGL=	no
+.endif
+
 .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
 .include "../../devel/pthread-stublib/buildlink3.mk"
 .endif
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,36 +1,44 @@
-$NetBSD: distinfo,v 1.96 2015/06/07 15:48:12 tnn Exp $
+$NetBSD: distinfo,v 1.99 2015/09/11 16:27:30 tnn Exp $

-SHA1 (mesa-10.5.7.tar.xz) = b600f09ccaeab9f6bb5b98091cf01732bab854a2
-RMD160 (mesa-10.5.7.tar.xz) = 0e15cf97678ecdc95996b598169130dcfd239533
-Size (mesa-10.5.7.tar.xz) = 6992848 bytes
-SHA1 (patch-configure) = 3fc150370e36fc49382b491d907608f00cf99a72
-SHA1 (patch-include_EGL_eglplatform.h) = c34bac7386fd93ee8d0b83a748ae14dc4742d776
+SHA1 (mesa-10.6.7.tar.xz) = c63008bf8f2b1022a60a82fa4f2200db6fbd956c
+RMD160 (mesa-10.6.7.tar.xz) = cdf2062b98094afdb281da6b040484f66383a17a
+Size (mesa-10.6.7.tar.xz) = 7041708 bytes
+SHA1 (patch-configure) = 24d1ee6bf62cdea9c9356132f727b490679f0330
+SHA1 (patch-include_EGL_eglplatform.h) = a20ee1690b2977d53a60c738e292b07c6f999e8d
 SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
+SHA1 (patch-src_gallium_auxiliary_util_u__cpu__detect.c) = 5f4c3db54620739da0fe7dfb57c58728ecbbb6e0
 SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
-SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = b126390d4a8ee495edfb4c3b1dfdab981445969e
+SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = 8dd195b29f6ba598260348194aca149f1ca057f9
 SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = 283f505af780071dc9fd7914f8065e3fb7d8a4fd
 SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677
 SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc
 SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = ae1b6eb4df3e4db0f37e44118cdf69b16f3c471e
 SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
-SHA1 (patch-src_gallium_include_pipe_p__config.h) = 1698482bb7b468c6fa5f9bb553f9065cecc33f0d
 SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280
 SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a
 SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e
 SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df
 SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc
 SHA1 (patch-src_glsl_ralloc.c) = 7443d00ff05ee1e1dcfa2b76972b55abadebcad8
+SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b
+SHA1 (patch-src_glx_glxcurrent.c) = cad9128925aa68e169c241e3d747ec6e6a9d884e
+SHA1 (patch-src_loader_Makefile.in) = b0475273e2fdd3379528a0d8d393236df131bb30
+SHA1 (patch-src_loader_loader.c) = 4086fcee5030b6d6624c08894ace67c8889887ce
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = c722ce4a22911d9a3d04e1a4fd6ab1a5ddd81cf0
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 51d6ef1aa3db69b23eea6fe145a54c0e7e265190
 SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21
-SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = b016b3f9324b05e4206e1c23150bd1cde9b9e100
+SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 53026e520a510e54494760a3fa05af6f15dfb9d8
+SHA1 (patch-src_mapi_u__current.c) = 1731375d82119be326b35d141d7879e083d6d620
+SHA1 (patch-src_mapi_u__current.h) = 214dd29cb0c4fe127eb1157b04b12ddfc455b4b0
+SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 48032b8f8e6eac59092f68f3c32cfdd44d7ce8bf
 SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e
-SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = 8c8e748397bcdc9b9abbd14604af5d79de08dfbf
+SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = 668cc1d6a58f8f02eb9eb32c1aeffb4bef7beaf4
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__context.h) = e0db31a3ea077531d922923c300d06d9e265283b
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4
-SHA1 (patch-src_mesa_main_compiler.h) = fc0e2b6be8afa9e21ddca1d1a14608a1687bddd8
 SHA1 (patch-src_mesa_main_context.c) = 30c3796865372aa16297c2aaa647ddb49958fa64
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 6273c74161f045363c58f38adeb672287f6a0898
-SHA1 (patch-src_mesa_x86_common__x86.c) = f8b36603f7495b7712943c4a86459bcdd733d6a2
+SHA1 (patch-src_mesa_tnl_t__pipeline.c) = afc7d5f27aeadacc7c6a762e5aa892e01a0c1317
+SHA1 (patch-src_mesa_x86_common__x86.c) = bdac91384d67ad0238ecd4cdcf5cfc787952a3d9
 SHA1 (patch-src_util_u__atomic.h) = 4a567b6fe5bf67fb7f386fa5f37bedb66d593085
--- a/graphics/MesaLib/dri.mk
+++ b/graphics/MesaLib/dri.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.11 2015/06/22 22:45:06 jperkin Exp $
+# $NetBSD: dri.mk,v 1.12 2015/09/11 00:03:36 tnn Exp $
 #
 # Currently, this is for convenience only.
 #
@@ -35,4 +35,8 @@ BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
 .    include "../../x11/presentproto/buildlink3.mk"
 .    include "../../x11/libxshmfence/buildlink3.mk"
 .  endif
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+.    include "../../x11/libxshmfence/buildlink3.mk"
+.    include "../../devel/libdevq/buildlink3.mk"
+.  endif
 .endif
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,16 +1,24 @@
-# $NetBSD: options.mk,v 1.32 2015/05/28 21:09:07 tnn Exp $
+# $NetBSD: options.mk,v 1.41 2015/09/18 16:18:47 tnn Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=		llvm dri
 PKG_SUGGESTED_OPTIONS=

-.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-*) && (	\
-	${MACHINE_ARCH} == "i386" ||			\
-	${MACHINE_ARCH} == "x86_64" ||			\
-	${MACHINE_ARCH} == "sparc64" ||			\
-	${MACHINE_ARCH} == "powerpc" ||			\
-	!empty(MACHINE_ARCH:M*arm*))
-#PKG_SUGGESTED_OPTIONS+=		llvm
+# The LLVM option enables JIT accelerated software rendering and
+# is also required to support the latest RADEON GPUs, so enable it
+# by default on platforms where such GPUs might be encountered.
+.if \
+	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||	\
+	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) ||	\
+	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64)
+PKG_SUGGESTED_OPTIONS+=		llvm
+.endif
+
+.if	(!empty(MACHINE_PLATFORM:MLinux-*-i386) ||	\
+	 !empty(MACHINE_PLATFORM:MLinux-*-x86_64)) &&	\
+	(!empty(CC_VERSION:Mgcc-4.[89].*) ||		\
+	 !empty(CC_VERSION:Mgcc-[56].*))
+PKG_SUGGESTED_OPTIONS+=		llvm
 .endif

 .if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" ||		\
@@ -28,13 +36,23 @@ PLIST_VARS+=		dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri

 .if !empty(PKG_OPTIONS:Mdri)

-# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
-# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model initial-exec and dlopen is not supported
+CONFIGURE_ARGS+=	--enable-dri
+CONFIGURE_ARGS+=	--enable-egl
+
+# Use Thread Local Storage in GLX where it is supported by Mesa and works.
+.if \
+	!empty(MACHINE_PLATFORM:MLinux-*-i386) ||		\
+	!empty(MACHINE_PLATFORM:MLinux-*-x86_64) ||		\
+	!empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) ||	\
+	!empty(MACHINE_PLATFORM:MDragonFly-*-x86_64)
+CONFIGURE_ARGS+=	--enable-glx-tls
+.else
 CONFIGURE_ARGS+=	--disable-glx-tls
+.endif

 PLIST.dri=	yes

-BUILDLINK_DEPMETHOD.libpciaccess=      full
+BUILDLINK_DEPMETHOD.libpciaccess=	full
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../graphics/MesaLib/dri.mk"

@@ -75,16 +93,19 @@ PLIST.i965_dri=		yes
 DRI_DRIVERS+=		i965
 .endif

-# AMD Radeon r600
-PLIST.r600=		yes
-GALLIUM_DRIVERS+=	r600
-
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
 # Qualcomm SnapDragon, libdrm_freedreno.pc
 # GALLIUM_DRIVERS+=	freedreno

 # Broadcom VideoCore 4
 # GALLIUM_DRIVERS+=	vc4

+.else
+
+# AMD Radeon r600
+PLIST.r600=		yes
+GALLIUM_DRIVERS+=	r600
+
 # nVidia
 PLIST.nouveau=		yes
 GALLIUM_DRIVERS+=	nouveau
@@ -100,6 +121,7 @@ DRI_DRIVERS+=		r200
 # classic DRI nouveau
 PLIST.nouveau_dri=	yes
 DRI_DRIVERS+=		nouveau
+.endif

 CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm
 CONFIGURE_ARGS+=	--with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
@@ -114,6 +136,8 @@ PLIST.radeonsi=		yes
 GALLIUM_DRIVERS+=	radeonsi
 CONFIGURE_ARGS+=	--enable-gallium-llvm
 CONFIGURE_ARGS+=	--enable-r600-llvm-compiler
+.include "../../devel/libelf/buildlink3.mk"
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.libelf}/include/libelf
 .include "../../lang/libLLVM/buildlink3.mk"
 CONFIGURE_ENV+=		ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
 .else # !llvm
@@ -125,5 +149,9 @@ CONFIGURE_ARGS+=	--with-gallium-drivers=
 CONFIGURE_ARGS+=	--with-dri-drivers=
 CONFIGURE_ARGS+=	--disable-dri
 CONFIGURE_ARGS+=	--disable-dri3
+CONFIGURE_ARGS+=	--disable-egl
 CONFIGURE_ARGS+=	--enable-xlib-glx
+.if !empty(PKG_OPTIONS:Mllvm)
+PKG_FAIL_REASON+=	"The llvm PKG_OPTION must also be disabled when dri is disabled"
+.endif
 .endif
--- a/graphics/MesaLib/patches/patch-configure
+++ b/graphics/MesaLib/patches/patch-configure
@@ -1,10 +1,37 @@
-$NetBSD: patch-configure,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-configure,v 1.2 2015/09/11 00:03:36 tnn Exp $

 Make sure toolchain can assemble SSE stuff in addition to having intrinsics.
+Add libdevq support from FreeBSD ports.

--- configure.orig	2015-03-28 18:43:34.000000000 +0000
+--- configure.orig	2015-09-04 22:02:51.000000000 +0000
 +++ configure
-@@ -19578,7 +19578,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -858,6 +858,8 @@ GLPROTO_LIBS
+ GLPROTO_CFLAGS
+ XLIBGL_LIBS
+ XLIBGL_CFLAGS
+LIBDEVQ_LIBS
+LIBDEVQ_CFLAGS
+ LIBUDEV_LIBS
+ LIBUDEV_CFLAGS
+ MESA_LLVM
+@@ -1154,6 +1156,8 @@ LIBDRM_CFLAGS
+ LIBDRM_LIBS
+ LIBUDEV_CFLAGS
+ LIBUDEV_LIBS
+LIBDEVQ_CFLAGS
+LIBDEVQ_LIBS
+ XLIBGL_CFLAGS
+ XLIBGL_LIBS
+ GLPROTO_CFLAGS
+@@ -5231,6 +5235,7 @@ DRI2PROTO_REQUIRED=2.6
+ DRI3PROTO_REQUIRED=1.0
+ PRESENTPROTO_REQUIRED=1.0
+ LIBUDEV_REQUIRED=151
+LIBDEVQ_REQUIRED=0.0.2
+ GLPROTO_REQUIRED=1.4.14
+ LIBOMXIL_BELLAGIO_REQUIRED=0.0
+ LIBVA_REQUIRED=0.35.0
+@@ -19694,7 +19699,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 #include <smmintrin.h>
 int main () {
     __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
@@ -13,12 +40,132 @@ Make sure toolchain can assemble SSE stuff in addition to having intrinsics.
     return 0;
 }
 _ACEOF
-@@ -23563,7 +23563,7 @@ if test "x$enable_nine" = xyes; then
-     if ! echo "$with_gallium_drivers" | grep -q 'swrast'; then
-         as_fn_error $? "nine requires the gallium swrast driver" "$LINENO" 5
-     fi
-    if test "x$with_gallium_drivers" == xswrast; then
-+    if test "x$with_gallium_drivers" = xswrast; then
-         as_fn_error $? "nine requires at least one non-swrast gallium driver" "$LINENO" 5
-     fi
-     if test "x$enable_dri3" = xno; then
+@@ -20466,7 +20471,7 @@ _ACEOF
+ $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
+         flag=no
+         case ${host_os} in
+-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            aix* | freebsd* | dragonfly* | darwin*) flag="-D_THREAD_SAFE";;
+             osf* | hpux*) flag="-D_REENTRANT";;
+             solaris*)
+             if test "$GCC" = "yes"; then
+@@ -21349,6 +21354,89 @@ else
+ fi
+ 
+ 
+
+# Check for libdevq
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
+$as_echo_n "checking for LIBDEVQ... " >&6; }
+if test -n "$LIBDEVQ_CFLAGS"; then
+    pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
+ --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >=
+ $LIBDEVQ_REQUIRED" 2>/dev/null`
+              test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBDEVQ_LIBS"; then
+    pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
+ --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >=
+ $LIBDEVQ_REQUIRED" 2>/dev/null`
+              test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+            LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors
+ --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED"
+ 2>&1`
+        else
+            LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
+ --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
+        fi
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBDEVQ_PKG_ERRORS" >&5
+
+    have_libdevq=no
+elif test $pkg_failed = untried; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    have_libdevq=no
+else
+    LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
+    LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    have_libdevq=yes
+fi
+
+
+
+
+ if test "x$enable_dri" = xyes; then
+     if test "$enable_static" = yes; then
+         as_fn_error $? "Cannot use static libraries for DRI drivers" "$LINENO" 5
+@@ -22060,6 +22148,10 @@ if test "$have_sysfs" = yes; then
+     DEFINES="$DEFINES -DHAVE_SYSFS"
+     have_pci_id=yes
+ fi
+if test "$have_libdevq" = yes; then
+    DEFINES="$DEFINES -DHAVE_LIBDEVQ"
+    have_pci_id=yes
+fi
+ 
+ # This is outside the case (above) so that it is invoked even for non-GLX
+ # builds.
+@@ -23002,6 +23094,8 @@ fi
+ 
+ if test "x$need_pci_id$have_libudev" = xyesyes; then
+     GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
+elif test "x$need_libdevq" = xyes; then
+    GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
+ else
+     GBM_PC_REQ_PRIV=""
+ fi
+@@ -24558,9 +24652,6 @@ fi
+                 CLANG_LIBDIR=${LLVM_LIBDIR}
+             fi
+             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
+-            if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
+-  as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
+-fi
+         fi
+     else
+         MESA_LLVM=0
--- a/graphics/MesaLib/patches/patch-include_EGL_eglplatform.h
+++ b/graphics/MesaLib/patches/patch-include_EGL_eglplatform.h
@@ -1,29 +1,10 @@
-$NetBSD: patch-include_EGL_eglplatform.h,v 1.1 2015/05/16 16:39:52 tnn Exp $
+$NetBSD: patch-include_EGL_eglplatform.h,v 1.2 2015/09/11 00:03:36 tnn Exp $

 https://bugs.freedesktop.org/show_bug.cgi?id=90249

-From 5b31c5cdcdb09d12e3dc5180ab5c80250e8dd2bd Mon Sep 17 00:00:00 2001
-From: Julien Isorce <j.isorce@samsung.com>
-Date: Thu, 30 Apr 2015 08:36:50 +0100
-Subject: [PATCH] egl: use unix defines on osx with clang
-
-CC       egl_dri2.lo
-include/EGL/eglplatform.h:135:2:
-  error: "Platform not recognized"
-include/EGL/eglplatform.h:140:9:
-  error: unknown type name 'EGLNativeDisplayType'
-typedef EGLNativeDisplayType NativeDisplayType;
-
-Signed-off-by: Julien Isorce <j.isorce@samsung.com>
---
- include/EGL/eglplatform.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
-index 2eb6865..672119e 100644
--- include/EGL/eglplatform.h
+--- include/EGL/eglplatform.h.orig	2015-09-10 17:40:30.000000000 +0000
 +++ include/EGL/eglplatform.h
-@@ -104,7 +104,7 @@ typedef struct ANativeWindow        *EGLNativeWindowType;
+@@ -104,7 +104,7 @@ typedef struct ANativeWindow        *EGL
 typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
 typedef void                        *EGLNativeDisplayType;
 
@@ -31,3 +12,4 @@ index 2eb6865..672119e 100644
 +#elif defined(__unix__) || defined(__APPLE__)
 
 #if defined(MESA_EGL_NO_X11_HEADERS)
+ 
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_ucpudetect.c
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_ucpudetect.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gallium_auxiliary_util_u__cpu__detect.c,v 1.1 2015/09/11 00:03:36 tnn Exp $
+
+DragonFly support.
+
+--- src/gallium/auxiliary/util/u_cpu_detect.c.orig	2015-07-29 21:10:43.953534000 +0000
+++ src/gallium/auxiliary/util/u_cpu_detect.c
+@@ -52,7 +52,7 @@
+ #include <machine/cpu.h>
+ #endif
+ 
+-#if defined(PIPE_OS_FREEBSD)
+#if defined(PIPE_OS_FREEBSD) || defined(PIPE_OS_DRAGONFLY)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__math.h
@@ -1,23 +1,21 @@
-$NetBSD: patch-src_gallium_auxiliary_util_u__math.h,v 1.2 2015/05/11 21:33:58 tnn Exp $
+$NetBSD: patch-src_gallium_auxiliary_util_u__math.h,v 1.3 2015/09/11 00:03:36 tnn Exp $

 The C99 "restrict" keyword is not valid in C++, but most compilers will
 understand __restrict.

--- src/gallium/auxiliary/util/u_math.h.orig   2015-03-28 18:20:39.000000000 +0000
+--- src/gallium/auxiliary/util/u_math.h.orig	2015-09-10 17:40:30.000000000 +0000
 +++ src/gallium/auxiliary/util/u_math.h
-@@ -528,7 +528,10 @@ unsigned ffs( unsigned u )
- 
-    return i;
- }
-#elif defined(__MINGW32__) || defined(PIPE_OS_ANDROID)
+@@ -401,6 +401,9 @@ unsigned ffs( unsigned u )
+ #if defined(__MINGW32__) || defined(PIPE_OS_ANDROID) || \
+     defined(HAVE___BUILTIN_FFSLL)
+ #define ffsll __builtin_ffsll
 +#elif defined(__NetBSD__)
 +#include <sys/bitops.h>
 +#define ffsll ffs64
-+#elif defined(__GNUC__)
- #define ffs __builtin_ffs
- #define ffsll __builtin_ffsll
 #endif
-@@ -821,6 +824,11 @@ util_bswap16(uint16_t n)
+ 
+ #endif /* FFSLL_DEFINED */
+@@ -690,6 +693,11 @@ util_bswap16(uint16_t n)
           (n << 8);
 }
 
@@ -29,7 +27,7 @@ understand __restrict.
 static INLINE void*
 util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t n)
 {
-@@ -839,6 +847,11 @@ util_memcpy_cpu_to_le32(void * restrict 
+@@ -708,6 +716,11 @@ util_memcpy_cpu_to_le32(void * restrict 
 #endif
 }
 
--- a/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h
+++ b/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.5 2015/04/25 11:19:18 tnn Exp $
-
-Fix endian detection on NetBSD.
-
--- src/gallium/include/pipe/p_config.h.orig	2015-01-17 14:53:45.000000000 +0000
-+++ src/gallium/include/pipe/p_config.h
-@@ -157,7 +157,7 @@
- # define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
-#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- #include <sys/types.h>
- #include <machine/endian.h>
- 
--- a/graphics/MesaLib/patches/patch-src_glx_glxclient.h
+++ b/graphics/MesaLib/patches/patch-src_glx_glxclient.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_glx_glxclient.h,v 1.1 2015/09/11 16:27:30 tnn Exp $
+
+NetBSD only supports zero-initialized initial-exec tls variables in conjuction
+with dlopen(3) at the moment.
+
+--- src/glx/glxclient.h.orig	2015-09-02 17:06:23.000000000 +0000
+++ src/glx/glxclient.h
+@@ -635,7 +635,11 @@ extern void __glXSetCurrentContext(struc
+ extern __thread void *__glX_tls_Context
+    __attribute__ ((tls_model("initial-exec")));
+ 
+#if defined(__NetBSD__)
+#  define __glXGetCurrentContext() (likely(__glX_tls_Context) ? __glX_tls_Context : (void*)&dummyContext)
+#else
+ #  define __glXGetCurrentContext() __glX_tls_Context
+#endif
+ 
+ # else
+ 
--- a/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c
+++ b/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_glx_glxcurrent.c,v 1.1 2015/09/11 16:27:30 tnn Exp $
+
+NetBSD only supports zero-initialized initial-exec tls variables in conjuction
+with dlopen(3) at the moment.
+
+--- src/glx/glxcurrent.c.orig	2015-09-02 17:06:23.000000000 +0000
+++ src/glx/glxcurrent.c
+@@ -77,7 +77,11 @@ _X_HIDDEN pthread_mutex_t __glXmutex = P
+  * \c __glXGetCurrentContext can be implemented as trivial macro.
+  */
+ __thread void *__glX_tls_Context __attribute__ ((tls_model("initial-exec")))
+#if defined(__NetBSD__)
+   = NULL; /* non-zero initializers not supported with dlopen */
+#else
+    = &dummyContext;
+#endif
+ 
+ _X_HIDDEN void
+ __glXSetCurrentContext(struct glx_context * c)
--- a/graphics/MesaLib/patches/patch-src_loader_Makefile.in
+++ b/graphics/MesaLib/patches/patch-src_loader_Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_loader_Makefile.in,v 1.1 2015/09/11 00:03:36 tnn Exp $
+
+FreeBSD & DragonFly support for libdevq.
+
+--- src/loader/Makefile.in.orig	2015-08-12 00:50:19.110973000 +0000
+++ src/loader/Makefile.in
+@@ -319,6 +319,8 @@ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@
+ LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@
+LIBDEVQ_CFLAGS = @LIBDEVQ_CFLAGS@
+LIBDEVQ_LIBS = @LIBDEVQ_LIBS@
+ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
+ LIBDRM_LIBS = @LIBDRM_LIBS@
+ LIBOBJS = @LIBOBJS@
+@@ -508,7 +510,7 @@ EXTRA_DIST = SConscript
+ noinst_LTLIBRARIES = libloader.la
+ libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \
+ 	-I$(top_srcdir)/src $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) \
+-	$(am__append_1) $(am__append_3) $(am__append_4)
+	$(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_3) $(am__append_4)
+ libloader_la_SOURCES = $(LOADER_C_FILES)
+ libloader_la_LIBADD = $(am__append_2) $(am__append_5)
+ all: all-am
--- a/graphics/MesaLib/patches/patch-src_loader_loader.c
+++ b/graphics/MesaLib/patches/patch-src_loader_loader.c
@@ -0,0 +1,82 @@
+$NetBSD: patch-src_loader_loader.c,v 1.1 2015/09/11 00:03:36 tnn Exp $
+
+FreeBSD & DragonFly support for libdevq. From FreeBSD ports(?)
+
+--- src/loader/loader.c.orig	2015-07-26 13:32:59.000000000 +0000
+++ src/loader/loader.c
+@@ -68,7 +68,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+-#ifdef HAVE_LIBUDEV
+#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ)
+ #include <assert.h>
+ #include <dlfcn.h>
+ #include <fcntl.h>
+@@ -501,6 +501,53 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
+ }
+ #endif
+ 
+#if defined(HAVE_LIBDEVQ)
+#include <libdevq.h>
+
+static void *devq_handle = NULL;
+
+static void *
+devq_dlopen_handle(void)
+{
+   if (!devq_handle) {
+      devq_handle = dlopen("libdevq.so.0", RTLD_LOCAL | RTLD_LAZY);
+   }
+
+   return devq_handle;
+}
+
+static void *
+asserted_dlsym(void *dlopen_handle, const char *name)
+{
+   void *result = dlsym(dlopen_handle, name);
+   assert(result);
+   return result;
+}
+
+#define DEVQ_SYMBOL(ret, name, args) \
+   ret (*name) args = asserted_dlsym(devq_dlopen_handle(), #name);
+
+static int
+devq_get_pci_id_from_fd(int fd, int *vendor_id, int *chip_id)
+{
+   int ret;
+   DEVQ_SYMBOL(int, devq_device_get_pciid_from_fd,
+               (int fd, int *vendor_id, int *chip_id));
+
+   *chip_id = -1;
+
+   ret = devq_device_get_pciid_from_fd(fd, vendor_id, chip_id);
+   if (ret < 0) {
+      log_(_LOADER_WARNING, "MESA-LOADER: could not get PCI ID\n");
+      goto out;
+   }
+
+out:
+   return (*chip_id >= 0);
+}
+
+#endif
+
+ #if !defined(__NOT_HAVE_DRM_H)
+ /* for i915 */
+ #include <i915_drm.h>
+@@ -584,6 +631,12 @@ loader_get_pci_id_for_fd(int fd, int *ve
+    if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
+       return 1;
+ #endif
+
+#if HAVE_LIBDEVQ
+   if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id))
+      return 1;
+#endif
+
+ #if !defined(__NOT_HAVE_DRM_H)
+    if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
+       return 1;
--- a/graphics/MesaLib/patches/patch-src_mapi_glapi_gen_gl__gentable.py
+++ b/graphics/MesaLib/patches/patch-src_mapi_glapi_gen_gl__gentable.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mapi_glapi_gen_gl__gentable.py,v 1.1 2015/09/11 00:03:36 tnn Exp $
+
+FreeBSD support.
+
+--- src/mapi/glapi/gen/gl_gentable.py.orig	2015-07-29 21:28:50.156039000 +0000
+++ src/mapi/glapi/gen/gl_gentable.py
+@@ -42,7 +42,7 @@ header = """/* GLXEXT is the define used
+ #endif
+ 
+ #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
+-	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__))
+	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__))
+ #define USE_BACKTRACE
+ #endif
+ 
--- a/graphics/MesaLib/patches/patch-src_mapi_u__current.c
+++ b/graphics/MesaLib/patches/patch-src_mapi_u__current.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_mapi_u__current.c,v 1.1 2015/09/11 16:27:30 tnn Exp $
+
+NetBSD only supports zero-initialized initial-exec tls variables in conjuction
+with dlopen(3) at the moment.
+
+--- src/mapi/u_current.c.orig	2015-09-02 17:06:23.000000000 +0000
+++ src/mapi/u_current.c
+@@ -101,7 +101,11 @@ extern void (*__glapi_noop_table[])(void
+ 
+ __thread struct mapi_table *u_current_table
+     __attribute__((tls_model("initial-exec")))
+#if defined(__NetBSD__)
+    = NULL; /* non-zero initializers not supported with dlopen */
+#else
+     = (struct mapi_table *) table_noop_array;
+#endif
+ 
+ __thread void *u_current_context
+     __attribute__((tls_model("initial-exec")));
+@@ -283,7 +287,11 @@ struct mapi_table *
+ u_current_get_table_internal(void)
+ {
+ #if defined(GLX_USE_TLS)
+#  if defined(__NetBSD__)
+   return (likely(u_current_table) ? u_current_table : (struct mapi_table *) table_noop_array);
+#  else
+    return u_current_table;
+#  endif
+ #else
+    if (ThreadSafe)
+       return (struct mapi_table *) tss_get(u_current_table_tsd);
--- a/graphics/MesaLib/patches/patch-src_mapi_u__current.h
+++ b/graphics/MesaLib/patches/patch-src_mapi_u__current.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mapi_u__current.h,v 1.1 2015/09/11 16:27:30 tnn Exp $
+
+NetBSD only supports zero-initialized initial-exec tls variables in conjuction
+with dlopen(3) at the moment.
+
+--- src/mapi/u_current.h.orig	2015-09-02 17:06:23.000000000 +0000
+++ src/mapi/u_current.h
+@@ -68,7 +68,7 @@ u_current_get_context_internal(void);
+ static inline const struct mapi_table *
+ u_current_get_table(void)
+ {
+-#ifdef GLX_USE_TLS
+#if defined(GLX_USE_TLS) && !defined(__NetBSD__)
+    return u_current_table;
+ #else
+    return (likely(u_current_table) ?
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_Makefile.in
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_mesa_drivers_dri_Makefile.in,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_mesa_drivers_dri_Makefile.in,v 1.2 2015/09/11 00:03:36 tnn Exp $

 DRI drivers need explicit linkage to glapi. FDO bug 57702. We only need to do
 this for the "mega" drivers since that's where final linking takes place.

--- src/mesa/drivers/dri/Makefile.in.orig	2015-03-28 18:43:41.000000000 +0000
+--- src/mesa/drivers/dri/Makefile.in.orig	2015-07-04 11:11:08.000000000 +0000
 +++ src/mesa/drivers/dri/Makefile.in
-@@ -581,6 +581,7 @@ mesa_dri_drivers_la_LIBADD = \
-         common/libdricommon.la \
+@@ -583,6 +583,7 @@ mesa_dri_drivers_la_LIBADD = \
+         common/libxmlconfig.la \
         $(MEGADRIVERS_DEPS) \
         $(DRI_LIB_DEPS) \
 +         $(top_srcdir)/src/mapi/shared-glapi/libglapi.la \
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_xmlconfig.c
@@ -1,15 +1,24 @@
-$NetBSD: patch-src_mesa_drivers_dri_common_xmlconfig.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_mesa_drivers_dri_common_xmlconfig.c,v 1.2 2015/09/11 00:03:36 tnn Exp $

-Fix broken ifdef.
+PR pkg/50202.

--- src/mesa/drivers/dri/common/xmlconfig.c.orig	2015-03-28 18:20:39.000000000 +0000
+--- src/mesa/drivers/dri/common/xmlconfig.c.orig	2015-07-14 18:10:47.000000000 +0000
 +++ src/mesa/drivers/dri/common/xmlconfig.c
-@@ -53,7 +53,7 @@ extern char *program_invocation_name, *p
+@@ -50,12 +50,17 @@ extern char *program_invocation_name, *p
+ #    define GET_PROGRAM_NAME() program_invocation_short_name
+ #elif defined(__CYGWIN__)
+ #    define GET_PROGRAM_NAME() program_invocation_short_name
+/*
+ #elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)
+ #    include <osreldate.h>
+ #    if (__FreeBSD_version >= 440000)
 #        include <stdlib.h>
 #        define GET_PROGRAM_NAME() getprogname()
 #    endif
-#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
-+#elif defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
+*/
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#    include <stdlib.h>
+#    define GET_PROGRAM_NAME() getprogname()
+ #elif defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
 #    include <stdlib.h>
 #    define GET_PROGRAM_NAME() getprogname()
- #elif defined(__APPLE__)
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__context.h,v 1.1 2015/09/11 12:38:27 tnn Exp $
+
+Fix build on NetBSD 5.x.
+The ALIGN macro in Mesa conflicts with machine/param.h. It is easier to
+avoid it than attempting to fix the include order here.
+
+--- src/mesa/drivers/dri/i965/brw_context.h.orig	2015-09-10 17:40:31.000000000 +0000
+++ src/mesa/drivers/dri/i965/brw_context.h
+@@ -1912,7 +1912,11 @@ brw_compute_program(struct gl_compute_pr
+ static inline int
+ brw_register_blocks(int reg_count)
+ {
+#if 0
+    return ALIGN(reg_count, 16) / 16 - 1;
+#else
+   return (((reg_count + 0xF) & ~0xF) >> 4) - 1;
+#endif
+ }
+ 
+ static inline uint32_t
--- a/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_mesa_main_compiler.h,v 1.4 2015/04/25 11:19:18 tnn Exp $
-
-i386 FPU control word defaults.
-
--- src/mesa/main/compiler.h.orig	2015-03-28 18:20:39.000000000 +0000
-+++ src/mesa/main/compiler.h
-@@ -285,7 +285,13 @@ static inline GLuint CPU_TO_LE32(GLuint 
- /* Hardware default: All exceptions masked, extended double precision,
-  * round to nearest (IEEE compliant):
-  */
-+#if defined(__NetBSD__)
-+#define DEFAULT_X86_FPU		0x127f	/* __NetBSD_NPXCW__ */
-+#elif defined(__FreeBSD__)
-+#define DEFAULT_X86_FPU		0x1272	/* __FreeBSD_NPXCW__ */
-+#else
- #define DEFAULT_X86_FPU		0x037f
-+#endif
- /* All exceptions masked, single precision, round to nearest:
-  */
- #define FAST_X86_FPU		0x003f
--- a/graphics/MesaLib/patches/patch-src_mesa_tnl_t__pipeline.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_tnl_t__pipeline.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mesa_tnl_t__pipeline.c,v 1.1 2015/09/11 00:03:36 tnn Exp $
+
+i386 FPU control word defaults.
+
+--- src/mesa/tnl/t_pipeline.c.orig	2015-09-09 17:55:36.000000000 +0000
+++ src/mesa/tnl/t_pipeline.c
+@@ -132,7 +132,13 @@ static GLuint check_output_changes( stru
+ /* Hardware default: All exceptions masked, extended double precision,
+  * round to nearest (IEEE compliant):
+  */
+#if defined(__NetBSD__)
+#define DEFAULT_X86_FPU	0x127f  /* __NetBSD_NPXCW__ */
+#elif defined(__FreeBSD__)
+#define DEFAULT_X86_FPU	0x1272  /* __FreeBSD_NPXCW__ */
+#else
+ #define DEFAULT_X86_FPU		0x037f
+#endif
+ /* All exceptions masked, single precision, round to nearest:
+  */
+ #define FAST_X86_FPU		0x003f
--- a/graphics/MesaLib/patches/patch-src_mesa_x86_common__x86.c
+++ b/graphics/MesaLib/patches/patch-src_mesa_x86_common__x86.c
@@ -1,15 +1,24 @@
-$NetBSD: patch-src_mesa_x86_common__x86.c,v 1.1 2015/04/25 11:19:18 tnn Exp $
+$NetBSD: patch-src_mesa_x86_common__x86.c,v 1.2 2015/09/11 00:03:36 tnn Exp $

-Treat NetBSD like OpenBSD.
+DragonFly support.

--- src/mesa/x86/common_x86.c.orig	2015-03-28 18:20:39.000000000 +0000
+--- src/mesa/x86/common_x86.c.orig	2015-07-14 18:10:47.000000000 +0000
 +++ src/mesa/x86/common_x86.c
-@@ -42,7 +42,7 @@
+@@ -38,7 +38,7 @@
+ #if defined(USE_SSE_ASM) && defined(__linux__)
+ #include <linux/version.h>
+ #endif
+-#if defined(USE_SSE_ASM) && defined(__FreeBSD__)
+#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__DragonFly__))
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
-#if defined(USE_SSE_ASM) && defined(__OpenBSD__)
-+#if defined(USE_SSE_ASM) && (defined(__OpenBSD__) || defined(__NetBSD__))
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <machine/cpu.h>
+@@ -128,7 +128,7 @@ static LONG WINAPI ExceptionFilter(LPEXC
+  */
+ void _mesa_check_os_sse_support( void )
+ {
+-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+    {
+       int ret, enabled;
+       unsigned int len;
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/10/09 14:06:34 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/08/18 07:31:00 wiz Exp $

 DISTNAME=	aalib-1.4rc5
 PKGNAME=	${DISTNAME:S/rc5/.0.5/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}

--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2013/10/17 15:36:34 roy Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2015/08/18 07:31:00 wiz Exp $

 BUILDLINK_TREE+=	aalib

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	aalib
 AALIB_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.aalib+=	aalib>=1.4.0.4
-BUILDLINK_ABI_DEPENDS.aalib+=	aalib>=1.4.0.5nb3
+BUILDLINK_ABI_DEPENDS.aalib+=	aalib>=1.4.0.5nb4
 BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib

 pkgbase := aalib
--- a/graphics/babl/Makefile
+++ b/graphics/babl/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2014/08/19 10:42:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/08/14 18:27:06 wiz Exp $

-DISTNAME=	babl-0.1.10
+DISTNAME=	babl_0.1.12.orig
+PKGNAME=	babl-0.1.12
 CATEGORIES=	graphics
-MASTER_SITES=	http://ftp.gwdg.de/pub/misc/grafik/gimp/babl/${PKGVERSION_NOREV:R}/
+MASTER_SITES=	https://launchpad.net/ubuntu/+archive/primary/+files/
+# https://git.gnome.org/browse/babl/
 EXTRACT_SUFX=	.tar.bz2

 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,6 +12,8 @@ HOMEPAGE=	http://gegl.org/babl/
 COMMENT=	Dynamic pixel conversion library
 LICENSE=	gnu-gpl-v3

+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
 # NOTE: to build documentation (which requires additional dependencies)
 #	define BUILD_DOCS in MAKE_ENV.

--- a/graphics/babl/PLIST
+++ b/graphics/babl/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2012/05/07 08:33:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/08/14 18:25:40 wiz Exp $
+include/babl-0.1/babl/babl-introspect.h
 include/babl-0.1/babl/babl-macros.h
 include/babl-0.1/babl/babl-types.h
 include/babl-0.1/babl/babl-version.h
 include/babl-0.1/babl/babl.h
 lib/babl-0.1/CIE.la
+lib/babl-0.1/HSL.la
+lib/babl-0.1/HSV.la
 lib/babl-0.1/cairo.la
 lib/babl-0.1/fast-float.la
 lib/babl-0.1/float.la
@@ -11,7 +14,13 @@ lib/babl-0.1/gegl-fixups.la
 lib/babl-0.1/gggl-lies.la
 lib/babl-0.1/gggl.la
 lib/babl-0.1/gimp-8bit.la
+lib/babl-0.1/grey.la
 lib/babl-0.1/naive-CMYK.la
-lib/babl-0.1/sse-fixups.la
+lib/babl-0.1/simple.la
+lib/babl-0.1/sse2-float.la
+lib/babl-0.1/sse2-int16.la
+lib/babl-0.1/sse2-int8.la
+lib/babl-0.1/two-table.la
+lib/babl-0.1/ycbcr.la
 lib/libbabl-0.1.la
 lib/pkgconfig/babl.pc
--- a/graphics/babl/distinfo
+++ b/graphics/babl/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/05/25 07:38:30 jdc Exp $
+$NetBSD: distinfo,v 1.12 2015/08/14 18:25:40 wiz Exp $

-SHA1 (babl-0.1.10.tar.bz2) = ee60089e8e9d9390e730d3ae5e41074549928b7a
-RMD160 (babl-0.1.10.tar.bz2) = a18b57be692cf5fec8b6649609d5d8ddb9a97f87
-Size (babl-0.1.10.tar.bz2) = 449537 bytes
-SHA1 (patch-ab) = 1fc18c1767277f92c0c65a1e27a72e4636eb406b
-SHA1 (patch-babl_babl-fish-reference.c) = 967239a45870e1045ef6c9445119fae0e12ab8ca
-SHA1 (patch-babl_babl-palette.c) = 84f0b803bd6a68db24774e937ce7a99cb7696b38
+SHA1 (babl_0.1.12.orig.tar.bz2) = b9a811d9d05717d66bc107a18447fbd74cff7eea
+RMD160 (babl_0.1.12.orig.tar.bz2) = 4429fc997a34c1e3f171c3097486a90437380ab5
+Size (babl_0.1.12.orig.tar.bz2) = 642234 bytes
--- a/graphics/babl/patches/patch-ab
+++ b/graphics/babl/patches/patch-ab
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/08/19 17:51:14 bjs Exp $
-
-Only build documentation if BUILD_DOCS is defined in MAKE_ENV.
-
--- Makefile.am.orig	2008-06-12 17:05:58.000000000 -0400
-+++ Makefile.am
-@@ -3,8 +3,11 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2
- SUBDIRS = \
- 	babl		\
- 	extensions	\
-	tests		\
-+	tests 		
-+ifdef BUILD_DOCS
-+SUBDIRS+= \
- 	docs
-+endif
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = babl.pc
--- a/graphics/babl/patches/patch-babl_babl-fish-reference.c
+++ b/graphics/babl/patches/patch-babl_babl-fish-reference.c
@@ -1,24 +0,0 @@
-$NetBSD: patch-babl_babl-fish-reference.c,v 1.1 2012/05/25 07:37:21 jdc Exp $
-
-Fix a segmentation fault when generating documentation.  See:
-
-  https://bugzilla.gnome.org/show_bug.cgi?id=676491
-
--- babl/babl-fish-reference.c.dist	2012-03-18 15:51:42.000000000 +0000
-+++ babl/babl-fish-reference.c	2012-05-21 12:12:38.000000000 +0000
-@@ -137,10 +137,11 @@
-             }
-         }
- 
-      babl_process (
-        assert_conversion_find (src_img->type[0], dst_img->type[0]),
-        src_img, dst_img,
-        n);
-+      if (dst_img->data[0] != NULL)
-+        babl_process (
-+          assert_conversion_find (src_img->type[0], dst_img->type[0]),
-+          src_img, dst_img,
-+          n);
-       src_img->data[0] += src_img->type[0]->bits / 8;
-     }
-   babl_free (src_img);
--- a/graphics/babl/patches/patch-babl_babl-palette.c
+++ b/graphics/babl/patches/patch-babl_babl-palette.c
@@ -1,15 +0,0 @@
-$NetBSD: patch-babl_babl-palette.c,v 1.1 2012/05/07 08:33:27 adam Exp $
-
-Include standard limits.h instead of values.h
-
--- babl/babl-palette.c.orig	2012-05-07 07:29:12.000000000 +0000
-+++ babl/babl-palette.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-#include <values.h>
-+#include <limits.h>
- #include <assert.h>
- #include "config.h"
- #include "babl-internal.h"
--- a/graphics/camediaplay/Makefile
+++ b/graphics/camediaplay/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2015/03/13 17:45:50 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2015/08/18 07:31:09 wiz Exp $

 DISTNAME=	camediaplay-20010211
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/

--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2015/04/25 14:23:08 tnn Exp $
+# $NetBSD: Makefile,v 1.81 2015/08/07 11:20:34 jaapb Exp $

 VERSION=		4.0.1
 PKGNAME=		camlimages-${VERSION}
-PKGREVISION=		43
+PKGREVISION=		45
 CATEGORIES=		graphics
 MASTER_SITES=		https://bitbucket.org/camlspotter/camlimages/get/
 DISTNAME=		v${VERSION}
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2015/04/25 14:23:08 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2015/08/31 10:59:04 jperkin Exp $

-DISTNAME=	clutter-1.20.0
-PKGREVISION=	1
+DISTNAME=	clutter-1.22.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/clutter/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -23,16 +22,23 @@ PKGCONFIG_OVERRIDE+=	clutter/clutter.pc.in

 TEST_TARGET=	check

+# Broken compat symlinks which fail "test -f" check in mk/plist/shlib-dylib.awk
+# so they end up missing from PLIST.  We don't need them so just remove.
+.if ${OPSYS} == "Darwin"
+post-install:
+	rm -f ${DESTDIR}${PREFIX}/lib/libclutter-glx-1.0.so*
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.atk+=	atk>=2.5.3
 .include "../../devel/atk/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.37.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.39.0
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.30.0
 .include "../../devel/pango/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.12.0
+BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.14.0
 .include "../../graphics/cairo-gobject/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cogl+=	cogl>=1.17.5
+BUILDLINK_API_DEPENDS.cogl+=	cogl>=1.20.0
 .include "../../graphics/cogl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.json-glib+=	json-glib>=0.12.0
 .include "../../textproc/json-glib/buildlink3.mk"
--- a/graphics/clutter/PLIST
+++ b/graphics/clutter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/01/17 15:19:04 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/08/31 10:59:04 jperkin Exp $
 include/clutter-1.0/cally/cally-actor.h
 include/clutter-1.0/cally/cally-clone.h
 include/clutter-1.0/cally/cally-factory.h
@@ -65,7 +65,6 @@ include/clutter-1.0/clutter/clutter-main.h
 include/clutter-1.0/clutter/clutter-marshal.h
 include/clutter-1.0/clutter/clutter-model.h
 include/clutter-1.0/clutter/clutter-offscreen-effect.h
-${PLIST.osx}include/clutter-1.0/clutter/clutter-osx.h
 include/clutter-1.0/clutter/clutter-page-turn-effect.h
 include/clutter-1.0/clutter/clutter-paint-node.h
 include/clutter-1.0/clutter/clutter-paint-nodes.h
@@ -134,6 +133,7 @@ include/clutter-1.0/clutter/deprecated/clutter-timeout-pool.h
 include/clutter-1.0/clutter/deprecated/clutter-util.h
 ${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h
 ${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx.h
+${PLIST.osx}include/clutter-1.0/clutter/osx/clutter-osx.h
 ${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h
 ${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11.h
 ${PLIST.introspection}lib/girepository-1.0/Cally-1.0.typelib
@@ -283,6 +283,7 @@ share/gtk-doc/html/clutter/ch10.html
 share/gtk-doc/html/clutter/ch11.html
 share/gtk-doc/html/clutter/ch12.html
 share/gtk-doc/html/clutter/clutter-Base-geometric-types.html
+share/gtk-doc/html/clutter/clutter-Cairo-integration.html
 share/gtk-doc/html/clutter/clutter-ClutterGLXTexturePixmap.html
 share/gtk-doc/html/clutter/clutter-ClutterWaylandSurface.html
 share/gtk-doc/html/clutter/clutter-ClutterX11TexturePixmap.html
@@ -306,6 +307,7 @@ share/gtk-doc/html/clutter/clutter-Wayland-compositor-specific-support.html
 share/gtk-doc/html/clutter/clutter-Wayland-specific-support.html
 share/gtk-doc/html/clutter/clutter-Win32-Specific-Support.html
 share/gtk-doc/html/clutter/clutter-X11-Specific-Support.html
+share/gtk-doc/html/clutter/clutter-clutter-mir.html
 share/gtk-doc/html/clutter/clutter-overview.html
 share/gtk-doc/html/clutter/clutter.devhelp2
 share/gtk-doc/html/clutter/clutteranimation.html
@@ -340,6 +342,10 @@ share/gtk-doc/html/clutter/ix11.html
 share/gtk-doc/html/clutter/ix12.html
 share/gtk-doc/html/clutter/ix13.html
 share/gtk-doc/html/clutter/ix14.html
+share/gtk-doc/html/clutter/ix15.html
+share/gtk-doc/html/clutter/ix16.html
+share/gtk-doc/html/clutter/ix17.html
+share/gtk-doc/html/clutter/ix18.html
 share/gtk-doc/html/clutter/left-insensitive.png
 share/gtk-doc/html/clutter/left.png
 share/gtk-doc/html/clutter/license.html
@@ -366,6 +372,7 @@ share/locale/ast/LC_MESSAGES/clutter-1.0.mo
 share/locale/az_IR/LC_MESSAGES/clutter-1.0.mo
 share/locale/be/LC_MESSAGES/clutter-1.0.mo
 share/locale/bg/LC_MESSAGES/clutter-1.0.mo
+share/locale/bs/LC_MESSAGES/clutter-1.0.mo
 share/locale/ca/LC_MESSAGES/clutter-1.0.mo
 share/locale/ca@valencia/LC_MESSAGES/clutter-1.0.mo
 share/locale/cs/LC_MESSAGES/clutter-1.0.mo
@@ -386,6 +393,7 @@ share/locale/hu/LC_MESSAGES/clutter-1.0.mo
 share/locale/id/LC_MESSAGES/clutter-1.0.mo
 share/locale/it/LC_MESSAGES/clutter-1.0.mo
 share/locale/ja/LC_MESSAGES/clutter-1.0.mo
+share/locale/kk/LC_MESSAGES/clutter-1.0.mo
 share/locale/km/LC_MESSAGES/clutter-1.0.mo
 share/locale/kn/LC_MESSAGES/clutter-1.0.mo
 share/locale/ko/LC_MESSAGES/clutter-1.0.mo
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2015/01/17 15:19:04 prlw1 Exp $
+$NetBSD: distinfo,v 1.22 2015/07/26 23:25:47 wiz Exp $

-SHA1 (clutter-1.20.0.tar.xz) = 9939b90268e44c5500f44f3b11665eafabe8193e
-RMD160 (clutter-1.20.0.tar.xz) = 58fa13398cf1affdc1a4c256dcf791fcea2e4160
-Size (clutter-1.20.0.tar.xz) = 5237780 bytes
+SHA1 (clutter-1.22.2.tar.xz) = 2125b4d8bc661cb37d02ed2237d32ad346f2a887
+RMD160 (clutter-1.22.2.tar.xz) = e0bc116323a059eb5c525934b6871f2b6ede8710
+Size (clutter-1.22.2.tar.xz) = 5304752 bytes
--- a/graphics/clutter/options.mk
+++ b/graphics/clutter/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2014/01/31 11:21:42 obache Exp $
+# $NetBSD: options.mk,v 1.9 2015/08/31 10:59:04 jperkin Exp $
 #

 PKG_OPTIONS_VAR=	PKG_OPTIONS.clutter
@@ -19,6 +19,10 @@ CONFIGURE_ARGS+=	--enable-introspection=yes
 CONFIGURE_ARGS+=	--enable-introspection=no
 .endif

+.if ${OPSYS} == "Darwin"
+PLIST.osx=		yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 PLIST.x11=		yes
 CONFIGURE_ARGS+=	--enable-x11-backend
@@ -34,9 +38,7 @@ BUILDLINK_API_DEPENDS.libXcomposite+=	libXcomposite>=0.4
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
-.include "../../mk/bsd.prefs.mk"
-.  if ${OPSYS} == Darwin
-PLIST.osx=		yes
+.  if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-quartz-backend
 .  endif
 .endif
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/04/25 14:23:08 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2015/08/25 07:21:00 richard Exp $

-DISTNAME=	cogl-1.18.2
-PKGREVISION=	2
+DISTNAME=	cogl-1.20.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/cogl/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -17,7 +16,7 @@ CONFLICTS+=	clutter<1.8

 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake gsed pkg-config msgfmt
 USE_PKGLOCALEDIR=	yes

 PKGCONFIG_OVERRIDE+=	cogl-gles2/cogl-gles2-experimental.pc.in
--- a/graphics/cogl/distinfo
+++ b/graphics/cogl/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/01/17 14:28:51 prlw1 Exp $
+$NetBSD: distinfo,v 1.10 2015/08/25 07:21:00 richard Exp $

-SHA1 (cogl-1.18.2.tar.xz) = 40be1ceb45701d27d1e506efbbbdea8a06daf354
-RMD160 (cogl-1.18.2.tar.xz) = db7ddf172d5d1290fab1e003fad1b024c415eec7
-Size (cogl-1.18.2.tar.xz) = 1635384 bytes
+SHA1 (cogl-1.20.0.tar.xz) = 46a0bfca30c440ad4b6a7b07ed7aa3e643d57401
+RMD160 (cogl-1.20.0.tar.xz) = 271518c1b07eddb2b117ba4c3ef2770ac28f4bb3
+Size (cogl-1.20.0.tar.xz) = 1669620 bytes
 SHA1 (patch-cogl-winsys-cogl-winsys-glx.c) = 52be226fb3c62a3275ebec470597937e0b017f96
 SHA1 (patch-cogl_driver_gl_gl_cogl-driver-gl.c) = 41d0010a6e2a6a1fb03b6fb23f34db59cb867e14
+SHA1 (patch-configure) = aee31057c06af64ec04bcd1b5750ed9a62658661
+SHA1 (patch-tests_unit_Makefile.in) = bd06a307637ca9746c8168926796031fd2b24850
--- a/graphics/cogl/patches/patch-configure
+++ b/graphics/cogl/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2015/07/25 15:52:25 prlw1 Exp $
+
+Find native X libGL.so.2 as well as modular X libGL.so.1.
+https://bugzilla.gnome.org/show_bug.cgi?id=752864
+
+--- configure.orig	2015-02-23 19:46:01.000000000 +0000
+++ configure
+@@ -24239,7 +24239,7 @@ fi
+ 
+ 
+ fi
+-                COGL_GL_LIBNAME="libGL.so.1"
+                COGL_GL_LIBNAME="libGL.so"
+ 
+ fi
+ 
--- a/graphics/cogl/patches/patch-tests_unit_Makefile.in
+++ b/graphics/cogl/patches/patch-tests_unit_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_unit_Makefile.in,v 1.1 2015/08/25 07:21:00 richard Exp $
+
+* The keyword '.' is an alias for 'source', and all Bourne compatible
+* shells including bash, AT&T ksh, and pdksh understand '.'
+
+--- tests/unit/Makefile.in.orig	2014-12-01 07:18:23.025351870 +0000
+++ tests/unit/Makefile.in
+@@ -788,7 +788,7 @@ wrappers: stamp-test-unit
+ 	@true
+ stamp-test-unit: Makefile test-unit$(EXEEXT)
+ 	@mkdir -p wrappers
+-	source $(top_builddir)/cogl/libcogl.la ; \
+	. $(top_builddir)/cogl/libcogl.la ; \
+ 	  $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \
+ 	  grep '[DR] _\?unit_test_'|sed 's/.\+ [DR] _\?//' > unit-tests
+ 	@chmod +x $(top_srcdir)/tests/test-launcher.sh
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2015/06/07 14:05:58 youri Exp $
+# $NetBSD: Makefile,v 1.56 2015/09/23 11:52:15 joerg Exp $

 DISTNAME=	darktable-1.2.3
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darktable/}
 EXTRACT_SUFX=	.tar.xz
@@ -16,6 +16,7 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config bash

+CMAKE_ARGS+=	-DLENSFUN_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/lensfun
 CMAKE_ARGS+=	-DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
 CMAKE_ARGS+=	-DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
@@ -67,11 +68,12 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libinotify/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/GraphicsMagick/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/gegl/buildlink3.mk"
+.include "../../graphics/gegl0.2/buildlink3.mk"
 .include "../../graphics/lensfun/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2014/03/23 15:16:35 spz Exp $
+$NetBSD: distinfo,v 1.23 2015/09/23 11:52:15 joerg Exp $

 SHA1 (darktable-1.2.3.tar.xz) = dbd7545d1fbb5f67862f62ae39c7e6ba008d1c10
 RMD160 (darktable-1.2.3.tar.xz) = 3148a7f9063c372b3477525cacf518750c88766d
@@ -10,4 +10,5 @@ SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 8227a7180383cd4379313b07ff964bb
 SHA1 (patch-src_common_imageio__exr.hh) = 8bef7fab739dfdd0688371b08d6f31503eaf04af
 SHA1 (patch-src_common_imageio__rgbe.c) = 5c396754d6dbb7390062e78afde315ee293215d6
 SHA1 (patch-src_develop_blend.c) = de54957d16b8230e05ffd945c50b76d7a13b4936
+SHA1 (patch-src_iop_invert.c) = 6809fcab0e8201e3b773781b6a83c28cbb36b9c5
 SHA1 (patch-src_iop_lens.c) = 28b5462311f778184143152bdef4e59ee18a6a3f
--- a/graphics/darktable/patches/patch-src_iop_invert.c
+++ b/graphics/darktable/patches/patch-src_iop_invert.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_iop_invert.c,v 1.1 2015/09/23 11:52:15 joerg Exp $
+
+--- src/iop/invert.c.orig	2015-09-22 13:04:15.000000000 +0000
+++ src/iop/invert.c
+@@ -199,7 +199,7 @@ void process (struct dt_iop_module_t *se
+     const float *const m = piece->pipe->processed_maximum;
+     const int32_t film_rgb_i[3] = {m[0]*film_rgb[0]*65535, m[1]*film_rgb[1]*65535, m[2]*film_rgb[2]*65535};
+ #ifdef _OPENMP
+-    #pragma omp parallel for default(none) shared(roi_out, ivoid, ovoid, /*film_rgb_i, min, max, res*/) schedule(static)
+    #pragma omp parallel for default(none) shared(roi_out, ivoid, ovoid/*, film_rgb_i, min, max, res*/) schedule(static)
+ #endif
+     for(int j=0; j<roi_out->height; j++)
+     {
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2014/03/15 00:16:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2015/07/16 16:46:47 adam Exp $
 #
 # Changes can be found in the RCS file at
 # http://www.cybercom.net/~dcoffin/dcraw/RCS/dcraw.c,v

-DISTNAME=	dcraw-9.20
+DISTNAME=	dcraw-9.26.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cybercom.net/~dcoffin/dcraw/archive/

@@ -11,21 +11,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cybercom.net/~dcoffin/dcraw/
 COMMENT=	Raw digital camera decoder

-DIST_SUBDIR=	${PKGNAME_NOREV}
-
-USE_PKGLOCALEDIR=	yes
 WRKSRC=			${WRKDIR}/${PKGBASE}
-USE_TOOLS+=		msgfmt
+
 USE_LANGUAGES=		c
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt

 LIBS+=		-lm -ljasper -ljpeg
 CFLAGS+=	-DLOCALEDIR=\"${PREFIX}/${PKGLOCALEDIR}/locale\"

-DCRAW_MANS=		ca cs da de eo es fr hu it pl pt ru sv zh_CN zh_TW
-DCRAW_LOCALES=		ca cs da de eo es fr hu it nl pl pt ru sv zh_CN zh_TW
+DCRAW_LOCALES=		ca cs da de eo es fr hu it ja nl pl pt ro ru sv zh_CN zh_TW

 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-.for lang in ${DCRAW_MANS}
+.for lang in ${DCRAW_LOCALES}
 INSTALLATION_DIRS+=	${PKGMANDIR}/${lang}/man1
 .endfor
 .for lang in ${DCRAW_LOCALES}
@@ -37,16 +35,16 @@ BROKEN_GETTEXT_DETECTION=	yes
 .include "options.mk"

 do-build:
-	set -e; cd ${WRKSRC};						\
-	env ${MAKE_ENV} ${CC} ${CFLAGS} dcraw.c -o dcraw ${LDFLAGS} ${LIBS}; \
-	for l in ${DCRAW_LOCALES}; do					\
-		env ${MAKE_ENV} msgfmt -o dcraw_$${l}.mo dcraw_$${l}.po; \
+	set -e; cd ${WRKSRC};					\
+	${CC} ${CFLAGS} dcraw.c -o dcraw ${LDFLAGS} ${LIBS};	\
+	for l in ${DCRAW_LOCALES}; do				\
+		msgfmt -o dcraw_$${l}.mo dcraw_$${l}.po;	\
 	done;

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.for l in ${DCRAW_MANS}
+.for l in ${DCRAW_LOCALES}
 	${INSTALL_MAN} ${WRKSRC}/dcraw_${l}.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/${l}/man1/dcraw.1
 .endfor
--- a/graphics/dcraw/PLIST
+++ b/graphics/dcraw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/08/06 20:49:23 bad Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/07/16 16:46:47 adam Exp $
 bin/dcraw
 man/ca/man1/dcraw.1
 man/cs/man1/dcraw.1
@@ -9,9 +9,12 @@ man/es/man1/dcraw.1
 man/fr/man1/dcraw.1
 man/hu/man1/dcraw.1
 man/it/man1/dcraw.1
+man/ja/man1/dcraw.1
 man/man1/dcraw.1
+man/nl/man1/dcraw.1
 man/pl/man1/dcraw.1
 man/pt/man1/dcraw.1
+man/ro/man1/dcraw.1
 man/ru/man1/dcraw.1
 man/sv/man1/dcraw.1
 man/zh_CN/man1/dcraw.1
@@ -25,9 +28,11 @@ share/locale/es/LC_MESSAGES/dcraw.mo
 share/locale/fr/LC_MESSAGES/dcraw.mo
 share/locale/hu/LC_MESSAGES/dcraw.mo
 share/locale/it/LC_MESSAGES/dcraw.mo
+share/locale/ja/LC_MESSAGES/dcraw.mo
 share/locale/nl/LC_MESSAGES/dcraw.mo
 share/locale/pl/LC_MESSAGES/dcraw.mo
 share/locale/pt/LC_MESSAGES/dcraw.mo
+share/locale/ro/LC_MESSAGES/dcraw.mo
 share/locale/ru/LC_MESSAGES/dcraw.mo
 share/locale/sv/LC_MESSAGES/dcraw.mo
 share/locale/zh_CN/LC_MESSAGES/dcraw.mo
--- a/graphics/dcraw/distinfo
+++ b/graphics/dcraw/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2014/03/15 00:16:03 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2015/07/16 16:46:47 adam Exp $

-SHA1 (dcraw-9.20/dcraw-9.20.tar.gz) = 9b8ca82eaaf6582ffa0f2602e8ca705c722ea87e
-RMD160 (dcraw-9.20/dcraw-9.20.tar.gz) = 4b5722023a7ef70d887e1b5deb6a42dfdddaa112
-Size (dcraw-9.20/dcraw-9.20.tar.gz) = 171270 bytes
+SHA1 (dcraw-9.26.0.tar.gz) = f4432b673b15df8181c386bc18bb039aefafea7f
+RMD160 (dcraw-9.26.0.tar.gz) = ee3ff85aaa8fc3860450723aece31ea997ad4371
+Size (dcraw-9.26.0.tar.gz) = 190647 bytes
 SHA1 (patch-aa) = 3191ee51355a17f4d17a1b43fb1ad99918861935
--- a/graphics/deforaos-camera/Makefile
+++ b/graphics/deforaos-camera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/04/25 14:23:08 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2015/08/09 15:34:27 khorben Exp $
 #

 DISTNAME=	Camera-0.0.1
@@ -20,6 +20,7 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl

 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
 AUTO_MKDIRS=	yes

 post-install:
--- a/graphics/deforaos-icon-theme/Makefile
+++ b/graphics/deforaos-icon-theme/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2015/01/14 01:29:32 khorben Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/15 17:48:10 khorben Exp $
 #

-DISTNAME=	DeforaOS-Artwork-0.1.0
-PKGNAME=	deforaos-icon-theme-0.1.0
+DISTNAME=	DeforaOS-Artwork-0.1.1
+PKGNAME=	deforaos-icon-theme-0.1.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.defora.org/os/download/download/4344/
+MASTER_SITES=	http://www.defora.org/os/download/download/4360/

 MAINTAINER=	khorben@defora.org
-HOMEPAGE=	http://www.defora.org/os/download/download/4344/
+HOMEPAGE=	http://www.defora.org/os/project/4342/DeforaOS%20Artwork
 COMMENT=	Artwork for the DeforaOS desktop
 LICENSE=	cc-by-sa-v3.0

--- a/graphics/deforaos-icon-theme/PLIST
+++ b/graphics/deforaos-icon-theme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/01/14 01:29:32 khorben Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/08/15 17:48:10 khorben Exp $
 share/icons/DeforaOS/16x16/actions/add.png
 share/icons/DeforaOS/16x16/actions/application-exit.png
 share/icons/DeforaOS/16x16/actions/appointment-new.png
@@ -2754,3 +2754,4 @@ share/icons/DeforaOS/48x48/status/stock_dialog-warning.png
 share/icons/DeforaOS/48x48/status/stock_open.png
 share/icons/DeforaOS/48x48/status/stock_volume-mute.png
 share/icons/DeforaOS/index.theme
+share/pixmaps/DeforaOS.png
--- a/graphics/deforaos-icon-theme/distinfo
+++ b/graphics/deforaos-icon-theme/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/01/14 01:29:32 khorben Exp $
+$NetBSD: distinfo,v 1.3 2015/08/15 17:48:10 khorben Exp $

-SHA1 (DeforaOS-Artwork-0.1.0.tar.gz) = 53fa416bdb0316b32b55f18e8a8fb678ff1de22b
-RMD160 (DeforaOS-Artwork-0.1.0.tar.gz) = 3f02a942d0928f1ad868d9236505848d92ccb686
-Size (DeforaOS-Artwork-0.1.0.tar.gz) = 20970 bytes
+SHA1 (DeforaOS-Artwork-0.1.1.tar.gz) = 8be20a69994cec1c25c7f26af99c3275d6bbe153
+RMD160 (DeforaOS-Artwork-0.1.1.tar.gz) = 828c3a210b50759866cf580cf0128acace06b914
+Size (DeforaOS-Artwork-0.1.1.tar.gz) = 21081 bytes
+SHA1 (patch-Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-data_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-src_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-src_icon.sh) = 1deac2335f71e05794e9503d850f1357f2b21ab7
--- a/graphics/deforaos-icon-theme/patches/patch-src_icon.sh
+++ b/graphics/deforaos-icon-theme/patches/patch-src_icon.sh
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_icon.sh,v 1.1 2015/08/15 17:48:10 khorben Exp $
+
+Fix generating DeforaOS.png
+
+--- src/icon.sh.orig	2015-08-11 00:24:52.000000000 +0000
+++ src/icon.sh
+@@ -115,6 +115,6 @@ while [ $# -gt 0 ]; do
+ 	#create
+ 	$DEBUG $CONVERT -background none -density 300 \
+ 		"../data/DeforaOS-d-${BGCOLOR}.svg" \
+-		-resize "$size" $@ \
+		-resize "96x96" $@ \
+ 		"$OBJDIR$target"				|| return 2
+ done
--- a/graphics/digikam-kde3/distinfo
+++ b/graphics/digikam-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/04/30 22:21:41 joerg Exp $
+$NetBSD: distinfo,v 1.8 2015/09/23 11:53:00 joerg Exp $

 SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c
 SHA1 (patch-digikam_digikam_albummanager.cpp) = 49df2695fd8aae3b13257efaf07af96adac6a638
 SHA1 (patch-digikam_digikam_albumwidgetstack.h) = ee709372079cedbe0cb020caaf8aa1631376ec9d
 SHA1 (patch-digikam_imageplugins_coreplugin_sharpnesseditor_clapack_f2c.h) = 238d27ec419b87482fdaed1291b756ccab383f9a
+SHA1 (patch-digikam_utilities_cameragui_gpcamera.cpp) = 6cabcccac13abdf8029bc5a9c921c939f19f4695
--- a/graphics/digikam-kde3/patches/patch-digikam_utilities_cameragui_gpcamera.cpp
+++ b/graphics/digikam-kde3/patches/patch-digikam_utilities_cameragui_gpcamera.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-digikam_utilities_cameragui_gpcamera.cpp,v 1.1 2015/09/23 11:53:00 joerg Exp $
+
+--- digikam/utilities/cameragui/gpcamera.cpp.orig	2015-09-20 17:16:43.000000000 +0000
+++ digikam/utilities/cameragui/gpcamera.cpp
+@@ -847,6 +847,8 @@ bool GPCamera::uploadItem(const QString&
+ 
+     errorCode = gp_camera_folder_put_file(d->camera,
+                                           QFile::encodeName(folder),
+                                          QFile::encodeName(itemName),
+                                          GP_FILE_TYPE_NORMAL,
+                                           cfile,
+                                           m_status->context);
+     if (errorCode != GP_OK) 
+@@ -1108,7 +1110,9 @@ void GPCamera::getSupportedPorts(QString
+         for (int i = 0 ; i < numPorts ; i++) 
+         {
+             gp_port_info_list_get_info( list, i, &info );
+-            plist.append( info.path );
+            char *path;
+            gp_port_info_get_path(info, &path);
+            plist.append(path);
+         }
+     }
+ 
--- a/graphics/dvipng/Makefile
+++ b/graphics/dvipng/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2015/06/15 09:57:21 markd Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/30 09:57:36 ryoon Exp $

 DISTNAME=	dvipng-1.15
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvipng/} \
 		http://download.savannah.gnu.org/releases/dvipng/
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2015/04/25 14:23:09 tnn Exp $
+# $NetBSD: Makefile,v 1.79 2015/07/04 16:18:35 joerg Exp $

 DISTNAME=	dx-4.4.4
 PKGREVISION=	30
@@ -12,7 +12,6 @@ COMMENT=	Open Visualization Data Explorer
 MAKE_JOBS_SAFE=		no

 USE_LANGUAGES=		c c++
-USE_X11BASE=		yes
 USE_TOOLS+=		gmake lex yacc sh
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-javadx
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 14:10:46 asau Exp $
+# $NetBSD: Makefile,v 1.28 2015/07/04 16:18:35 joerg Exp $

 DISTNAME=	dxsamples-4.4.0
 CATEGORIES=	graphics
@@ -13,6 +13,5 @@ DEPENDS+=	dx-[0-9]*:../../graphics/dx
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake makeinfo
 CONFIGURE_ARGS+=	MAKEINFO=${TOOLS_PATH.makeinfo}
-USE_X11BASE=	yes

 .include "../../mk/bsd.pkg.mk"
--- a/graphics/elementary-xfce-icon-theme/Makefile
+++ b/graphics/elementary-xfce-icon-theme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2015/06/02 13:27:03 youri Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/26 14:59:47 youri Exp $

-GHCOMMIT=	47f947becd85583da089c0132b86011d0ecd3d60
+GHCOMMIT=	a0b2b19231c3383f77f106d9cdacb2d148519cfd
 DISTNAME=	${GHCOMMIT}
-PKGNAME=	elementary-xfce-icon-theme-0.5
+PKGNAME=	elementary-xfce-icon-theme-0.6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=shimmerproject/elementary-xfce/archive/}

@@ -17,14 +17,14 @@ USE_TOOLS+=	pax

 WRKSRC=		${WRKDIR}/elementary-xfce-${GHCOMMIT}

-EVAL_PREFIX+=	PREFIX.gtk2=gtk2+
-FILES_SUBST+=	GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
-FILES_SUBST+=	ICON_THEME_DIR="${PREFIX}/share/icons"
-INSTALL_TEMPLATES+= ../../graphics/elementary-xfce-icon-theme/files/icon-cache.tmpl
-DEINSTALL_TEMPLATES+= ../../graphics/elementary-xfce-icon-theme/files/icon-cache.tmpl
-PRINT_PLIST_AWK+=/^share\/icons\/elementary-xfce\/icon-theme.cache$$/ { next; }
-PRINT_PLIST_AWK+=/^share\/icons\/elementary-xfce-dark\/icon-theme.cache$$/ { next; }
-PRINT_PLIST_AWK+=/^share\/icons\/elemantary-xfce-darker\/icon-theme.cache$$/ { next; }
+EVAL_PREFIX+=		PREFIX.gtk2=gtk2+
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		ICON_THEME_DIR="${PREFIX}/share/icons"
+INSTALL_TEMPLATES+=	../../graphics/elementary-xfce-icon-theme/files/icon-cache.tmpl
+DEINSTALL_TEMPLATES+=	../../graphics/elementary-xfce-icon-theme/files/icon-cache.tmpl
+PRINT_PLIST_AWK+=	/^share\/icons\/elementary-xfce\/icon-theme.cache$$/ { next; }
+PRINT_PLIST_AWK+=	/^share\/icons\/elementary-xfce-dark\/icon-theme.cache$$/ { next; }
+PRINT_PLIST_AWK+=	/^share\/icons\/elemantary-xfce-darker\/icon-theme.cache$$/ { next; }

 INSTALLATION_DIRS+=	share/icons

--- a/graphics/elementary-xfce-icon-theme/PLIST
+++ b/graphics/elementary-xfce-icon-theme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:38 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/07/26 14:59:47 youri Exp $
 share/icons/elementary-xfce-dark/AUTHORS
 share/icons/elementary-xfce-dark/CONTRIBUTORS
 share/icons/elementary-xfce-dark/LICENSE
@@ -3935,6 +3935,7 @@ share/icons/elementary-xfce/apps/128/preferences-desktop-sound.svg
 share/icons/elementary-xfce/apps/128/preferences-desktop-wallpaper.svg
 share/icons/elementary-xfce/apps/128/preferences-desktop.svg
 share/icons/elementary-xfce/apps/128/preferences-sound.svg
+share/icons/elementary-xfce/apps/128/preferences-system-power.svg
 share/icons/elementary-xfce/apps/128/preferences-system-session.svg
 share/icons/elementary-xfce/apps/128/preferences-system-windows.svg
 share/icons/elementary-xfce/apps/128/preferences-wallpaper.svg
@@ -3995,6 +3996,7 @@ share/icons/elementary-xfce/apps/128/xfce-terminal.svg
 share/icons/elementary-xfce/apps/128/xfce-unknown.svg
 share/icons/elementary-xfce/apps/128/xfce4-backdrop.svg
 share/icons/elementary-xfce/apps/128/xfce4-notes-plugin.svg
+share/icons/elementary-xfce/apps/128/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/128/xfce4-session.svg
 share/icons/elementary-xfce/apps/128/xfce_unknown.svg
 share/icons/elementary-xfce/apps/128/xfwm4.svg
@@ -4279,6 +4281,7 @@ share/icons/elementary-xfce/apps/16/preferences-desktop-wallpaper.svg
 share/icons/elementary-xfce/apps/16/preferences-desktop.svg
 share/icons/elementary-xfce/apps/16/preferences-sound.svg
 share/icons/elementary-xfce/apps/16/preferences-system-network.svg
+share/icons/elementary-xfce/apps/16/preferences-system-power.svg
 share/icons/elementary-xfce/apps/16/preferences-system-session.svg
 share/icons/elementary-xfce/apps/16/preferences-system-time.svg
 share/icons/elementary-xfce/apps/16/preferences-system-windows.svg
@@ -4381,6 +4384,7 @@ share/icons/elementary-xfce/apps/16/xfce4-menueditor.svg
 share/icons/elementary-xfce/apps/16/xfce4-notes-plugin.svg
 share/icons/elementary-xfce/apps/16/xfce4-notifyd.svg
 share/icons/elementary-xfce/apps/16/xfce4-panel.svg
+share/icons/elementary-xfce/apps/16/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/16/xfce4-session.svg
 share/icons/elementary-xfce/apps/16/xfce4-workspaces.svg
 share/icons/elementary-xfce/apps/16/xfce_unknown.svg
@@ -4596,6 +4600,8 @@ share/icons/elementary-xfce/apps/22/preferences-desktop-peripherals.svg
 share/icons/elementary-xfce/apps/22/preferences-desktop-remote-desktop.svg
 share/icons/elementary-xfce/apps/22/preferences-desktop-sound.svg
 share/icons/elementary-xfce/apps/22/preferences-sound.svg
+share/icons/elementary-xfce/apps/22/preferences-system-network.svg
+share/icons/elementary-xfce/apps/22/preferences-system-power.svg
 share/icons/elementary-xfce/apps/22/preferences-system-session.svg
 share/icons/elementary-xfce/apps/22/preferences-system-time.svg
 share/icons/elementary-xfce/apps/22/preferences-system-windows.svg
@@ -4663,6 +4669,7 @@ share/icons/elementary-xfce/apps/22/xfce-system-info.svg
 share/icons/elementary-xfce/apps/22/xfce-terminal.svg
 share/icons/elementary-xfce/apps/22/xfce-unknown.svg
 share/icons/elementary-xfce/apps/22/xfce4-clock.svg
+share/icons/elementary-xfce/apps/22/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/22/xfce4-session.svg
 share/icons/elementary-xfce/apps/22/xfce_unknown.svg
 share/icons/elementary-xfce/apps/22/xfsm-hibernate.svg
@@ -4911,6 +4918,7 @@ share/icons/elementary-xfce/apps/24/locale.svg
 share/icons/elementary-xfce/apps/24/logviewer.svg
 share/icons/elementary-xfce/apps/24/lpi-translate.svg
 share/icons/elementary-xfce/apps/24/lv_icon.svg
+share/icons/elementary-xfce/apps/24/mate-disk-usage-analyzer.svg
 share/icons/elementary-xfce/apps/24/media-player-48.svg
 share/icons/elementary-xfce/apps/24/menu-editor.svg
 share/icons/elementary-xfce/apps/24/menulibre.svg
@@ -4973,6 +4981,8 @@ share/icons/elementary-xfce/apps/24/preferences-desktop-theme.svg
 share/icons/elementary-xfce/apps/24/preferences-desktop-wallpaper.svg
 share/icons/elementary-xfce/apps/24/preferences-desktop.svg
 share/icons/elementary-xfce/apps/24/preferences-sound.svg
+share/icons/elementary-xfce/apps/24/preferences-system-network.svg
+share/icons/elementary-xfce/apps/24/preferences-system-power.svg
 share/icons/elementary-xfce/apps/24/preferences-system-session.svg
 share/icons/elementary-xfce/apps/24/preferences-system-time.svg
 share/icons/elementary-xfce/apps/24/preferences-system-windows.svg
@@ -5085,6 +5095,7 @@ share/icons/elementary-xfce/apps/24/xfce4-backdrop.svg
 share/icons/elementary-xfce/apps/24/xfce4-clock.svg
 share/icons/elementary-xfce/apps/24/xfce4-menueditor.svg
 share/icons/elementary-xfce/apps/24/xfce4-notes-plugin.svg
+share/icons/elementary-xfce/apps/24/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/24/xfce4-session.svg
 share/icons/elementary-xfce/apps/24/xfce4-splash.svg
 share/icons/elementary-xfce/apps/24/xfce4-ui.svg
@@ -5344,6 +5355,7 @@ share/icons/elementary-xfce/apps/32/preferences-desktop-wallpaper.svg
 share/icons/elementary-xfce/apps/32/preferences-desktop.svg
 share/icons/elementary-xfce/apps/32/preferences-sound.svg
 share/icons/elementary-xfce/apps/32/preferences-system-network.svg
+share/icons/elementary-xfce/apps/32/preferences-system-power.svg
 share/icons/elementary-xfce/apps/32/preferences-system-services.svg
 share/icons/elementary-xfce/apps/32/preferences-system-session.svg
 share/icons/elementary-xfce/apps/32/preferences-system-time.svg
@@ -5429,6 +5441,7 @@ share/icons/elementary-xfce/apps/32/xfce4-clock.svg
 share/icons/elementary-xfce/apps/32/xfce4-dict.svg
 share/icons/elementary-xfce/apps/32/xfce4-menueditor.svg
 share/icons/elementary-xfce/apps/32/xfce4-notes-plugin.svg
+share/icons/elementary-xfce/apps/32/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/32/xfce4-session.svg
 share/icons/elementary-xfce/apps/32/xfce4-splash.svg
 share/icons/elementary-xfce/apps/32/xfce4-systray.svg
@@ -5685,6 +5698,7 @@ share/icons/elementary-xfce/apps/48/locale.svg
 share/icons/elementary-xfce/apps/48/logviewer.svg
 share/icons/elementary-xfce/apps/48/lpi-translate.svg
 share/icons/elementary-xfce/apps/48/master-pdf-editor.svg
+share/icons/elementary-xfce/apps/48/mate-disk-usage-analyzer.svg
 share/icons/elementary-xfce/apps/48/media-player-48.svg
 share/icons/elementary-xfce/apps/48/media-player-banshee.svg
 share/icons/elementary-xfce/apps/48/menu-editor.svg
@@ -5871,6 +5885,7 @@ share/icons/elementary-xfce/apps/48/xfce4-notes-plugin.svg
 share/icons/elementary-xfce/apps/48/xfce4-notifyd.svg
 share/icons/elementary-xfce/apps/48/xfce4-panel-menu.svg
 share/icons/elementary-xfce/apps/48/xfce4-panel.svg
+share/icons/elementary-xfce/apps/48/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/48/xfce4-session.svg
 share/icons/elementary-xfce/apps/48/xfce4-splash.svg
 share/icons/elementary-xfce/apps/48/xfce4-systray.svg
@@ -6078,6 +6093,7 @@ share/icons/elementary-xfce/apps/64/libreoffice-math.svg
 share/icons/elementary-xfce/apps/64/libreoffice-startcenter.svg
 share/icons/elementary-xfce/apps/64/libreoffice-writer.svg
 share/icons/elementary-xfce/apps/64/master-pdf-editor.svg
+share/icons/elementary-xfce/apps/64/mate-disk-usage-analyzer.svg
 share/icons/elementary-xfce/apps/64/menu-editor.svg
 share/icons/elementary-xfce/apps/64/menulibre.svg
 share/icons/elementary-xfce/apps/64/midori.svg
@@ -6223,6 +6239,7 @@ share/icons/elementary-xfce/apps/64/xfce4-dict.svg
 share/icons/elementary-xfce/apps/64/xfce4-menueditor.svg
 share/icons/elementary-xfce/apps/64/xfce4-notes-plugin.svg
 share/icons/elementary-xfce/apps/64/xfce4-panel.svg
+share/icons/elementary-xfce/apps/64/xfce4-power-manager-settings.svg
 share/icons/elementary-xfce/apps/64/xfce4-schedule.svg
 share/icons/elementary-xfce/apps/64/xfce4-session.svg
 share/icons/elementary-xfce/apps/64/xfce4-systray.svg
@@ -6877,6 +6894,7 @@ share/icons/elementary-xfce/devices/128/multimedia-player-apple-ipod-touch.svg
 share/icons/elementary-xfce/devices/128/multimedia-player-ipod-touch.svg
 share/icons/elementary-xfce/devices/128/phone-motorola-droid.svg
 share/icons/elementary-xfce/devices/128/phone.svg
+share/icons/elementary-xfce/devices/128/scanner.svg
 share/icons/elementary-xfce/devices/128/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/128/stock_music-library.svg
 share/icons/elementary-xfce/devices/128/system.svg
@@ -7006,7 +7024,7 @@ share/icons/elementary-xfce/devices/16/printer-remote.svg
 share/icons/elementary-xfce/devices/16/printer.svg
 share/icons/elementary-xfce/devices/16/printer1.svg
 share/icons/elementary-xfce/devices/16/printmgr.svg
-share/icons/elementary-xfce/devices/16/scanner.png
+share/icons/elementary-xfce/devices/16/scanner.svg
 share/icons/elementary-xfce/devices/16/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/16/stock_mic.svg
 share/icons/elementary-xfce/devices/16/stock_music-library.svg
@@ -7103,7 +7121,7 @@ share/icons/elementary-xfce/devices/22/multimedia-player-apple-ipod-touch.svg
 share/icons/elementary-xfce/devices/22/multimedia-player-ipod-touch.svg
 share/icons/elementary-xfce/devices/22/phone-motorola-droid.svg
 share/icons/elementary-xfce/devices/22/phone.svg
-share/icons/elementary-xfce/devices/22/scanner.png
+share/icons/elementary-xfce/devices/22/scanner.svg
 share/icons/elementary-xfce/devices/22/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/22/stock_mic.svg
 share/icons/elementary-xfce/devices/22/stock_music-library.svg
@@ -7249,7 +7267,7 @@ share/icons/elementary-xfce/devices/24/printer.svg
 share/icons/elementary-xfce/devices/24/printer1.svg
 share/icons/elementary-xfce/devices/24/printmgr.svg
 share/icons/elementary-xfce/devices/24/samba.svg
-share/icons/elementary-xfce/devices/24/scanner.png
+share/icons/elementary-xfce/devices/24/scanner.svg
 share/icons/elementary-xfce/devices/24/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/24/stock_mic.svg
 share/icons/elementary-xfce/devices/24/stock_music-library.svg
@@ -7354,7 +7372,7 @@ share/icons/elementary-xfce/devices/32/multimedia-player.svg
 share/icons/elementary-xfce/devices/32/music-player.svg
 share/icons/elementary-xfce/devices/32/phone-motorola-droid.svg
 share/icons/elementary-xfce/devices/32/phone.svg
-share/icons/elementary-xfce/devices/32/scanner.png
+share/icons/elementary-xfce/devices/32/scanner.svg
 share/icons/elementary-xfce/devices/32/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/32/stock_music-library.svg
 share/icons/elementary-xfce/devices/32/system-floppy.svg
@@ -7380,7 +7398,7 @@ share/icons/elementary-xfce/devices/48/blueman-keyboard.svg
 share/icons/elementary-xfce/devices/48/blueman-loudspeaker.svg
 share/icons/elementary-xfce/devices/48/blueman-mouse.svg
 share/icons/elementary-xfce/devices/48/blueman-pointing.svg
-share/icons/elementary-xfce/devices/48/blueman-scanner.png
+share/icons/elementary-xfce/devices/48/blueman-scanner.svg
 share/icons/elementary-xfce/devices/48/blueman-smart-phone.svg
 share/icons/elementary-xfce/devices/48/camera-photo.svg
 share/icons/elementary-xfce/devices/48/camera.svg
@@ -7523,7 +7541,7 @@ share/icons/elementary-xfce/devices/48/printer1.svg
 share/icons/elementary-xfce/devices/48/printmgr.svg
 share/icons/elementary-xfce/devices/48/processor.svg
 share/icons/elementary-xfce/devices/48/samba.svg
-share/icons/elementary-xfce/devices/48/scanner.png
+share/icons/elementary-xfce/devices/48/scanner.svg
 share/icons/elementary-xfce/devices/48/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/48/stock_mic.svg
 share/icons/elementary-xfce/devices/48/stock_music-library.svg
@@ -7639,6 +7657,7 @@ share/icons/elementary-xfce/devices/64/printer1.svg
 share/icons/elementary-xfce/devices/64/printmgr.svg
 share/icons/elementary-xfce/devices/64/processor.svg
 share/icons/elementary-xfce/devices/64/samba.svg
+share/icons/elementary-xfce/devices/64/scanner.svg
 share/icons/elementary-xfce/devices/64/stock_cell-phone.svg
 share/icons/elementary-xfce/devices/64/stock_music-library.svg
 share/icons/elementary-xfce/devices/64/stock_printers.svg
@@ -10836,7 +10855,6 @@ share/icons/elementary-xfce/mimes/96/text-x-generic-template.svg
 share/icons/elementary-xfce/mimes/96/text-x-generic.svg
 share/icons/elementary-xfce/mimes/96/text-x-gtkrc.svg
 share/icons/elementary-xfce/mimes/96/text-x-install.svg
-share/icons/elementary-xfce/mimes/96/text-x-java-source.png
 share/icons/elementary-xfce/mimes/96/text-x-java-source.svg
 share/icons/elementary-xfce/mimes/96/text-x-java.svg
 share/icons/elementary-xfce/mimes/96/text-x-javascript.svg
@@ -11630,6 +11648,7 @@ share/icons/elementary-xfce/panel/48/gpm-ups-100-charging.svg
 share/icons/elementary-xfce/panel/48/gpm-ups-100.svg
 share/icons/elementary-xfce/panel/48/gpm-ups-missing.svg
 share/icons/elementary-xfce/panel/48/nm-device-wired.svg
+share/icons/elementary-xfce/panel/48/nm-device-wireless.svg
 share/icons/elementary-xfce/panel/48/nm-no-connection.svg
 share/icons/elementary-xfce/panel/48/nm-signal-0.svg
 share/icons/elementary-xfce/panel/48/nm-signal-00.svg
@@ -11674,8 +11693,6 @@ share/icons/elementary-xfce/panel/48/xfpm-ups-missing.svg
 share/icons/elementary-xfce/places/128/bookmark-missing.svg
 share/icons/elementary-xfce/places/128/desktop.svg
 share/icons/elementary-xfce/places/128/distributor-logo.svg
-share/icons/elementary-xfce/places/128/edittrash.svg
-share/icons/elementary-xfce/places/128/emptytrash.svg
 share/icons/elementary-xfce/places/128/folder-documents.svg
 share/icons/elementary-xfce/places/128/folder-download.svg
 share/icons/elementary-xfce/places/128/folder-downloads.svg
@@ -11719,14 +11736,9 @@ share/icons/elementary-xfce/places/128/gnome-fs-nfs.svg
 share/icons/elementary-xfce/places/128/gnome-fs-share.svg
 share/icons/elementary-xfce/places/128/gnome-fs-smb.svg
 share/icons/elementary-xfce/places/128/gnome-fs-ssh.svg
-share/icons/elementary-xfce/places/128/gnome-fs-trash-empty-accept.svg
-share/icons/elementary-xfce/places/128/gnome-fs-trash-empty.svg
-share/icons/elementary-xfce/places/128/gnome-fs-trash-full.svg
 share/icons/elementary-xfce/places/128/gnome-home.svg
 share/icons/elementary-xfce/places/128/gnome-mime-x-directory-smb-share.svg
 share/icons/elementary-xfce/places/128/gnome-mime-x-directory-smb-workgroup.svg
-share/icons/elementary-xfce/places/128/gnome-stock-trash-full.svg
-share/icons/elementary-xfce/places/128/gnome-stock-trash.svg
 share/icons/elementary-xfce/places/128/gtk-directory.svg
 share/icons/elementary-xfce/places/128/gtk-network.svg
 share/icons/elementary-xfce/places/128/inode-directory.svg
@@ -11743,19 +11755,12 @@ share/icons/elementary-xfce/places/128/stock_folder.svg
 share/icons/elementary-xfce/places/128/stock_open.svg
 share/icons/elementary-xfce/places/128/stock_shared-by-me.svg
 share/icons/elementary-xfce/places/128/stock_shared-to-me.svg
-share/icons/elementary-xfce/places/128/stock_trash_full.svg
-share/icons/elementary-xfce/places/128/trashcan_empty.svg
-share/icons/elementary-xfce/places/128/trashcan_full.svg
 share/icons/elementary-xfce/places/128/user-bookmarks.svg
 share/icons/elementary-xfce/places/128/user-desktop.svg
 share/icons/elementary-xfce/places/128/user-home.svg
 share/icons/elementary-xfce/places/128/user-images.svg
 share/icons/elementary-xfce/places/128/user-pictures.svg
 share/icons/elementary-xfce/places/128/user-share.svg
-share/icons/elementary-xfce/places/128/user-trash-full.svg
-share/icons/elementary-xfce/places/128/user-trash.svg
-share/icons/elementary-xfce/places/128/xfce-trash_empty.svg
-share/icons/elementary-xfce/places/128/xfce-trash_full.svg
 share/icons/elementary-xfce/places/16/application-x-gnome-saved-search.svg
 share/icons/elementary-xfce/places/16/bookmark-missing.svg
 share/icons/elementary-xfce/places/16/desktop.svg
@@ -11779,6 +11784,7 @@ share/icons/elementary-xfce/places/16/folder-remote-smb.svg
 share/icons/elementary-xfce/places/16/folder-remote-ssh.svg
 share/icons/elementary-xfce/places/16/folder-remote.svg
 share/icons/elementary-xfce/places/16/folder-saved-search.svg
+share/icons/elementary-xfce/places/16/folder-tag.svg
 share/icons/elementary-xfce/places/16/folder-templates.svg
 share/icons/elementary-xfce/places/16/folder-video.svg
 share/icons/elementary-xfce/places/16/folder-videos.svg
@@ -11817,7 +11823,9 @@ share/icons/elementary-xfce/places/16/gtk-directory.svg
 share/icons/elementary-xfce/places/16/gtk-network.svg
 share/icons/elementary-xfce/places/16/inode-directory.svg
 share/icons/elementary-xfce/places/16/internet-radio.svg
+share/icons/elementary-xfce/places/16/library-audiobook.svg
 share/icons/elementary-xfce/places/16/library-music.svg
+share/icons/elementary-xfce/places/16/library-places.svg
 share/icons/elementary-xfce/places/16/library-podcast.svg
 share/icons/elementary-xfce/places/16/mail-inbox.svg
 share/icons/elementary-xfce/places/16/mail-mailbox.svg
@@ -11829,6 +11837,10 @@ share/icons/elementary-xfce/places/16/network.svg
 share/icons/elementary-xfce/places/16/network_fs.svg
 share/icons/elementary-xfce/places/16/network_local.svg
 share/icons/elementary-xfce/places/16/other-desktop.svg
+share/icons/elementary-xfce/places/16/playlist-automatic.svg
+share/icons/elementary-xfce/places/16/playlist-queue.svg
+share/icons/elementary-xfce/places/16/playlist-similar.svg
+share/icons/elementary-xfce/places/16/playlist.svg
 share/icons/elementary-xfce/places/16/redhat-system-group.svg
 share/icons/elementary-xfce/places/16/stock_folder.svg
 share/icons/elementary-xfce/places/16/stock_open.svg
@@ -11836,6 +11848,7 @@ share/icons/elementary-xfce/places/16/stock_sent-mail.svg
 share/icons/elementary-xfce/places/16/stock_shared-by-me.svg
 share/icons/elementary-xfce/places/16/stock_shared-to-me.svg
 share/icons/elementary-xfce/places/16/stock_trash_full.svg
+share/icons/elementary-xfce/places/16/tag.svg
 share/icons/elementary-xfce/places/16/trashcan_empty.svg
 share/icons/elementary-xfce/places/16/trashcan_full.svg
 share/icons/elementary-xfce/places/16/user-bookmarks.svg
@@ -12517,6 +12530,7 @@ share/icons/elementary-xfce/status/22/xfce-unknown.svg
 share/icons/elementary-xfce/status/24/aptdaemon-add.svg
 share/icons/elementary-xfce/status/24/aptdaemon-download.svg
 share/icons/elementary-xfce/status/24/aptdaemon-working.svg
+share/icons/elementary-xfce/status/24/avatar-default.svg
 share/icons/elementary-xfce/status/24/battery_charged.svg
 share/icons/elementary-xfce/status/24/battery_empty.svg
 share/icons/elementary-xfce/status/24/battery_full.svg
@@ -12580,6 +12594,7 @@ share/icons/elementary-xfce/status/24/xfce-unknown.svg
 share/icons/elementary-xfce/status/32/aptdaemon-add.svg
 share/icons/elementary-xfce/status/32/aptdaemon-download.svg
 share/icons/elementary-xfce/status/32/aptdaemon-working.svg
+share/icons/elementary-xfce/status/32/avatar-default.svg
 share/icons/elementary-xfce/status/32/battery-000.svg
 share/icons/elementary-xfce/status/32/battery-020.svg
 share/icons/elementary-xfce/status/32/battery-040.svg
--- a/graphics/elementary-xfce-icon-theme/distinfo
+++ b/graphics/elementary-xfce-icon-theme/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/04/21 08:56:38 jperkin Exp $
+$NetBSD: distinfo,v 1.2 2015/07/26 14:59:47 youri Exp $

-SHA1 (47f947becd85583da089c0132b86011d0ecd3d60.tar.gz) = efc0dbd3fb706d7c3fc3fbf410bdc64dd50b9959
-RMD160 (47f947becd85583da089c0132b86011d0ecd3d60.tar.gz) = 376ce3f8c90bc373a0f1174ff87a3df15c3ac437
-Size (47f947becd85583da089c0132b86011d0ecd3d60.tar.gz) = 7467318 bytes
+SHA1 (a0b2b19231c3383f77f106d9cdacb2d148519cfd.tar.gz) = 526c1faefd5d96186e336eb33b69c9a22d030d4e
+RMD160 (a0b2b19231c3383f77f106d9cdacb2d148519cfd.tar.gz) = ab3ffa0dab209038f1a59b5d2d196852e859f456
+Size (a0b2b19231c3383f77f106d9cdacb2d148519cfd.tar.gz) = 7530667 bytes
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/03/22 20:15:20 spz Exp $
+# $NetBSD: Makefile,v 1.19 2015/09/05 11:55:28 jperkin Exp $

 PKGREVISION=	2

@@ -29,6 +29,10 @@ PLIST_SRC+=	PLIST.cserve
 PLIST_SRC+=	PLIST.cserve
 .endif

+.if ${OPSYS} == "Darwin"
+PLIST_SRC+=	PLIST.Darwin
+.endif
+
 CPPFLAGS.SunOS+=	-std=gnu99 -D_XOPEN_SOURCE=600

 post-install:
--- a/graphics/evas/PLIST.Darwin
+++ b/graphics/evas/PLIST.Darwin
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2015/09/05 11:55:28 jperkin Exp $
+include/evas-1/Evas_Engine_GL_Cocoa.h
+lib/evas/modules/engines/gl_cocoa/${MODULE_ARCH}/module.la
+lib/pkgconfig/evas-opengl-cocoa.pc
--- a/graphics/flphoto/DESCR
+++ b/graphics/flphoto/DESCR
@@ -1,10 +0,0 @@
-flPhoto is a basic image management and display program based on
-the FLTK <http://www.fltk.org> toolkit and is provided under the
-terms of the GNU General Public License.  It can read, write,
-and display digital camera EXIF information and supports the
-following image file formats:
-        - BMP
-        - CRW
-        - JPEG
-        - PhotoCD
-        - PNG
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2015/04/25 14:23:10 tnn Exp $
-#
-
-DISTNAME=		flphoto-1.2-source
-PKGNAME=		flphoto-1.2
-PKGREVISION=		21
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fltk/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.easysw.com/~mike/flphoto/index.html
-COMMENT=		Image management and display program
-
-WRKSRC=		${WRKDIR}/flphoto-1.2
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-
-LIBS.DragonFly= 	-lstdc++
-LIBS.SunOS+= 		-lstdc++
-
-.include "../../x11/fltk13/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
-.include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/graphics/flphoto/PLIST
+++ b/graphics/flphoto/PLIST
@@ -1,43 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:12 joerg Exp $
-bin/flphoto
-man/man1/flphoto.1
-man/man5/album.5
-share/doc/flphoto/COPYING
-share/doc/flphoto/README
-share/doc/flphoto/about.html
-share/doc/flphoto/albums.html
-share/doc/flphoto/camera.jpg
-share/doc/flphoto/contents.html
-share/doc/flphoto/crop.jpg
-share/doc/flphoto/download.html
-share/doc/flphoto/export.html
-share/doc/flphoto/export.jpg
-share/doc/flphoto/flphoto.jpg
-share/doc/flphoto/flphoto.png
-share/doc/flphoto/images.html
-share/doc/flphoto/import.html
-share/doc/flphoto/index.html
-share/doc/flphoto/jpeg.jpg
-share/doc/flphoto/license.html
-share/doc/flphoto/options.html
-share/doc/flphoto/options1.jpg
-share/doc/flphoto/options2.jpg
-share/doc/flphoto/options3.jpg
-share/doc/flphoto/print.html
-share/doc/flphoto/print.jpg
-share/doc/flphoto/print2.jpg
-share/doc/flphoto/print3.jpg
-share/doc/flphoto/print4.jpg
-share/doc/flphoto/relnotes.html
-share/doc/flphoto/scale.jpg
-share/doc/flphoto/slideshow.html
-share/doc/flphoto/slideshow.jpg
-share/doc/flphoto/view.html
-share/locale/de/flphoto_de
-share/locale/en_CA/flphoto_en_CA
-share/locale/en_GB/flphoto_en_GB
-share/locale/es/flphoto_es
-share/locale/fr/flphoto_fr
-share/locale/it/flphoto_it
-share/locale/nl/flphoto_nl
-share/locale/pt/flphoto_pt
--- a/graphics/flphoto/distinfo
+++ b/graphics/flphoto/distinfo
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.8 2011/12/06 19:54:46 joerg Exp $
-
-SHA1 (flphoto-1.2-source.tar.bz2) = 634cdbf80690b96009fb1c2952f0dff3733710ba
-RMD160 (flphoto-1.2-source.tar.bz2) = 1a9d574182a1f21f44493fa5e6f39d58c0d6c2a1
-Size (flphoto-1.2-source.tar.bz2) = 501459 bytes
-SHA1 (patch-Fl__Print__Dialog2.cxx) = c0f58db8a5984ebd6e0eac7c88aef762631b0874
-SHA1 (patch-aa) = 0a47885db0284d770c10db8d1dcc3c315df85dbc
-SHA1 (patch-ab) = f4d9616afa1e83e6e43cf84f1dfdf670a5ab7dd3
-SHA1 (patch-ac) = b80af462911c719a9bfea7ad778e77ac5e760da9
-SHA1 (patch-image.cxx) = a8bea3d8ccfd9ad62e3a36320b02a8736bbfa9da
--- a/graphics/flphoto/patches/patch-FlPrintDialog2.cxx
+++ b/graphics/flphoto/patches/patch-FlPrintDialog2.cxx
@@ -1,12 +0,0 @@
-$NetBSD: patch-Fl__Print__Dialog2.cxx,v 1.1 2011/12/06 19:54:46 joerg Exp $
-
--- Fl_Print_Dialog2.cxx.orig	2011-12-06 15:56:14.000000000 +0000
-+++ Fl_Print_Dialog2.cxx
-@@ -52,6 +52,7 @@
- 
- #ifdef HAVE_LIBCUPS
- #  include <cups/cups.h>
-+#  include <cups/ppd.h>
- #endif // HAVE_LIBCUPS
- 
- 
--- a/graphics/flphoto/patches/patch-aa
+++ b/graphics/flphoto/patches/patch-aa
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/06 18:53:31 joerg Exp $
-
--- configure.orig	2005-12-06 18:28:31.000000000 +0000
-+++ configure
-@@ -4651,7 +4651,7 @@ _ACEOF
- 
- 
- case "$uname" in
-	Linux* | *BSD* | Darwin*)
-+	Linux* | *BSD* | Darwin* | DragonFly*)
- 		FLPHOTO_LOCALE="$datadir/locale"
- 		cat >>confdefs.h <<_ACEOF
- #define FLPHOTO_LOCALE "$datadir/locale"
--- a/graphics/flphoto/patches/patch-ab
+++ b/graphics/flphoto/patches/patch-ab
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/28 16:48:21 joerg Exp $
-
--- Makefile.in.orig	2006-04-28 16:39:58.000000000 +0000
-+++ Makefile.in
-@@ -182,15 +182,9 @@ install: $(TARGETS) @INSTALLDESKTOP@
- 	$(CP) flphoto$(EXEEXT) $(DESTDIR)$(bindir)
- 	$(FLTKCONFIG) --post $(DESTDIR)$(bindir)/flphoto$(EXEEXT)
- 	echo Installing flPhoto manpages in $(DESTDIR)$(mandir)
-	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
-	$(RM) $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
-	$(CP) $(srcdir)/doc/flphoto.1 $(DESTDIR)$(mandir)/cat1/flphoto.$(CAT1EXT)
- 	-$(MKDIR) $(DESTDIR)$(mandir)/man1
- 	$(RM) $(DESTDIR)$(mandir)/man1/flphoto.1
- 	$(CP) $(srcdir)/doc/flphoto.man $(DESTDIR)$(mandir)/man1/flphoto.1
-	-$(MKDIR) $(DESTDIR)$(mandir)/cat5
-	$(RM) $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
-	$(CP) $(srcdir)/doc/album.5 $(DESTDIR)$(mandir)/cat5/album.$(CAT5EXT)
- 	-$(MKDIR) $(DESTDIR)$(mandir)/man5
- 	$(RM) $(DESTDIR)$(mandir)/man5/album.5
- 	$(CP) $(srcdir)/doc/album.man $(DESTDIR)$(mandir)/man5/album.5
--- a/graphics/flphoto/patches/patch-ac
+++ b/graphics/flphoto/patches/patch-ac
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/09/19 15:31:29 joerg Exp $
-
--- camera.cxx.orig	2003-12-14 05:32:04.000000000 +0100
-+++ camera.cxx
-@@ -38,6 +38,7 @@
- #  include <io.h>
- #  define fl_mkdir(p)	mkdir(p)
- #else
-+#  include <sys/stat.h>
- #  include <unistd.h>
- #  define fl_mkdir(p)	mkdir(p, 0777)
- #endif // WIN32 && !__CYGWIN__
--- a/graphics/flphoto/patches/patch-image.cxx
+++ b/graphics/flphoto/patches/patch-image.cxx
@@ -1,14 +0,0 @@
-$NetBSD: patch-image.cxx,v 1.1 2011/07/08 20:48:28 wiz Exp $
-
-Fix build with png-1.5.
-
--- image.cxx.orig	2003-10-22 03:49:41.000000000 +0000
-+++ image.cxx
-@@ -91,6 +91,7 @@ extern "C" {
- #endif // HAVE_LIBJPEG
- 
- #ifdef HAVE_LIBPNG
-+#  include <zlib.h>
- #  include <png.h>
- #endif // HAVE_LIBPNG
- 
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2015/06/12 10:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2015/06/30 09:57:36 ryoon Exp $

 DISTNAME=	fly-1.6.5
-PKGREVISION=	23
+PKGREVISION=	24
 CATEGORIES=	graphics www
 MASTER_SITES=	# ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/

--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2015/02/11 10:51:09 adam Exp $
+# $NetBSD: Makefile,v 1.100 2015/09/06 08:34:20 mef Exp $

-DISTNAME=	freetype-2.5.5
+DISTNAME=	freetype-2.6
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2014/03/13 23:26:35 spz Exp $
+@comment $NetBSD: PLIST,v 1.22 2015/09/06 08:34:20 mef Exp $
 bin/freetype-config
 include/freetype2/config/ftconfig.h
 include/freetype2/config/ftheader.h
@@ -19,6 +19,7 @@ include/freetype2/ftchapters.h
 include/freetype2/ftcid.h
 include/freetype2/fterrdef.h
 include/freetype2/fterrors.h
+include/freetype2/ftfntfmt.h
 include/freetype2/ftgasp.h
 include/freetype2/ftglyph.h
 include/freetype2/ftgxval.h
@@ -45,7 +46,6 @@ include/freetype2/fttrigon.h
 include/freetype2/ftttdrv.h
 include/freetype2/fttypes.h
 include/freetype2/ftwinfnt.h
-include/freetype2/ftxf86.h
 include/freetype2/t1tables.h
 include/freetype2/ttnameid.h
 include/freetype2/tttables.h
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.53 2015/02/11 10:51:09 adam Exp $
+$NetBSD: distinfo,v 1.54 2015/09/06 08:34:20 mef Exp $

-SHA1 (freetype-2.5.5.tar.bz2) = 7b7460ef51a8fdb17baae53c6658fc1ad000a1c2
-RMD160 (freetype-2.5.5.tar.bz2) = 49093b839e6cc0639383d6baacfb73da80a4ee1a
-Size (freetype-2.5.5.tar.bz2) = 1714529 bytes
+SHA1 (freetype-2.6.tar.bz2) = cd2b144205dd2c61693e2d861069367aa3dde1bc
+RMD160 (freetype-2.6.tar.bz2) = 80618594b49c5bfdd8fd951f83a346d57f04ee09
+Size (freetype-2.6.tar.bz2) = 1726219 bytes
 SHA1 (patch-aa) = d89f3f452354129df49d02d5063e712b57e8ba0e
 SHA1 (patch-ab) = cb8c9552e2db1e1f3da3d20971c22f174e343162
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2015/06/12 10:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/30 09:57:36 ryoon Exp $

 DISTNAME=		g2-0.50
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		graphics
 MASTER_SITES=		http://g2.sourceforge.net/pub/

--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.104 2015/06/12 10:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2015/06/30 10:20:10 ryoon Exp $

-DISTNAME=	libgd-2.1.0
+DISTNAME=	libgd-2.1.1
 PKGNAME=	${DISTNAME:S/libgd/gd/}
-PKGREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	http://cdn.bitbucket.org/libgd/gd-libgd/downloads/
+MASTER_SITES=	https://bitbucket.org/libgd/gd-libgd/downloads/
 EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://libgd.bitbucket.org/
 COMMENT=	Graphics library for the dynamic creation of images

+#WRKSRC=		${WRKDIR}/${DISTNAME:S/libgd-/libgd-gd-/}
+
 .include "options.mk"

 USE_LIBTOOL=		yes
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2015/02/25 11:15:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2015/06/30 10:02:21 ryoon Exp $

 BUILDLINK_TREE+=	gd

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gd
 GD_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gd+=	gd>=2.0.15nb1
-BUILDLINK_ABI_DEPENDS.gd+=	gd>=2.1.0
+BUILDLINK_ABI_DEPENDS.gd+=	gd>=2.1.0nb4
 BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd

 .include "../../mk/bsd.fast.prefs.mk"
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2015/04/12 15:09:32 tnn Exp $
+$NetBSD: distinfo,v 1.37 2015/06/30 10:20:10 ryoon Exp $

-SHA1 (libgd-2.1.0.tar.xz) = 66c56fc07246b66ba649c83e996fd2085ea2f9e2
-RMD160 (libgd-2.1.0.tar.xz) = 3fcdf88e1ca653ffd40ddba607dbc317ca87bf63
-Size (libgd-2.1.0.tar.xz) = 2004304 bytes
+SHA1 (libgd-2.1.1.tar.xz) = 9038ed488b577d16aa8c32b6c10b4a70b10f7fa1
+RMD160 (libgd-2.1.1.tar.xz) = 8d564caf9a953d344fb9a5e169d241510a2c71f1
+Size (libgd-2.1.1.tar.xz) = 2039132 bytes
 SHA1 (patch-aa) = 00198349dd9cff60f1f5738524096a251057eb16
 SHA1 (patch-ab) = 300ffacf47d7421fc9efb7b3fd9e93f011de1b4b
 SHA1 (patch-src_gd__bmp.c) = 4db300a26cebae6fb6f14564c5648608d7ed6cc5
-SHA1 (patch-src_gd__gif__in.c) = 4c18302fa45b482b28f5b618681354690eaa9b2d
+SHA1 (patch-src_webpimg.c) = 2717cbcfdbbddfc8cd96de2d4f6a07a0485ba086
--- a/graphics/gd/options.mk
+++ b/graphics/gd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/12/09 11:42:10 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2015/07/04 16:18:35 joerg Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.gd
 PKG_SUPPORTED_OPTIONS=	libvpx x11
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=	libvpx

 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ENV+=		X11BASE=${X11BASE}
 CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.libXpm}
 .else
 CONFIGURE_ARGS+=	--without-xpm
--- a/graphics/gd/patches/patch-src_gdgifin.c
+++ b/graphics/gd/patches/patch-src_gdgifin.c
@@ -1,45 +0,0 @@
-$NetBSD: patch-src_gd__gif__in.c,v 1.1 2015/04/12 15:09:33 tnn Exp $
-
-CVE-2014-9709
-https://bitbucket.org/libgd/gd-libgd/commits/47eb44b2e90ca88a08dca9f9a1aa9041e9587f43/raw/
-
-From 47eb44b2e90ca88a08dca9f9a1aa9041e9587f43 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Sat, 13 Dec 2014 08:48:18 +0100
-Subject: [PATCH] Fix possible buffer read overflow detected by
- -fsanitize=address, thanks to Jan Bee
-
---
- src/gd_gif_in.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
-index b3b4ca3..13a663c 100644
--- src/gd_gif_in.c
-+++ src/gd_gif_in.c
-@@ -75,8 +75,10 @@ static struct {
- 
- #define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
- 
-+#define CSD_BUF_SIZE 280
-+
- typedef struct {
-	unsigned char buf[280];
-+	unsigned char buf[CSD_BUF_SIZE];
- 	int curbit;
- 	int lastbit;
- 	int done;
-@@ -468,7 +470,12 @@ GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroD
- 
- 	ret = 0;
- 	for (i = scd->curbit, j = 0; j < code_size; ++i, ++j) {
-		ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j;
-+		if (i < CSD_BUF_SIZE * 8) {
-+			ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j;
-+		} else {
-+			ret = -1;
-+			break;
-+		}
- 	}
- 
- 	scd->curbit += code_size;
--- a/graphics/gd/patches/patch-src_webpimg.c
+++ b/graphics/gd/patches/patch-src_webpimg.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_webpimg.c,v 1.1 2015/06/30 10:20:11 ryoon Exp $
+
+Fix build with libvpx-1.4.0.
+
+https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8#diff-6df10f67563acb6f093f2d9fe3549f08
+
+--- src/webpimg.c.orig	2015-01-14 03:09:04.000000000 +0000
+++ src/webpimg.c
+@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
+     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
+     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
+ 
+-    vpx_img_wrap(&img, IMG_FMT_I420,
+    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
+                  y_width, y_height, 16, (uint8*)(Y));
+-    img.planes[PLANE_Y] = (uint8*)(Y);
+-    img.planes[PLANE_U] = (uint8*)(U);
+-    img.planes[PLANE_V] = (uint8*)(V);
+-    img.stride[PLANE_Y] = y_stride;
+-    img.stride[PLANE_U] = uv_stride;
+-    img.stride[PLANE_V] = uv_stride;
+    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+    img.planes[VPX_PLANE_U] = (uint8*)(U);
+    img.planes[VPX_PLANE_V] = (uint8*)(V);
+    img.stride[VPX_PLANE_Y] = y_stride;
+    img.stride[VPX_PLANE_U] = uv_stride;
+    img.stride[VPX_PLANE_V] = uv_stride;
+ 
+     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
+ 
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2014/01/09 10:33:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2015/06/30 09:57:36 ryoon Exp $

 DISTNAME=	gdchart0.11.5dev
 PKGNAME=	gdchart-0.11.5
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.fred.net/brv/chart/

--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2013/09/04 12:31:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2015/06/30 10:02:21 ryoon Exp $

 BUILDLINK_TREE+=	gdchart

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gdchart
 GDCHART_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gdchart+=	gdchart>=0.11.4nb1
-BUILDLINK_ABI_DEPENDS.gdchart+=	gdchart>=0.11.5nb13
+BUILDLINK_ABI_DEPENDS.gdchart+=	gdchart>=0.11.5nb14
 BUILDLINK_PKGSRCDIR.gdchart?=	../../graphics/gdchart

 .include "../../graphics/gd/buildlink3.mk"
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2013/12/08 13:58:24 prlw1 Exp $
+# $NetBSD: Makefile,v 1.29 2015/08/31 12:35:52 he Exp $

 DISTNAME=	gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=	${DISTNAME:S/pixbuf/pixbuf2/}
+PKGREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
 EXTRACT_SUFX=	.tar.xz
--- a/graphics/gdk-pixbuf2/Makefile.version
+++ b/graphics/gdk-pixbuf2/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.8 2014/01/15 17:12:54 drochner Exp $
+# $NetBSD: Makefile.version,v 1.9 2015/06/30 10:47:55 ryoon Exp $

-PIXBUF2_VERSION=	2.30.3
+PIXBUF2_VERSION=	2.30.8
 MSITE_VERSION=		${PIXBUF2_VERSION:R}
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2014/01/15 17:12:54 drochner Exp $
+$NetBSD: distinfo,v 1.25 2015/08/31 12:35:52 he Exp $

-SHA1 (gdk-pixbuf-2.30.3.tar.xz) = 22d1e53be4ccecd49290d8f1ba188cc51dc4fe88
-RMD160 (gdk-pixbuf-2.30.3.tar.xz) = 1d7f0aae034d78ef53bc4c4e506795d29ca528fb
-Size (gdk-pixbuf-2.30.3.tar.xz) = 1323316 bytes
+SHA1 (gdk-pixbuf-2.30.8.tar.xz) = 6277b4e5b5e334b3669f15ae0376e184be9e8cd8
+RMD160 (gdk-pixbuf-2.30.8.tar.xz) = d9020436326e50f5f97e0c2a052d53eefb5e9356
+Size (gdk-pixbuf-2.30.8.tar.xz) = 1336788 bytes
 SHA1 (patch-ab) = a64a1c9a4dd4c51d918e3409d40d76fd63146150
 SHA1 (patch-ac) = c55b59e380cf58ae7e94c760dc0dbb32b6b5fb69
-SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 9656d695b2567a1f743885964949e32634cde577
+SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda
+SHA1 (patch-gdk-pixbuf_pixops_pixops.c) = 0e8b28625bc3d5ac94b46b0bafa6fe10fda9be7f
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c,v 1.1 2013/08/26 14:38:56 richard Exp $
+$NetBSD: patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c,v 1.2 2015/06/30 10:47:55 ryoon Exp $

 * include config.h early to avoid redefinition warnings on solaris
 *
--- gdk-pixbuf/gdk-pixbuf-scaled-anim.c.orig	2012-07-31 23:45:20.000000000 +0000
+--- gdk-pixbuf/gdk-pixbuf-scaled-anim.c.orig	2014-03-06 04:36:45.000000000 +0000
 +++ gdk-pixbuf/gdk-pixbuf-scaled-anim.c
-@@ -21,7 +21,7 @@
-  * Boston, MA 02111-1307, USA.
+@@ -19,7 +19,7 @@
+  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 -
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_pixops_pixops.c
+++ b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_pixops_pixops.c
@@ -0,0 +1,83 @@
+$NetBSD: patch-gdk-pixbuf_pixops_pixops.c,v 1.1 2015/08/31 12:35:53 he Exp $
+
+Add fix for https://bugzilla.gnome.org/show_bug.cgi?id=752297,
+also CVE-2015-4491, lifted from
+
+  https://git.gnome.org/browse/gdk-pixbuf/commit/gdk-pixbuf/pixops/pixops.c?id=ffec86ed5010c5a2be14f47b33bcf4ed3169a199
+and
+  https://git.gnome.org/browse/gdk-pixbuf/commit/?id=8dba67cb4f38d62a47757741ad41e3f245b4a32a
+
+Our loader code is supposed to handle out-of-memory and overflow
+situations gracefully, reporting errors instead of aborting. But
+if you load an image at a specific size, we also execute our
+scaling code, which was not careful enough about overflow in some
+places.
+
+This commit makes the scaling code silently return if it fails to
+allocate filter tables. This is the best we can do, since
+gdk_pixbuf_scale() is not taking a GError.
+
+--- gdk-pixbuf/pixops/pixops.c.orig	2014-03-06 04:36:45.000000000 +0000
+++ gdk-pixbuf/pixops/pixops.c
+@@ -1192,7 +1192,20 @@ make_filter_table (PixopsFilter *filter)
+   int i_offset, j_offset;
+   int n_x = filter->x.n;
+   int n_y = filter->y.n;
+-  int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
+  gsize n_weights;
+  int *weights;
+
+  n_weights = SUBSAMPLE * SUBSAMPLE * n_x;
+  if (n_weights / (SUBSAMPLE * SUBSAMPLE) != n_x)
+    return NULL; /* overflow, bail */
+
+  n_weights *= n_y;
+  if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
+    return NULL; /* overflow, bail */
+
+  weights = g_try_new (int, n_weights);
+  if (!weights)
+    return NULL; /* overflow, bail */
+ 
+   for (i_offset=0; i_offset < SUBSAMPLE; i_offset++)
+     for (j_offset=0; j_offset < SUBSAMPLE; j_offset++)
+@@ -1267,8 +1280,11 @@ pixops_process (guchar         *dest_buf
+   if (x_step == 0 || y_step == 0)
+     return; /* overflow, bail out */
+ 
+-  line_bufs = g_new (guchar *, filter->y.n);
+   filter_weights = make_filter_table (filter);
+  if (!filter_weights)
+    return; /* overflow, bail out */
+
+  line_bufs = g_new (guchar *, filter->y.n);
+ 
+   check_shift = check_size ? get_check_shift (check_size) : 0;
+ 
+@@ -1388,7 +1404,7 @@ tile_make_weights (PixopsFilterDimension
+ 		   double                 scale)
+ {
+   int n = ceil (1 / scale + 1);
+-  double *pixel_weights = g_new (double, SUBSAMPLE * n);
+  double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
+   int offset;
+   int i;
+ 
+@@ -1446,7 +1462,7 @@ bilinear_magnify_make_weights (PixopsFil
+     }
+ 
+   dim->n = n;
+-  dim->weights = g_new (double, SUBSAMPLE * n);
+  dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
+ 
+   pixel_weights = dim->weights;
+ 
+@@ -1537,7 +1553,7 @@ bilinear_box_make_weights (PixopsFilterD
+ 			   double                 scale)
+ {
+   int n = ceil (1/scale + 3.0);
+-  double *pixel_weights = g_new (double, SUBSAMPLE * n);
+  double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
+   double w;
+   int offset, i;
+ 
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.49 2015/04/25 14:23:10 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2015/09/12 12:54:10 gdt Exp $
 #

-DISTNAME=	geeqie-1.1
-PKGREVISION=	24
+DISTNAME=	geeqie-1.2.2
+PKGREVISION=	2
+EXTRACT_SUFX=	.tar.xz
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geeqie/}
+MASTER_SITES=	http://www.geeqie.org/

 MAINTAINER=	gdt@NetBSD.org
-HOMEPAGE=	http://geeqie.sourceforge.net/
+HOMEPAGE=	http://www.geeqie.org/
 COMMENT=	Image viewer
 LICENSE=	gnu-gpl-v2

@@ -29,7 +30,7 @@ post-build:
 .include "options.mk"

 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
--- a/Show More
+++ b/Show More