Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/graphics/AfterShotPro/Makefile
+++ b/graphics/AfterShotPro/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/06 14:10:39 asau Exp $
-#
+# $NetBSD: Makefile,v 1.3 2013/12/29 13:27:56 wiz Exp $

 CATEGORIES=	graphics
 MASTER_SITES=	http://www.corel.com/akdlm/6763/downloads/AfterShotPro/1/PF/
@@ -25,6 +24,8 @@ EMUL_MODULES.linux=	drm fontconfig freetype2 glx gtk2 png x11

 INSTALLATION_DIRS=	bin libdata share/applications share/pixmaps

+REPLACE_SH=		usr/bin/AfterShotPro
+
 SUBST_CLASSES+=		path
 SUBST_SED.path+=	-e "s,/opt/AfterShotPro,${PREFIX}/libdata/AfterShotPro,"
 SUBST_SED.path+=	-e "s,{LD_LIBRARY_PATH},{LD_LIBRARY_PATH}:${PREFIX}/emul/linux32/lib,"
@@ -34,15 +35,15 @@ SUBST_STAGE.path=	post-build

 .include "../../mk/bsd.prefs.mk"

-DIST_SUBDIR=	AfterShotPro-1.0
+DIST_SUBDIR=	AfterShotPro-1.1.0.30

 .if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	AfterShotPro_i386
-PKGNAME=	${DISTNAME:S/_i386/-1.0/}
+PKGNAME=	${DISTNAME:S/_i386/-1.1.0.30/}
 # same data.tar.gz, just different control.tar.gz
 #.elif ${EMUL_PLATFORM} == "linux-x86_64"
 #DISTNAME=	AfterShotPro_amd64
-#PKGNAME=	${DISTNAME:S/_amd64/-1.0/}
+#PKGNAME=	${DISTNAME:S/_amd64/-1.1.0.30/}
 .else
 BROKEN=		Not supported for this emulation
 .endif
@@ -50,6 +51,7 @@ BROKEN=		Not supported for this emulation
 do-extract: ${WRKDIR}
 	${RUN} cd ${WRKDIR} && ${AR} x ${_DISTDIR:Q}/${DISTNAME}${EXTRACT_SUFX} data.tar.gz
 	cd ${WRKSRC} && ${TAR} -xzpf data.tar.gz
+	chmod go-w ${WRKSRC}

 do-build:

@@ -58,6 +60,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/usr/share/applications/AfterShotPro.desktop ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/AfterShotPro.png ${DESTDIR}${PREFIX}/share/pixmaps
 	cd ${WRKSRC}/opt && pax -pe -rw * ${DESTDIR}${PREFIX}/libdata
+	cd ${DESTDIR}${PREFIX} && chmod -R go-w .

 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/graphics/AfterShotPro/PLIST
+++ b/graphics/AfterShotPro/PLIST
--- a/graphics/AfterShotPro/distinfo
+++ b/graphics/AfterShotPro/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/01/23 23:32:33 wiz Exp $
+$NetBSD: distinfo,v 1.2 2013/12/29 13:27:56 wiz Exp $

-SHA1 (AfterShotPro-1.0/AfterShotPro_i386.deb) = dd04b4d828b93d13388d3e73405b62d6dd912f33
-RMD160 (AfterShotPro-1.0/AfterShotPro_i386.deb) = 7c6854ad86af082efad2860b4d932e6c9c78144a
-Size (AfterShotPro-1.0/AfterShotPro_i386.deb) = 35535186 bytes
+SHA1 (AfterShotPro-1.1.0.30/AfterShotPro_i386.deb) = bb1b6af1c671ee5a048896f890a13a4a3022a059
+RMD160 (AfterShotPro-1.1.0.30/AfterShotPro_i386.deb) = 55bd1c5fc8e0eafad5538d8371c8fb73a90ad44c
+Size (AfterShotPro-1.1.0.30/AfterShotPro_i386.deb) = 73932006 bytes
--- a/graphics/Cenon/Makefile
+++ b/graphics/Cenon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2013/05/09 07:39:51 adam Exp $
+# $NetBSD: Makefile,v 1.22 2013/10/19 09:07:05 adam Exp $
 #

 DISTNAME=		Cenon-3.9.6
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics cad gnustep
 MASTER_SITES=		http://www.vhf-group.com/vhfInterservice/download/source/
 EXTRACT_SUFX=		.tar.bz2
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2013/06/11 15:22:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2013/07/05 13:29:33 ryoon Exp $

 DISTNAME=		Coin-3.1.3
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		https://bitbucket.org/Coin3D/coin/downloads/

--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2013/06/11 15:22:47 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2013/07/05 13:29:33 ryoon Exp $

 BUILDLINK_TREE+=	Coin

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	Coin
 COIN_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.Coin+=		Coin>=3.1.3
-BUILDLINK_ABI_DEPENDS.Coin+=		Coin>=3.1.3
+BUILDLINK_ABI_DEPENDS.Coin+=		Coin>=3.1.3nb1
 BUILDLINK_PKGSRCDIR.Coin?=		../../graphics/Coin

 .include "../../graphics/simage/buildlink3.mk"
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2012/10/06 14:10:39 asau Exp $
+# $NetBSD: Makefile,v 1.41 2014/02/12 23:17:58 tron Exp $

 DISTNAME=	GMT4.1.4
 PKGNAME=	GMT-4.1.4
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/4/	\
 				ftp://ftp.iris.washington.edu/pub/gmt/4/
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.63 2013/06/04 22:16:13 tron Exp $
+# $NetBSD: Makefile,v 1.65 2014/02/12 23:17:58 tron Exp $

 .include "Makefile.common"

-PKGREVISION=	6
+PKGREVISION=	1
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.graphicsmagick.org/
 COMMENT=	X application for displaying and manipulating images
--- a/graphics/GraphicsMagick/Makefile.common
+++ b/graphics/GraphicsMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2013/03/11 17:45:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2014/01/01 23:21:34 adam Exp $
 #
 # used by graphics/p5-GraphicsMagick/Makefile

 GM_MAJOR_VER=	1.3
-GM_MINOR_VER=	18
+GM_MINOR_VER=	19
 DISTVERSION=	${GM_MAJOR_VER}.${GM_MINOR_VER}
 DISTNAME=	GraphicsMagick-${DISTVERSION}
 CATEGORIES=	graphics
--- a/graphics/GraphicsMagick/buildlink3.mk
+++ b/graphics/GraphicsMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2013/06/04 22:16:13 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2014/02/12 23:17:58 tron Exp $

 BUILDLINK_TREE+=	GraphicsMagick

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	GraphicsMagick
 GRAPHICSMAGICK_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.12nb6
-BUILDLINK_ABI_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.18nb6
+BUILDLINK_ABI_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.19nb1
 BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick

 pkgbase := GraphicsMagick
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.34 2013/03/11 17:45:05 adam Exp $
+$NetBSD: distinfo,v 1.35 2014/01/01 23:21:34 adam Exp $

-SHA1 (GraphicsMagick-1.3.18.tar.xz) = 085c23666adcf88585119cb6aea7efe5c58481d4
-RMD160 (GraphicsMagick-1.3.18.tar.xz) = d0e8744ac4675447e94e5541644f286886ad47bb
-Size (GraphicsMagick-1.3.18.tar.xz) = 5124436 bytes
+SHA1 (GraphicsMagick-1.3.19.tar.xz) = 621c3e9a3b12e38dad225ee3466fd55a24c62066
+RMD160 (GraphicsMagick-1.3.19.tar.xz) = 593f3468dc2324d9ed9cb504f34579c078cd11c9
+Size (GraphicsMagick-1.3.19.tar.xz) = 5153772 bytes
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.198 2013/06/04 22:16:13 tron Exp $
+# $NetBSD: Makefile,v 1.202 2014/02/13 19:53:43 adam Exp $

 .include "Makefile.common"

 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	3

 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Package for display and interactive manipulation of images
@@ -46,7 +45,7 @@ GCC_REQD+=		3.0
 CFLAGS+=		-O
 .endif

-PKG_SYSCONFSUBDIR=	ImageMagick
+PKG_SYSCONFSUBDIR=	ImageMagick-${IM_MAJOR_LIB_VER}
 EGDIR=		${PREFIX}/share/examples/ImageMagick
 CONF_FILES=	${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml
 CONF_FILES+=	${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.100 2013/05/30 13:40:37 wiz Exp $
+# $NetBSD: Makefile.common,v 1.105 2014/02/13 19:53:43 adam Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile

-IM_MAJOR_VER=		6.8.5
-IM_MINOR_VER=		8
+IM_MAJOR_VER=		6.8.8
+IM_MINOR_VER=		5
 IM_MAJOR_LIB_VER=	6

 .if (${IM_MINOR_VER} != NONE)
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.77 2013/05/30 13:40:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.80 2014/02/13 19:53:43 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -21,11 +21,13 @@ include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/CoderInfo.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Color.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Drawable.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Exception.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Functions.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Geometry.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Image.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Include.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Montage.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Pixels.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/ResourceLimits.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/STL.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/TypeMetric.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/ImageMagick.h
@@ -90,6 +92,7 @@ include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/module.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/monitor.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/montage.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/morphology.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/opencl.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/option.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/paint.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/pixel-accessor.h
@@ -197,9 +200,7 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/bluebells_log.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/button.gif
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/configure.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/cylinder_shaded.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/definitive-guide.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/difference.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/donate.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/examples.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/frame.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/fuzzy-magick.png
@@ -214,7 +215,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/montage.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/navy.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/networkredux.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/bricks.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/checkerboard.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/circles.png
@@ -270,7 +270,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/verticalleftshingle.pn
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/verticalrightshingle.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/verticalsaw.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/piechart.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/project-support.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/radial-gradient.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/reconstruct.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/red-ball.png
@@ -286,7 +285,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/smile.gif
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/sponsor.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/sprite.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/t-shirt.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/tricks.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/wand.ico
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/wand.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/white-highlight.png
@@ -1084,6 +1082,7 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/magick-property.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/magick-wand.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/magick.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/memory.html
+share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/mime.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/module.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/mogrify.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/monitor.html
@@ -1091,7 +1090,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/montage.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/morphology.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/paint.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/pixel-iterator.html
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/pixel-view.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/pixel-wand.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/profile.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/property.html
@@ -1110,7 +1108,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/wand-view.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/architecture.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/binary-releases.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/changelog.html
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/channel.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/cipher.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/color-management.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/color.html
@@ -1148,7 +1145,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/magick-vector-graphics.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/magick-wand.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/magick.css
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/miff.html
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/mirrors.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/mogrify.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/montage.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/motion-picture.html
@@ -1173,7 +1169,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/incantation.msl
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/locale.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/log.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/magic.xml
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/mgk.c
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/mime.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/piechart.mvg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/piechart.svg
@@ -1183,6 +1178,7 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/type-ghostscript.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/type-windows.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/type.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/wand.c
+share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/sponsors.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/support.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/subversion.html
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2013/06/04 22:16:13 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2014/02/12 23:17:58 tron Exp $

 BUILDLINK_TREE+=	ImageMagick

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ImageMagick
 IMAGEMAGICK_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.ImageMagick+=	ImageMagick>=5.5.7.11nb1
-BUILDLINK_ABI_DEPENDS.ImageMagick+=	ImageMagick>=6.8.5.8nb3
+BUILDLINK_ABI_DEPENDS.ImageMagick+=	ImageMagick>=6.8.8.1nb1
 BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick

 pkgbase := ImageMagick
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.118 2013/05/30 13:40:37 wiz Exp $
+$NetBSD: distinfo,v 1.124 2014/02/13 19:53:43 adam Exp $

-SHA1 (ImageMagick-6.8.5-8.tar.xz) = 4d961c8cf86611eb88ba8be616229101ceb3e7ff
-RMD160 (ImageMagick-6.8.5-8.tar.xz) = 17828ace4c066ad2ef8b1dcfac93c85f10caec60
-Size (ImageMagick-6.8.5-8.tar.xz) = 8166540 bytes
+SHA1 (ImageMagick-6.8.8-5.tar.xz) = 5cb75caf426acf3eacaf882dbbb24f462016d828
+RMD160 (ImageMagick-6.8.8-5.tar.xz) = 86f35a57845f9bbe7355ebcab513aa42a7b43fb2
+Size (ImageMagick-6.8.8-5.tar.xz) = 7446036 bytes
+SHA1 (patch-configure) = 87ae69ea06d9ed392627ec2067192e1a292106c4
--- a/graphics/ImageMagick/patches/patch-configure
+++ b/graphics/ImageMagick/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2013/11/05 17:27:10 adam Exp $
+
+Portability fix.
+
+--- configure.orig	2013-11-05 17:24:55.000000000 +0000
+++ configure
+@@ -34656,7 +34656,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then
+if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
+   MPEGDecodeDelegateDefault='ffmpeg'
+   # Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args.
+ set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
+@@ -34741,7 +34741,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-if test "$MPEGEncodeDelegate" == "$MPEGEncodeDelegateDefault" ; then
+if test "$MPEGEncodeDelegate" = "$MPEGEncodeDelegateDefault" ; then
+   MPEGEncodeDelegateDefault='ffmpeg'
+   # Extract the first word of ""$MPEGEncodeDelegateDefault"", so it can be a program name with args.
+ set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
--- a/graphics/ImageViewer/Makefile
+++ b/graphics/ImageViewer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2013/05/09 07:39:51 adam Exp $
+# $NetBSD: Makefile,v 1.33 2013/10/19 09:07:05 adam Exp $

 DISTNAME=	ImageViewer-0.6.3
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.nice.ch/~phip/

--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.655 2013/06/26 20:14:05 joerg Exp $
+# $NetBSD: Makefile,v 1.679 2014/02/20 12:38:22 fhajny Exp $
 #

 COMMENT=	Graphics tools and libraries
@@ -51,9 +51,10 @@ SUBDIR+=	claraocr
 SUBDIR+=	clutter
 SUBDIR+=	clutter-box2d
 SUBDIR+=	clutter-gtk
+SUBDIR+=	clutter-gtk0.10
 SUBDIR+=	clutter-mx
-SUBDIR+=	clutter-qt
 SUBDIR+=	cnxtview
+SUBDIR+=	cogl
 SUBDIR+=	comix
 SUBDIR+=	compface
 SUBDIR+=	cpia2view
@@ -184,12 +185,14 @@ SUBDIR+=	gpicview
 SUBDIR+=	gqview
 SUBDIR+=	gqview-devel
 SUBDIR+=	grap
+SUBDIR+=	graphite2
 SUBDIR+=	graphviz
 SUBDIR+=	graphviz-dot-mode
 SUBDIR+=	gri
 SUBDIR+=	gst-plugins0.10-cairo
 SUBDIR+=	gst-plugins0.10-jpeg
 SUBDIR+=	gst-plugins0.10-png
+SUBDIR+=	gst-plugins1-cairo
 SUBDIR+=	gst-plugins1-jpeg
 SUBDIR+=	gst-plugins1-png
 SUBDIR+=	gthumb
@@ -341,9 +344,11 @@ SUBDIR+=	p5-Image-Size
 SUBDIR+=	p5-PerlMagick
 SUBDIR+=	p5-RRDTool-OO
 SUBDIR+=	p5-SVG
+SUBDIR+=	p5-SVG-Graph
 SUBDIR+=	p5-SWF-File
 SUBDIR+=	p5-Template-GD
 SUBDIR+=	p5-cairo
+SUBDIR+=	p5-cairo-gobject
 SUBDIR+=	p5-clutter
 SUBDIR+=	panomatic
 SUBDIR+=	pdiff
@@ -372,15 +377,18 @@ SUBDIR+=	prag
 SUBDIR+=	ps2eps
 SUBDIR+=	pstoedit
 SUBDIR+=	py-OpenGL
+SUBDIR+=	py-Pillow
 SUBDIR+=	py-aafigure
 SUBDIR+=	py-actdiag
+SUBDIR+=	py-altgraph
 SUBDIR+=	py-biggles
 SUBDIR+=	py-blockdiag
 SUBDIR+=	py-cairo
-SUBDIR+=	py-clutter
-SUBDIR+=	py-clutter-gtk
-SUBDIR+=	py-gd
+SUBDIR+=	py-cairo3
+SUBDIR+=	py-dot
+SUBDIR+=	py-fits
 SUBDIR+=	py-gdchart
+SUBDIR+=	py-gdmodule
 SUBDIR+=	py-gnuplot
 SUBDIR+=	py-goocanvas
 SUBDIR+=	py-gtkglext
@@ -391,7 +399,8 @@ SUBDIR+=	py-matplotlib-gtk2
 SUBDIR+=	py-matplotlib-tk
 SUBDIR+=	py-nwdiag
 SUBDIR+=	py-piddle
-SUBDIR+=	py-pyfits
+SUBDIR+=	py-pycha
+SUBDIR+=	py-qrcode
 SUBDIR+=	py-seqdiag
 SUBDIR+=	py-sk1libs
 SUBDIR+=	py-uniconvertor
@@ -414,6 +423,8 @@ SUBDIR+=	ruby-color-japanese
 SUBDIR+=	ruby-color-tools
 SUBDIR+=	ruby-gd
 SUBDIR+=	ruby-gnome2-cairo-gobject
+SUBDIR+=	ruby-gnome2-clutter
+SUBDIR+=	ruby-gnome2-clutter-gtk
 SUBDIR+=	ruby-gnome2-gdk3
 SUBDIR+=	ruby-gnome2-gdkpixbuf
 SUBDIR+=	ruby-gnome2-goocanvas
@@ -507,6 +518,8 @@ SUBDIR+=	tex-pst-tree
 SUBDIR+=	tex-pst-tree-doc
 SUBDIR+=	tex-pst-vue3d
 SUBDIR+=	tex-pst-vue3d-doc
+SUBDIR+=	tex-pstools
+SUBDIR+=	tex-pstools-doc
 SUBDIR+=	tex-pstricks
 SUBDIR+=	tex-pstricks-add
 SUBDIR+=	tex-pstricks-add-doc
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.74 2013/05/16 05:04:56 richard Exp $
+# $NetBSD: Makefile.common,v 1.75 2013/07/06 21:56:13 wiz Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -24,6 +24,8 @@ HOMEPAGE=		http://www.mesa3d.org/
 WRKSRC=			${WRKDIR}/Mesa-${MESA_VERSION}
 DIST_SUBDIR=		Mesa-${MESA_PKGVERSION}

+BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.11
+.include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.15 2013/05/16 05:04:56 richard Exp $
+# $NetBSD: Makefile.lib,v 1.17 2014/01/25 10:30:09 wiz Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -21,6 +21,7 @@ USE_LANGUAGES=		c99 c++
 USE_TOOLS+=		automake bison flex gmake pkg-config makedepend

 PYTHON_FOR_BUILD_ONLY=  yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 7.11.2
 .include "../../lang/python/tool.mk"
 BUILDLINK_DEPMETHOD.libxml2?=   build
 .include "../../textproc/libxml2/buildlink3.mk"
@@ -40,5 +41,10 @@ CONFIGURE_ARGS+=        --disable-egl
 CFLAGS+=	-D__FUNCTION__=__FILE__
 .endif

+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+.endif
+
 pre-configure:
 	cd ${WRKSRC} && ${MAKE} configure
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2013/06/13 14:16:21 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2014/01/24 23:00:15 ryoon Exp $

 PKGNAME=	MesaLib-${MESA_PKGVERSION}
-PKGREVISION=	2
+PKGREVISION=	4
 COMMENT=	Graphics library similar to SGI's OpenGL

 CONFLICTS+=	xf86driproto<2.0.4
@@ -70,4 +70,8 @@ pre-install:
 CFLAGS+=	-no-integrated-as -fvisibility=hidden
 .endif

+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+.endif
+
 .include "../../mk/bsd.pkg.mk"
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,10 +1,11 @@
-# $NetBSD: builtin.mk,v 1.19 2013/06/17 05:27:50 dholland Exp $
+# $NetBSD: builtin.mk,v 1.20 2014/03/22 08:19:24 jperkin Exp $

 BUILTIN_PKG:=	MesaLib

 BUILTIN_FIND_FILES_VAR:=	H_MESALIB PC_GL
 BUILTIN_FIND_FILES.H_MESALIB=	${X11BASE}/include/GL/glx.h
 BUILTIN_FIND_FILES.PC_GL=	${X11BASE}/lib/pkgconfig/gl.pc
+BUILTIN_FIND_FILES.PC_GL+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/gl.pc

 .include "../../mk/buildlink3/bsd.builtin.mk"

--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2013/06/16 04:16:59 obache Exp $
+$NetBSD: distinfo,v 1.86 2014/02/04 10:51:30 obache Exp $

 SHA1 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 2e6e730204800a0748b301a5f58b86332699788b
 RMD160 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = bb2b140375aa13df79fcdb60a7ad0a63622dc531
@@ -7,12 +7,15 @@ SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f
 RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea
 Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes
 SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
-SHA1 (patch-bin_mklib) = 152b61d40d2e24cf3674d346e94fcab04b850909
+SHA1 (patch-bin_mklib) = 8c54bf5382541cab9d971b0e0e627035db1af468
 SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61
 SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0
-SHA1 (patch-src_gallium_include_pipe_p__config.h) = 934e2505fe299e1a25da6def2f971fa1302840c0
+SHA1 (patch-src_gallium_auxiliary_util_u__atomic.h) = 68ba9694aca506add2aa96a6892a7227481c2c11
+SHA1 (patch-src_gallium_include_pipe_p__config.h) = 4e1d651d3cc4fbbffcfdab6cf7d293cef51db5c9
 SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124
+SHA1 (patch-src_glsl_ralloc.c) = 94fac7a8115d85bc3ee3daeb8ea308c766dc45c1
 SHA1 (patch-src_glu_sgi_glu.exports) = 66609d2ea59b02fc46b41311b0042fe4a2da517f
+SHA1 (patch-src_glx_XF86dri.c) = b69b7cf5e0d617eca129f0d7f0b06c7603d00db0
 SHA1 (patch-src_mesa_drivers_dri_common_dri__util.h) = 53e63dcc6243b1872f4e4816b46e92910cf97edc
 SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054
--- a/graphics/MesaLib/dri.mk
+++ b/graphics/MesaLib/dri.mk
@@ -1,13 +1,23 @@
-# $NetBSD: dri.mk,v 1.6.10.1 2013/08/28 05:40:18 spz Exp $
+# $NetBSD: dri.mk,v 1.8 2014/03/14 07:19:36 obache Exp $
 #
 # Currently, this is for convenience only.
 #
 .if !defined(DRI_MK)
 DRI_MK=		# defined

+.  if !defined(USE_BUILTIN.MesaLib)
+CHECK_BUILTIN.MesaLib:=	yes
+.    include "../../graphics/MesaLib/builtin.mk"
+CHECK_BUILTIN.MesaLib:=	no
+.  endif
+
+.  if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+BUILDLINK_API_DEPENDS.dri2proto+=	dri2proto>=2.1
+BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.11
+BUILDLINK_API_DEPENDS.libdrm+=		libdrm>=2.4.24
+.  endif
 .  include "../../textproc/expat/buildlink3.mk"
 .  include "../../x11/dri2proto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.11
 .  include "../../x11/glproto/buildlink3.mk"
 .  include "../../x11/libXdamage/buildlink3.mk"
 .  include "../../x11/libXfixes/buildlink3.mk"
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2013/05/28 11:27:09 wiz Exp $
+# $NetBSD: options.mk,v 1.26 2014/03/14 07:19:36 obache Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=
@@ -30,7 +30,7 @@ PKG_SUGGESTED_OPTIONS+=		dri
 PKG_SUGGESTED_OPTIONS+=		dri
 .endif

-.if ${OPSYS} == "DragonFly" || (${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11")
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || (${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11")
 PKG_SUGGESTED_OPTIONS+=		dri
 .endif

@@ -48,8 +48,8 @@ PKG_SUGGESTED_OPTIONS+=		dri
 .if !empty(PKG_OPTIONS:Mdri)
 CONFIGURE_ARGS+=        --with-driver=dri
 PLIST.dri=	yes
-BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.24
 .  include "../../sysutils/libpciaccess/buildlink3.mk"
+USE_BUILTIN.MesaLib=	no
 .  include "../../graphics/MesaLib/dri.mk"
 CONFIGURE_ARGS+=        --with-dri-drivers="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome"
 .else
--- a/graphics/MesaLib/patches/patch-bin_mklib
+++ b/graphics/MesaLib/patches/patch-bin_mklib
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_mklib,v 1.1 2013/05/16 05:22:02 richard Exp $
+$NetBSD: patch-bin_mklib,v 1.3 2013/11/29 15:27:19 bsiegert Exp $

 Solaris ld seemingly has a hard time swallowing nested archives,
 so flatten them out as is done for linux.
@@ -6,9 +6,9 @@ so flatten them out as is done for linux.
 Also, to simplify PLIST processing, add versioned shared libraries
 for SunOS.

--- bin/mklib.orig	2011-10-15 00:43:58.000000000 +0000
+--- bin/mklib.orig	Sat Oct 15 00:43:34 2011
 +++ bin/mklib
-@@ -305,6 +305,12 @@ fi
+@@ -305,9 +305,15 @@ fi
 #
 # OK, make the library now
 #
@@ -20,7 +20,11 @@ for SunOS.
 +
 case $ARCH in
 
-     'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD')
+-    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD')
+    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD' | 'FreeBSD' | 'MirBSD')
+ 	# we assume gcc
+ 
+ 	if [ "x$LINK" = "x" ] ; then
@@ -398,12 +404,6 @@ case $ARCH in
                 OPTS=${ALTOPTS}
             fi
--- a/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__atomic.h
+++ b/graphics/MesaLib/patches/patch-src_gallium_auxiliary_util_u__atomic.h
@@ -0,0 +1,107 @@
+$NetBSD: patch-src_gallium_auxiliary_util_u__atomic.h,v 1.1 2014/01/10 07:21:16 pho Exp $
+
+Add atomic operations for PowerPC platforms without GCC >= 4.1. This
+should probably be sent to the upstream.
+
+--- src/gallium/auxiliary/util/u_atomic.h.orig	2014-01-10 06:56:00.000000000 +0000
+++ src/gallium/auxiliary/util/u_atomic.h
+@@ -31,6 +31,8 @@
+ #define PIPE_ATOMIC_ASM_GCC_X86
+ #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86_64))
+ #define PIPE_ATOMIC_ASM_GCC_X86_64
+#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_PPC))
+#define PIPE_ATOMIC_ASM_GCC_PPC
+ #elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)
+ #define PIPE_ATOMIC_GCC_INTRINSIC
+ #else
+@@ -131,6 +133,90 @@ p_atomic_cmpxchg(int32_t *v, int32_t old
+ #endif
+ 
+ 
+#if defined(PIPE_ATOMIC_ASM_GCC_PPC)
+
+#define PIPE_ATOMIC "GCC ppc assembly"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define p_atomic_set(_v, _i) (*(_v) = (_i))
+#define p_atomic_read(_v) (*(_v))
+
+static INLINE boolean
+p_atomic_dec_zero(int32_t *v)
+{
+    int32_t c;
+
+    __asm__ __volatile__(
+        "1: lwarx   %0,0,%1\n"
+        "   addic   %0,%0,-1\n"
+        "   stwcx.  %0,0,%1\n"
+        "   bne-    1b"
+        : "=&r" (c)
+        : "r" (v)
+        : "cc", "memory");
+
+    return c != 0;
+}
+
+static INLINE void
+p_atomic_inc(int32_t *v)
+{
+    int32_t c;
+
+    __asm__ __volatile__(
+        "1: lwarx   %0,0,%1\n"
+        "   addic   %0,%0,1\n"
+        "   stwcx.  %0,0,%1\n"
+        "   bne-    1b"
+        : "=&r" (c)
+        : "r" (v)
+        : "cc", "memory");
+}
+
+static INLINE void
+p_atomic_dec(int32_t *v)
+{
+    int32_t c;
+
+    __asm__ __volatile__(
+        "1: lwarx   %0,0,%1\n"
+        "   addic   %0,%0,-1\n"
+        "   stwcx.  %0,0,%1\n"
+        "   bne-    1b"
+        : "=&r" (c)
+        : "r" (v)
+        : "cc", "memory");
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new)
+{
+    int32_t oldval;
+
+    __asm__ __volatile__(
+        "1: lwarx  %0,0,%2\n"
+        "   cmpw   0,%0,%3\n"
+        "   bne-   2f\n"
+        "   stwcx. %4,0,%2\n"
+        "   bne-   1b\n"
+        "2:\n"
+        : "=&r" (oldval), "+m" (*v)
+        : "r" (v), "r" (old), "r" (_new)
+        : "cc", "memory");
+
+    return oldval;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PIPE_ATOMIC_ASM_PPC */
+
+
+ 
+ /* Implementation using GCC-provided synchronization intrinsics
+  */
--- 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,9 +1,9 @@
-$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.2 2013/06/10 12:29:54 mef Exp $
+$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.3 2014/02/04 10:51:30 obache Exp $

-Adjust Endianness for PowerPC or SunOS.
+Adjust Endianness for PowerPC, NetBSD, OpenBSD or SunOS.

--- Mesa-7.11.2/src/gallium/include/pipe/p_config.h.orig	2011-10-15 09:43:58.000000000 +0900
-+++ src/gallium/include/pipe/p_config.h	2013-06-10 15:35:08.000000000 +0900
+--- src/gallium/include/pipe/p_config.h.orig	2011-10-15 00:43:58.000000000 +0000
+++ src/gallium/include/pipe/p_config.h
@@ -99,7 +99,7 @@
 #endif
 #endif
@@ -13,10 +13,19 @@ Adjust Endianness for PowerPC or SunOS.
 #define PIPE_ARCH_PPC
 #if defined(__ppc64__) || defined(__PPC64__)
 #define PIPE_ARCH_PPC_64
-@@ -129,6 +129,15 @@
+@@ -129,6 +129,24 @@
 # define PIPE_ARCH_BIG_ENDIAN
 #endif
 
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/endian.h>
+
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+# define PIPE_ARCH_LITTLE_ENDIAN
+#elif _BYTE_ORDER == _BIG_ENDIAN
+# define PIPE_ARCH_BIG_ENDIAN
+#endif
+
 +#elif defined(__sun)
 +#include <sys/isa_defs.h>
 +
--- a/graphics/MesaLib/patches/patch-src_glsl_ralloc.c
+++ b/graphics/MesaLib/patches/patch-src_glsl_ralloc.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_glsl_ralloc.c,v 1.1 2014/01/24 23:00:15 ryoon Exp $
+
+* Fix exit time segfault of qt5 application with modular xorg
+
+--- src/glsl/ralloc.c.orig	2011-10-15 00:43:58.000000000 +0000
+++ src/glsl/ralloc.c
+@@ -283,7 +283,8 @@ ralloc_autofree_context(void)
+ {
+    if (unlikely(autofree_context == NULL)) {
+       autofree_context = ralloc_context(NULL);
+-      atexit(autofree);
+      extern __attribute__((visibility("hidden"))) void *__dso_handle;
+      __cxa_atexit(autofree, NULL, __dso_handle);
+    }
+    return autofree_context;
+ }
--- a/graphics/MesaLib/patches/patch-src_glx_XF86dri.c
+++ b/graphics/MesaLib/patches/patch-src_glx_XF86dri.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_glx_XF86dri.c,v 1.1 2013/12/12 14:44:10 is Exp $
+
+--- src/glx/XF86dri.c.orig	2010-10-19 17:58:29.000000000 +0000
+++ src/glx/XF86dri.c
+@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+ #include "xf86dristr.h"
+#include <limits.h>
+ 
+ static XExtensionInfo _xf86dri_info_data;
+ static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
+@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int screen, drm_handle_t * hSAREA,
+    }
+ 
+    if (rep.length) {
+-      if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) {
+      if (rep.busIdStringLength < INT_MAX)
+         *busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1);
+      else
+         *busIdString = NULL;
+      if (*busIdString == NULL) {
+          _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
+          UnlockDisplay(dpy);
+          SyncHandle();
+@@ -300,9 +301,11 @@ XF86DRIGetClientDriverName(Display * dpy
+    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
+ 
+    if (rep.length) {
+-      if (!
+-          (*clientDriverName =
+-           (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
+      if (rep.clientDriverNameLength < INT_MAX)
+         *clientDriverName = (char *) Xcalloc(rep.clientDriverNameLength + 1, 1);
+      else
+         *clientDriverName = NULL;
+      if (*clientDriverName == NULL) {
+          _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
+          UnlockDisplay(dpy);
+          SyncHandle();
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/10/09 17:39:09 wiz Exp $
 #

 DISTNAME=		TiffIO-120e
 PKGNAME=		TiffIO-1.2.0e
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		graphics
 MASTER_SITES=		http://artis.imag.fr/Software/TiffIO/SOURCES/
 EXTRACT_SUFX=		.tgz
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/04/06 20:27:21 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2013/10/17 15:32:22 roy Exp $

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

@@ -14,12 +14,12 @@ LICENSE=	gnu-lgpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews

 WRKSRC=			${WRKDIR}/aalib-1.4.0
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-INFO_FILES=	yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+INFO_FILES=		yes

 CONFIGURE_ENV+=		SLANG_PREFIX=${BUILDLINK_PREFIX.libslang:Q}
-CONFIGURE_ENV+=		NCURSES_PREFIX=${BUILDLINK_PREFIX.ncurses:Q}
+CONFIGURE_ENV+=		NCURSES_PREFIX=${BUILDLINK_PREFIX.curses:Q}

 SUBST_CLASSES+=		malloc
 SUBST_STAGE.malloc=	pre-configure
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2013/10/17 15:36:34 roy Exp $

 BUILDLINK_TREE+=	aalib

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

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

 pkgbase := aalib
 .include "../../mk/pkg-build-options.mk"

-.if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses)
-.  include "../../devel/ncurses/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
 .endif

 .if !empty(PKG_BUILD_OPTIONS.aalib:Mslang)
--- a/graphics/aalib/options.mk
+++ b/graphics/aalib/options.mk
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.2 2006/11/06 11:26:31 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2013/10/17 15:32:22 roy Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.aalib
-PKG_SUPPORTED_OPTIONS=	ncurses slang x11
-PKG_SUGGESTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	curses slang x11
+PKG_SUGGESTED_OPTIONS=	curses x11
+PKG_OPTIONS_LEGACY_OPTS+=	ncurses:curses

 .include "../../mk/bsd.options.mk"

-.if !empty(PKG_OPTIONS:Mncurses)
-.  include "../../devel/ncurses/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-curses-driver=yes
 .else
 CONFIGURE_ARGS+=	--with-curses-driver=no
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2013/06/06 12:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2014/02/12 23:17:58 tron Exp $
 #

 DISTNAME=		aqsis-1.8.1
-PKGREVISION=		14
+PKGREVISION=		17
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aqsis/}

@@ -15,6 +15,8 @@ USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config flex bison

+LIBS.SunOS=		-lsocket -lnsl
+
 #
 # Insists on being built in a separate directory.
 #
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2012/04/30 01:59:12 dholland Exp $
+$NetBSD: distinfo,v 1.9 2013/08/27 15:52:06 joerg Exp $

 SHA1 (aqsis-1.8.1.tar.gz) = 61b2552fd1fe782f008ba3a17efd3b185da70d5b
 RMD160 (aqsis-1.8.1.tar.gz) = 12d13a851188339c99fa5cb7fc0d5ce40d077fd6
 Size (aqsis-1.8.1.tar.gz) = 5663787 bytes
 SHA1 (patch-cmake_modules_FindPNG_cmake) = 24de84a90d62bcdbb767f5e16df2563f32e723aa
+SHA1 (patch-libs_tex_io_exrinputfile.h) = f1ac4d3f88c23df16ff1806aeca311ffd9bcb027
--- a/graphics/aqsis/patches/patch-libs_tex_io_exrinputfile.h
+++ b/graphics/aqsis/patches/patch-libs_tex_io_exrinputfile.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-libs_tex_io_exrinputfile.h,v 1.1 2013/08/27 15:52:06 joerg Exp $
+
+--- libs/tex/io/exrinputfile.h.orig	2013-08-27 12:56:02.000000000 +0000
+++ libs/tex/io/exrinputfile.h
+@@ -48,10 +48,9 @@
+ 
+ #include <aqsis/tex/io/itexinputfile.h>
+ 
+#include <ImfInputFile.h>
+
+ //------------------------------------------------------------------------------
+-namespace Imf {
+-	class InputFile;
+-}
+ 
+ namespace Aqsis {
+ 
--- a/graphics/asymptote/distinfo
+++ b/graphics/asymptote/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2012/07/03 18:07:03 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/11/11 16:43:21 joerg Exp $

 SHA1 (asymptote-2.15.src.tgz) = e0fb336c195fb21a39e3d0f3acd4881ce5e170a7
 RMD160 (asymptote-2.15.src.tgz) = 1916f4160034d4d76280bfed8ebe0bb898fc80ce
 Size (asymptote-2.15.src.tgz) = 1763773 bytes
 SHA1 (patch-configure) = ddefab8f9aed037a32cc854d0aedc4b861153b0f
+SHA1 (patch-genv.cc) = a02d289383ff2f84617d9cb8bf2df1e51962ee11
+SHA1 (patch-prc_writePRC.h) = 4b26db72fd611f0dd8ded8484f0025a3f058a141
 SHA1 (patch-runtime.cc) = e61bdfc8c911f81f727c0b341522e66372905b1a
--- a/graphics/asymptote/patches/patch-genv.cc
+++ b/graphics/asymptote/patches/patch-genv.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-genv.cc,v 1.1 2013/11/11 16:43:21 joerg Exp $
+
+--- genv.cc.orig	2013-11-10 20:25:05.000000000 +0000
+++ genv.cc
+@@ -15,7 +15,6 @@
+ 
+ #include <sstream>
+ #include <unistd.h>
+-#include <bits/stl_algo.h>
+ 
+ #include "genv.h"
+ #include "env.h"
--- a/graphics/asymptote/patches/patch-prc_writePRC.h
+++ b/graphics/asymptote/patches/patch-prc_writePRC.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-prc_writePRC.h,v 1.1 2013/11/11 16:43:21 joerg Exp $
+
+--- prc/writePRC.h.orig	2013-11-10 20:22:58.000000000 +0000
+++ prc/writePRC.h
+@@ -24,7 +24,7 @@
+ #include <vector>
+ #include <deque>
+ #include <list>
+-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_LIBCPP_VERSION)
+ #include <ext/slist>
+ #endif
+ #include <map>
+@@ -224,7 +224,7 @@ class PRCAttribute : public PRCAttribute
+   void addKey(const PRCSingleAttribute &key) { attribute_keys.push_back(key); }
+   std::deque<PRCSingleAttribute> attribute_keys;
+ };
+-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_LIBCPP_VERSION)
+ typedef __gnu_cxx::slist<PRCAttribute> PRCAttributeList;
+ #else
+ typedef std::list<PRCAttribute> PRCAttributeList;
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.56 2013/06/04 22:16:13 tron Exp $
-#
+# $NetBSD: Makefile,v 1.58 2014/02/12 23:17:58 tron Exp $

 DISTNAME=	autotrace-0.31.1
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	graphics cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=autotrace/}

-MAINTAINER=	rh@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://autotrace.sourceforge.net/
 COMMENT=	Convert bitmap to vector graphics
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2013/04/06 20:27:21 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.17 2013/10/06 17:15:35 adam Exp $

-DISTNAME=	barcode-0.98
+DISTNAME=	barcode-0.99
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU:=barcode/}
+EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ar.linux.it/software/barcode/
 COMMENT=	Create bar codes as EPS (program and library)
+LICENSE=	gnu-gpl-v3

-GNU_CONFIGURE=	YES
-MAKE_ENV+=	AWK=${AWK:Q}
-INFO_FILES=	yes
-
-INSTALL_MAKE_FLAGS=					\
-	BINDIR=${DESTDIR}${PREFIX}/bin			\
-	INCDIR=${DESTDIR}${PREFIX}/include		\
-	LIBDIR=${DESTDIR}${PREFIX}/lib			\
-	INFODIR=${DESTDIR}${PREFIX}/${PKGINFODIR}	\
-	MAN1DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1	\
-	MAN3DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-
-# man/man1/barcode.1
-CONFLICTS+=	xscreensaver<5.00
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes

+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/graphics/barcode/PLIST
+++ b/graphics/barcode/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/10/06 17:15:35 adam Exp $
 bin/barcode
-include/barcode.h
+bin/sample
 info/barcode.info
-lib/libbarcode.a
-man/man1/barcode.1
-man/man3/barcode.3
--- a/graphics/barcode/distinfo
+++ b/graphics/barcode/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/09/08 05:13:12 dholland Exp $
+$NetBSD: distinfo,v 1.6 2013/10/06 17:15:35 adam Exp $

-SHA1 (barcode-0.98.tar.gz) = 15b9598bcaa67bcff1f63309d1a18840b9a12899
-RMD160 (barcode-0.98.tar.gz) = 13685a100a151149a83d28a46372cf562fd750ba
-Size (barcode-0.98.tar.gz) = 335658 bytes
-SHA1 (patch-aa) = eb0812ae80a65828a20021ba1e718488899c212d
-SHA1 (patch-ab) = 166fce927fdb3ce77600f3fbab3b28faa7c9d340
-SHA1 (patch-ac) = 9e0ea49bb4b647d6daeb9666f0546dd0101fb507
-SHA1 (patch-ad) = eebbcda1403794f16e0de01134c2949cf3ec43fa
+SHA1 (barcode-0.99.tar.xz) = a6283a844ebfdccc9458256e5e6db15760348384
+RMD160 (barcode-0.99.tar.xz) = 57d91ddf49595ef29d83b5c3515727b8a04ccbf8
+Size (barcode-0.99.tar.xz) = 586028 bytes
+SHA1 (patch-Makefile.in) = 75b316c0e240966cb87eb3c57c0a48b96a615c3e
+SHA1 (patch-barcode.h) = 5c8409cf67428e0448872291555b178beca2c741
+SHA1 (patch-main.c) = 924a01db8fa3a33ce4ba7b050aefd4fd6019f58d
+SHA1 (patch-sample.c) = d143a473a2cebbc485220321323e81caf36b38b9
--- a/graphics/barcode/patches/patch-Makefile.in
+++ b/graphics/barcode/patches/patch-Makefile.in
@@ -0,0 +1,33 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Don't build nor use libgnu.
+
+--- Makefile.in.orig	2013-03-29 23:01:35.000000000 +0000
+++ Makefile.in
+@@ -142,7 +142,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am_barcode_OBJECTS = main.$(OBJEXT) cmdline.$(OBJEXT)
+ barcode_OBJECTS = $(am_barcode_OBJECTS)
+-barcode_DEPENDENCIES = libbarcode.la lib/libgnu.la
+barcode_DEPENDENCIES = libbarcode.la
+ am_sample_OBJECTS = sample.$(OBJEXT)
+ sample_OBJECTS = $(am_sample_OBJECTS)
+ sample_DEPENDENCIES = libbarcode.la
+@@ -1253,7 +1253,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = po doc lib
+SUBDIRS = po doc
+ AM_CFLAGS = -Ilib @CFLAGS@ @DEFS@ @NO_LIBPAPER@ @NO_STRERROR@
+ AM_LDFLAGS = -L. @LIBPAPER@
+ EXTRA_DIST = barcode.h cmdline.h
+@@ -1264,7 +1264,7 @@ libbarcode_la_SOURCES = library.c ean.c 
+ 		ps.c svg.c pcl.c code11.c
+ 
+ barcode_SOURCES = main.c cmdline.c
+-barcode_LDADD = libbarcode.la lib/libgnu.la
+barcode_LDADD = libbarcode.la
+ sample_SOURCES = sample.c
+ sample_LDADD = libbarcode.la
+ all: config.h
--- a/graphics/barcode/patches/patch-aa
+++ b/graphics/barcode/patches/patch-aa
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/06/27 08:50:03 seb Exp $
-
--- Makefile.in.orig	2001-10-17 13:26:21.000000000 +0000
-+++ Makefile.in
-@@ -55,7 +55,7 @@ $(LIBRARY): $(LIBOBJECTS)
- 	$(RANLIB) $(LIBRARY)
- 
- $(MAN1) $(MAN3): doc/doc.$(TARGET)
-	awk -f doc/manpager doc/doc.$(TARGET)
-+	${AWK} -f doc/manpager doc/doc.$(TARGET)
- 
- 
- # Unfortunately, pmake has no "-C". Also, "pmake -n" doesn't follow the cd.
-@@ -63,8 +63,12 @@ $(INFO): doc/doc.$(TARGET)
- 	cd doc && $(MAKE) 
- 
- install:
-	$(INSTALL) -d $(BINDIR) $(INCDIR) $(LIBDIR) $(MAN1DIR) \
-		$(MAN3DIR) $(INFODIR)
-+	$(INSTALL) -d $(BINDIR)
-+	$(INSTALL) -d $(INCDIR)
-+	$(INSTALL) -d $(LIBDIR)
-+	$(INSTALL) -d $(MAN1DIR)
-+	$(INSTALL) -d $(MAN3DIR)
-+	$(INSTALL) -d $(INFODIR)
- 	$(INSTALL) -c $(TARGET) $(BINDIR)
- 	$(INSTALL) -c -m 0644 $(HEADER) $(INCDIR)
- 	$(INSTALL) -c -m 0644  $(LIBRARY) $(LIBDIR)
--- a/graphics/barcode/patches/patch-ab
+++ b/graphics/barcode/patches/patch-ab
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/06/27 08:50:03 seb Exp $
-
--- doc/doc.barcode.orig	2002-03-01 22:41:50.000000000 +0000
-+++ doc/doc.barcode
-@@ -43,6 +43,11 @@ This file is the User's Manual for the b
- 
- @end ifinfo
- 
-+@dircategory Miscellaneous
-+@direntry
-+* Barcode: (barcode).             A barcode generation program and library.
-+@end direntry
-+
- @setchapternewpage odd
- @titlepage
- @c use the new format for titles
--- a/graphics/barcode/patches/patch-ac
+++ b/graphics/barcode/patches/patch-ac
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/06/27 08:50:04 seb Exp $
-
--- doc/barcode.info.orig	2002-03-01 22:56:47.000000000 +0000
-+++ doc/barcode.info
-@@ -13,6 +13,11 @@ Barcode tools
-    This file documents version 0.98 of the barcode library and sample
- programs (March 2002).
- 
-+INFO-DIR-SECTION Miscellaneous
-+START-INFO-DIR-ENTRY
-+* Barcode: (barcode).             A barcode generation program and library.
-+END-INFO-DIR-ENTRY
-+
- * Menu:
- 
- * Overview::
--- a/graphics/barcode/patches/patch-ad
+++ b/graphics/barcode/patches/patch-ad
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/09/08 05:13:12 dholland Exp $
-
--- doc/manpager~	2001-10-16 10:12:22.000000000 -0400
-+++ doc/manpager	2008-09-08 01:09:13.000000000 -0400
-@@ -32,20 +32,20 @@ SKIP==1         {next}
- # (ARub, Oct 10 2000)
- /@b\{/ {
-   #$0 = gensub(/@b\{([^}]+)\}/, "\\\\fB\\1\\\\fP","g");
-  gsub("@b\{","\\fB");
-  gsub("\}","\\fP");
-+  gsub("@b\\{","\\fB");
-+  gsub("\\}","\\fP");
- } 
- 
- /@var\{/ {
-   #$0 = gensub(/@var\{([^}]+)\}/, "\\\\fI\\1\\\\fP","g");
-  gsub("@var\{","\\fB");
-  gsub("\}","\\fP");
-+  gsub("@var\\{","\\fB");
-+  gsub("\\}","\\fP");
- } 
- 
- /@(samp|code|file)\{/ {
-   #$0 = gensub(/@(samp|code|file)\{([^}]+)\}/, "`\\2'","g");
-  gsub("@(samp|code|file)\{","");
-  gsub("\}","");
-+  gsub("@(samp|code|file)\\{","");
-+  gsub("\\}","");
- }
- 
- 
-@@ -54,8 +54,8 @@ SKIP==1         {next}
- }
- 
- /@ref\{.*\}/ {
-  gsub("@ref\{","");
-  gsub("\}","");
-+  gsub("@ref\\{","");
-+  gsub("\\}","");
- }
- 
- /@\*/ {
--- a/graphics/barcode/patches/patch-barcode.h
+++ b/graphics/barcode/patches/patch-barcode.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-barcode.h,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Avoid double symbols: define 'streaming' as 'extern'.
+
+--- barcode.h.orig	2013-10-06 07:42:33.000000000 +0000
+++ barcode.h
+@@ -123,6 +123,6 @@ extern int Barcode_Version(char *version
+ }
+ #endif
+ 
+-int streaming;
+extern int streaming;
+ 
+ #endif /* _BARCODE_H_ */
--- a/graphics/barcode/patches/patch-main.c
+++ b/graphics/barcode/patches/patch-main.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-main.c,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Avoid double symbols: define one global variable 'streaming'.
+
+--- main.c.orig	2013-03-29 22:22:24.000000000 +0000
+++ main.c
+@@ -32,6 +32,8 @@
+ #include <paper.h>
+ #endif
+ 
+int streaming;
+
+ /*
+  * Most of this file deals with command line options, by exploiting
+  * the cmdline.[ch] engine to offer defaults via environment variables
--- a/graphics/barcode/patches/patch-sample.c
+++ b/graphics/barcode/patches/patch-sample.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-sample.c,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Avoid double symbols: define one global variable 'streaming'.
+
+--- sample.c.orig	2013-10-06 07:47:28.000000000 +0000
+++ sample.c
+@@ -4,6 +4,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+int streaming;
+
+ int main(int argc, char **argv)
+ {
+     int pcl = 0, oflags;
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2013/06/06 12:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2014/02/12 23:17:59 tron Exp $

-DISTNAME=	blender-2.66a
-PKGREVISION=	4
+DISTNAME=	blender-2.69
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.blender.org/source/

@@ -24,12 +24,9 @@ FIND_PREFIX:=		SCONSDIR=scons

 INSTALLATION_DIRS=	bin share/blender

-.if ${OPSYS} == "NetBSD"
-# This doesn't seem right...
-.if !empty(OS_VERSION:M6.99.*) || !empty(OS_VERSION:M7.*)
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
 LDFLAGS+=	-lexecinfo
 .endif
-.endif

 # To pass LDFLAGS to compiler/linker
 MYLDFLAGS=	`printf "'%s'," ${LDFLAGS} | sed -e 's:,$$::'`
@@ -44,8 +41,10 @@ SCONS_ARGS+=	WITH_BF_JACK=False
 SCONS_ARGS+=	WITH_BF_OPENAL=False
 SCONS_ARGS+=	WITH_BF_SNDFILE=False
 SCONS_ARGS+=	WITH_BF_FFMPEG=False
+SCONS_ARGS+=	WITH_BF_3DMOUSE=False

 SCONS_ARGS+=	BF_PYTHON=${PREFIX}
+SCONS_ARGS+=	BF_PYTHON_ABI_FLAGS=''
 SCONS_ARGS+=	BF_SDL=${BUILDLINK_PREFIX.SDL}
 SCONS_ARGS+=	BF_OPENEXR=${BUILDLINK_PREFIX.openexr}
 SCONS_ARGS+=	BF_JPEG=${BUILDLINK_PREFIX.jpeg}
@@ -68,12 +67,15 @@ do-build:

 # build is done in install phase.
 do-install:
-	cd ${WRKSRC} && \
-		${SCONSDIR}/bin/scons ${SCONS_ARGS}
+	cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV}			\
+		${SCONSDIR}/bin/scons ${SCONS_ARGS} ${_MAKE_JOBS}

 CHECK_INTERPRETER_SKIP=	share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/scripts/*.py share/blender/${DISTNAME:S/blender-//:C/[a-z]//}datafiles/*.py \
 			share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/python/lib/python3.3/venv/scripts/posix/pydoc

+REPLACE_PYTHON+=	release/bin/blender-thumbnailer.py
+REPLACE_PYTHON+=	intern/cycles/kernel/SConscript
+
 post-install:
 	${LN} -sf ${PREFIX}/share/blender/blender \
 		${DESTDIR}${PREFIX}/bin
--- a/graphics/blender/PLIST
+++ b/graphics/blender/PLIST
--- a/graphics/blender/PLIST.Linux
+++ b/graphics/blender/PLIST.Linux
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2014/02/01 03:57:52 markd Exp $
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/_sqlite3.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/ossaudiodev.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/pyexpat.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/readline.so
+share/blender/${PKGVERSION}/python/lib/python3.3/lib-dynload/spwd.so
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/CDROM.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/DLFCN.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/IN.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/TYPES.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-linux/regen
+share/blender/blender-thumbnailer.py
+share/blender/icons/16x16/apps/blender.png
+share/blender/icons/22x22/apps/blender.png
+share/blender/icons/24x24/apps/blender.png
+share/blender/icons/256x256/apps/blender.png
+share/blender/icons/32x32/apps/blender.png
+share/blender/icons/48x48/apps/blender.png
+share/blender/icons/blender_icon_source.svg
+share/blender/icons/scalable/apps/blender.svg
--- a/graphics/blender/PLIST.NetBSD
+++ b/graphics/blender/PLIST.NetBSD
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2014/02/01 03:57:52 markd Exp $
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/IN.py
+share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/regen
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,20 +1,34 @@
-$NetBSD: distinfo,v 1.37 2013/03/13 20:28:48 ryoon Exp $
+$NetBSD: distinfo,v 1.40 2014/02/01 03:57:52 markd Exp $

-SHA1 (blender-2.66a.tar.gz) = f48555f3840f6ebde78603919d686672163c36ea
-RMD160 (blender-2.66a.tar.gz) = b0251067f6a6273ba1889cefafa7f8dd283e622e
-Size (blender-2.66a.tar.gz) = 36911037 bytes
-SHA1 (patch-SConstruct) = 4e3e81d3f4d8bf53a26102cb489ad507d14dd086
-SHA1 (patch-ab) = 5669f269c922f9bd521d15fdb1b21ba1e58ac7f6
-SHA1 (patch-am) = d023b35fe2355e2e53e11a3c91730ebe21da6de8
-SHA1 (patch-build__files_scons_config_netbsd6-config.py) = 520fa968b4f1f9f10adb1055803e05dafc96f0fe
+SHA1 (blender-2.69.tar.gz) = 9500410d2457d99e685ca506bec12851454dc5d4
+RMD160 (blender-2.69.tar.gz) = 27997d071a767630baeaddc0017e19dccb99b1a9
+Size (blender-2.69.tar.gz) = 41274518 bytes
+SHA1 (patch-ab) = f752ba279aed273bb5c93ede64c2d7292f33fd83
+SHA1 (patch-build__files_scons_config_linux-config.py) = 863ff0b2839fa96a4b579cb52d7c4475aa4c571c
+SHA1 (patch-build__files_scons_config_netbsd6-config.py) = a2ef239cc40430a5eaafd006b423e7f70ac9ee80
 SHA1 (patch-build__files_scons_tools_btools.py) = 09fe67666091daafcf586aa70dc19fa6964b2098
-SHA1 (patch-doc_python__api_sphinx__doc__gen.sh) = 273c88e258ca49f29367a1f3246c25df800b920a
-SHA1 (patch-extern_libmv_libmv_numeric_numeric.h) = fe674deb97e1ff8604b7fe505c715621b9fee5ee
-SHA1 (patch-extern_libmv_libmv_tracking_brute__region__tracker.cc) = 3d09eb0821a628c15e898b6fa432fe1d787f0eb8
+SHA1 (patch-doc_python__api_sphinx__doc__gen.sh) = 52c9ee0e0c73b9b9628a3d82292a9588ff0060da
+SHA1 (patch-extern_carve_lib_triangulator.cpp) = ad539e2f04a3b181504c4a9135f106189fccbda0
+SHA1 (patch-extern_libmv_libmv_numeric_numeric.h) = 37649c996eda56c2a6e0776b9933df28fac645e3
+SHA1 (patch-extern_libmv_libmv_tracking_brute__region__tracker.cc) = be5fe12d44221bde94326cccb30316bcf29f9aba
+SHA1 (patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h) = 5a276e652ad222aca3ff626da4b4850e5043672c
 SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a
 SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 423dda12bb5871f810938666c0267ac73b3f856e
 SHA1 (patch-extern_libmv_third__party_glog_src_utilities.h) = 32fea10d935621ef0529fe56b3e857685fbc5d1f
+SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e887867fa6cc0
+SHA1 (patch-intern_cycles_util_util__types.h) = 85624299d7b3ed354ba06406c9022393a448ad54
 SHA1 (patch-intern_ghost_SConscript) = 84dad76663e6dfc3bd6636fe8924921fe04caa2f
-SHA1 (patch-intern_guardedalloc_MEM__sys__types.h) = 7b3ee6dc5d1b66a785a838c07507b8d93f7f1d1d
-SHA1 (patch-intern_opennl_superlu_superlu__sys__types.h) = 99fa9ffa655914067173481d5fe6c498ad069717
+SHA1 (patch-intern_itasc_Armature.cpp) = ee841eff87e7cb85657868246285644994263fa2
+SHA1 (patch-intern_itasc_kdl_frameacc.hpp) = 06c5b13e889968b87513ff8ad7952b34173147de
+SHA1 (patch-intern_itasc_kdl_frames.hpp) = afcf3d74e50e12d4b8b2efd9b6d2fdfbee8fc629
+SHA1 (patch-intern_itasc_kdl_framevel.hpp) = fbf4accd352be468d3bdc039e315a86ce42010bd
+SHA1 (patch-intern_itasc_kdl_jacobian.hpp) = 490f67d9938e321b41c4bd93ccca06fe0c2d920a
+SHA1 (patch-intern_itasc_kdl_jntarray.hpp) = ff1b5befef08c8a7eb7f542a01305854b303156d
+SHA1 (patch-intern_itasc_kdl_jntarrayacc.hpp) = 05088dc8422c7fef2c7d80fd32547e8c46fb1158
+SHA1 (patch-intern_itasc_kdl_jntarrayvel.hpp) = 5673396e00d984448543959064a0d44e23baa09b
+SHA1 (patch-intern_itasc_kdl_tree.cpp) = 15d3b38b8a936c40726407ec17ee4c2dc7e0ac53
+SHA1 (patch-intern_itasc_kdl_tree.hpp) = 776b17eb67e4a619539d41c680b221d3c6f57dc8
+SHA1 (patch-intern_itasc_kdl_treefksolverpos__recursive.cpp) = bed5ba3ac0578161f35b561a6d4d1595ca085b88
+SHA1 (patch-intern_itasc_kdl_treefksolverpos__recursive.hpp) = da02d9c1bfe1f5825b1afded32ac1b1400613c08
+SHA1 (patch-intern_itasc_kdl_treejnttojacsolver.cpp) = bde39ea3c0b56cfbc7836cf5a30b94b7adbdfaff
 SHA1 (patch-user-config.py) = a3cf1a22185496f13b068a31d4b9638c8821f941
--- a/graphics/blender/patches/patch-SConstruct
+++ b/graphics/blender/patches/patch-SConstruct
@@ -1,26 +0,0 @@
-$NetBSD: patch-SConstruct,v 1.1 2012/12/03 13:15:50 ryoon Exp $
-
--- SConstruct.orig	2012-10-09 18:43:46.000000000 +0000
-+++ SConstruct
-@@ -140,20 +140,7 @@ else:
-     B.quickie=[]
- 
- toolset = B.arguments.get('BF_TOOLSET', None)
-if toolset:
-    print "Using " + toolset
-    if toolset=='mstoolkit':
-        env = BlenderEnvironment(ENV = os.environ)
-        env.Tool('mstoolkit', [toolpath])
-    else:
-        env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
-        if env:
-            btools.SetupSpawn(env)
-else:
-    if bitness==64 and platform=='win32':
-        env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
-    else:
-        env = BlenderEnvironment(ENV = os.environ)
-+env = BlenderEnvironment(ENV = os.environ)
- 
- if not env:
-     print "Could not create a build environment"
--- a/graphics/blender/patches/patch-ab
+++ b/graphics/blender/patches/patch-ab
@@ -1,17 +1,24 @@
-$NetBSD: patch-ab,v 1.10 2013/01/02 02:22:08 ryoon Exp $
+$NetBSD: patch-ab,v 1.12 2014/01/10 20:06:46 joerg Exp $

--- source/blender/blenlib/intern/storage.c.orig	2012-12-10 19:25:44.000000000 +0000
+--- source/blender/blenlib/intern/storage.c.orig	2013-08-20 08:33:04.000000000 +0000
 +++ source/blender/blenlib/intern/storage.c
-@@ -43,7 +43,7 @@
+@@ -42,13 +42,13 @@
 #include <time.h>
 #include <sys/stat.h>
 
 -#if defined(__sun__) || defined(__sun) || defined(__NetBSD__)
 +#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
- #elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
- #include <sys/statfs.h>
-@@ -163,7 +163,7 @@ double BLI_dir_free_space(const char *di
+ #  include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
+ #elif !defined(__FreeBSD__) && !defined(__linux__) && (defined(__sparc) || defined(__sparc__))
+ #  include <sys/statfs.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #  include <sys/param.h>
+ #  include <sys/mount.h>
+ #endif
+@@ -172,7 +172,7 @@ double BLI_dir_free_space(const char *di
 	return (double) (freec * bytesps * sectorspc);
 #else
 
@@ -20,12 +27,12 @@ $NetBSD: patch-ab,v 1.10 2013/01/02 02:22:08 ryoon Exp $
 	struct statvfs disk;
 #else
 	struct statfs disk;
-@@ -186,7 +186,7 @@ double BLI_dir_free_space(const char *di
+@@ -197,7 +197,7 @@ double BLI_dir_free_space(const char *di
 	if (statfs(name, &disk)) return(-1);
 #endif
 
 -#if defined(__sun__) || defined(__sun) || defined(__NetBSD__)
 +#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__)
 	if (statvfs(name, &disk)) return(-1);
- #elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
+ #elif !defined(__FreeBSD__) && !defined(__linux__) && (defined(__sparc) || defined(__sparc__))
 	/* WARNING - This may not be supported by geeneric unix os's - Campbell */
--- a/graphics/blender/patches/patch-am
+++ b/graphics/blender/patches/patch-am
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2012/12/03 13:15:51 ryoon Exp $
-
--- source/blender/blenloader/BLO_sys_types.h.orig	2012-10-09 18:40:21.000000000 +0000
-+++ source/blender/blenloader/BLO_sys_types.h
-@@ -123,7 +123,7 @@ unsigned long __attribute__((__stdcall__
- #define ntohl(x) correctByteOrder(x)
- #endif
- #endif
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__)
- #include <sys/param.h>
- #elif defined(__APPLE__)
- #include <sys/types.h>
--- a/graphics/blender/patches/patch-build__files_scons_config_linux-config.py
+++ b/graphics/blender/patches/patch-build__files_scons_config_linux-config.py
@@ -0,0 +1,22 @@
+$NetBSD: patch-build__files_scons_config_linux-config.py,v 1.1 2014/02/01 03:57:52 markd Exp $
+
+--- ./build_files/scons/config/linux-config.py.orig	2013-02-07 14:10:01.000000000 +0000
+++ ./build_files/scons/config/linux-config.py
+@@ -178,7 +178,7 @@ BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/li
+ BF_JEMALLOC_LIB = 'jemalloc'
+ BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
+ 
+-WITH_BF_OIIO = False
+WITH_BF_OIIO = True
+ WITH_BF_STATICOIIO = False
+ BF_OIIO = '/usr'
+ BF_OIIO_INC = '${BF_OIIO}/include'
+@@ -218,7 +218,7 @@ WITH_BF_RAYOPTIMIZATION = True
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+ 
+ #SpaceNavigator and friends
+-WITH_BF_3DMOUSE = True
+WITH_BF_3DMOUSE = False
+ WITH_BF_STATIC3DMOUSE = False
+ BF_3DMOUSE = '/usr'
+ BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
--- a/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py
+++ b/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.2 2013/01/02 02:22:08 ryoon Exp $
+$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.3 2014/01/10 20:06:46 joerg Exp $

 * config file for NetBSD 6

--- build_files/scons/config/netbsd6-config.py.orig	2012-12-22 20:01:05.000000000 +0000
+--- build_files/scons/config/netbsd6-config.py.orig	2013-11-20 14:12:04.000000000 +0000
 +++ build_files/scons/config/netbsd6-config.py
@@ -0,0 +1,227 @@
 +CC = 'gcc'
@@ -185,7 +185,7 @@ $NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.2 2013/01/02 02:2
 +BF_BOOST_LIB_INTERNATIONAL = 'boost_locale'
 +BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 +
-+WITH_BF_OPENMP = True
+WITH_BF_OPENMP = False
 +
 +WITH_GHOST_XDND = False
 +
--- a/graphics/blender/patches/patch-doc_python__api_sphinxdocgen.sh
+++ b/graphics/blender/patches/patch-doc_python__api_sphinxdocgen.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-doc_python__api_sphinx__doc__gen.sh,v 1.2 2013/02/27 15:25:28 ryoon Exp $
+$NetBSD: patch-doc_python__api_sphinx__doc__gen.sh,v 1.3 2013/10/12 22:11:00 ryoon Exp $

 * Improve portability

--- doc/python_api/sphinx_doc_gen.sh.orig	2013-02-20 14:22:36.000000000 +0000
+--- doc/python_api/sphinx_doc_gen.sh.orig	2013-04-19 13:00:21.000000000 +0000
 +++ doc/python_api/sphinx_doc_gen.sh
@@ -32,7 +32,7 @@ blender_version_char=$(grep BLENDER_VERS
 blender_version_cycle=$(grep BLENDER_VERSION_CYCLE $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
--- a/graphics/blender/patches/patch-extern_carve_lib_triangulator.cpp
+++ b/graphics/blender/patches/patch-extern_carve_lib_triangulator.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-extern_carve_lib_triangulator.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- extern/carve/lib/triangulator.cpp.orig	2013-11-20 21:53:04.000000000 +0000
+++ extern/carve/lib/triangulator.cpp
+@@ -122,7 +122,7 @@ namespace {
+     std::vector<vertex_info *> queue;
+ 
+     void checkheap() {
+-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_LIBCPP_VERSION)
+       CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), vertex_info_ordering()));
+ #endif
+     }
--- a/graphics/blender/patches/patch-extern_libmv_libmv_numeric_numeric.h
+++ b/graphics/blender/patches/patch-extern_libmv_libmv_numeric_numeric.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-extern_libmv_libmv_numeric_numeric.h,v 1.1 2012/12/03 13:15:51 ryoon Exp $
+$NetBSD: patch-extern_libmv_libmv_numeric_numeric.h,v 1.2 2013/10/12 22:11:00 ryoon Exp $

--- extern/libmv/libmv/numeric/numeric.h.orig	2012-10-09 18:42:49.000000000 +0000
+--- extern/libmv/libmv/numeric/numeric.h.orig	2013-04-05 09:23:20.000000000 +0000
 +++ extern/libmv/libmv/numeric/numeric.h
@@ -33,7 +33,7 @@
 #include <Eigen/QR>
 #include <Eigen/SVD>
 
 -#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)) && !defined(__MINGW64__)
-+#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(__MINGW64__)
-   void static sincos (double x, double *sinx, double *cosx) {
+#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)  || defined(__NetBSD__)) && !defined(__MINGW64__)
+   static void sincos(double x, double *sinx, double *cosx) {
     *sinx = sin(x);
     *cosx = cos(x);
--- a/graphics/blender/patches/patch-extern_libmv_libmv_tracking_bruteregiontracker.cc
+++ b/graphics/blender/patches/patch-extern_libmv_libmv_tracking_bruteregiontracker.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.1 2012/12/03 13:15:51 ryoon Exp $
+$NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.2 2013/10/12 22:11:00 ryoon Exp $

--- extern/libmv/libmv/tracking/brute_region_tracker.cc.orig	2012-10-09 18:42:52.000000000 +0000
+--- extern/libmv/libmv/tracking/brute_region_tracker.cc.orig	2013-04-05 09:23:20.000000000 +0000
 +++ extern/libmv/libmv/tracking/brute_region_tracker.cc
@@ -24,7 +24,7 @@
 #include <emmintrin.h>
@@ -19,4 +19,4 @@ $NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.1 2012/
 +#elif defined(__FreeBSD__) || defined(__NetBSD__)
   void *result;
 
-   if(posix_memalign(&result, alignment, size)) {
+   if (posix_memalign(&result, alignment, size)) {
--- a/graphics/blender/patches/patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h
+++ b/graphics/blender/patches/patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h
@@ -0,0 +1,44 @@
+$NetBSD: patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- extern/libmv/third_party/ceres/internal/ceres/collections_port.h.orig	2013-11-20 21:36:24.000000000 +0000
+++ extern/libmv/third_party/ceres/internal/ceres/collections_port.h
+@@ -33,11 +33,13 @@
+ #ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_
+ #define CERES_INTERNAL_COLLECTIONS_PORT_H_
+ 
+#include <cstddef>
+
+ #if defined(CERES_NO_TR1)
+ #  include <map>
+ #  include <set>
+ #else
+-#  if defined(_MSC_VER)
+#  if defined(_MSC_VER) || defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+ #    include <unordered_map>
+ #    include <unordered_set>
+ #  else
+@@ -71,11 +73,24 @@ struct HashSet : set<K> {};
+ namespace ceres {
+ namespace internal {
+ 
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#undef CERES_HASH_NAMESPACE_START
+#define CERES_HASH_NAMESPACE_START namespace std {
+#undef CERES_HASH_NAMESPACE_END
+#define CERES_HASH_NAMESPACE_END }
+
+template<typename K, typename V>
+struct HashMap : std::unordered_map<K, V> {};
+
+template<typename K>
+struct HashSet : std::unordered_set<K> {};
+#else
+ template<typename K, typename V>
+ struct HashMap : std::tr1::unordered_map<K, V> {};
+ 
+ template<typename K>
+ struct HashSet : std::tr1::unordered_set<K> {};
+#endif
+ 
+ #if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
+ #define GG_LONGLONG(x) x##I64
--- a/graphics/blender/patches/patch-extern_rangetree_range__tree.hh
+++ b/graphics/blender/patches/patch-extern_rangetree_range__tree.hh
@@ -0,0 +1,17 @@
+$NetBSD: patch-extern_rangetree_range__tree.hh,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- extern/rangetree/range_tree.hh.orig	2013-11-20 21:28:30.000000000 +0000
+++ extern/rangetree/range_tree.hh
+@@ -39,9 +39,9 @@ struct RangeTree {
+ 			return max < v.min;
+ 		}
+ 
+-		const T min;
+-		const T max;
+-		const bool single;
+		T min;
+		T max;
+		bool single;
+ 	};
+ 
+ 	typedef std::set<Range> Tree;
--- a/graphics/blender/patches/patch-intern_cycles_util_util__types.h
+++ b/graphics/blender/patches/patch-intern_cycles_util_util__types.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-intern_cycles_util_util__types.h,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/cycles/util/util_types.h.orig	2013-11-20 21:10:53.000000000 +0000
+++ intern/cycles/util/util_types.h
+@@ -26,6 +26,9 @@
+ /* Qualifiers for kernel code shared by CPU and GPU */
+ 
+ #ifndef __KERNEL_GPU__
+#ifdef __cplusplus
+#include <locale>
+#endif
+ 
+ #define __device static inline
+ #define __device_noinline static
--- a/graphics/blender/patches/patch-intern_guardedalloc_MEMsystypes.h
+++ b/graphics/blender/patches/patch-intern_guardedalloc_MEMsystypes.h
@@ -1,13 +0,0 @@
-$NetBSD: patch-intern_guardedalloc_MEM__sys__types.h,v 1.1 2012/12/03 13:15:52 ryoon Exp $
-
--- intern/guardedalloc/MEM_sys_types.h.orig	2012-10-09 18:34:13.000000000 +0000
-+++ intern/guardedalloc/MEM_sys_types.h
-@@ -131,7 +131,7 @@ unsigned long __attribute__((__stdcall__
- #define ntohl(x) correctByteOrder(x)
- #endif
- #endif
-#elif defined (__FreeBSD__) || defined (__OpenBSD__) 
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
- #include <sys/param.h>
- #elif defined (__APPLE__)
- #include <sys/types.h>
--- a/graphics/blender/patches/patch-intern_itasc_Armature.cpp
+++ b/graphics/blender/patches/patch-intern_itasc_Armature.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-intern_itasc_Armature.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/Armature.cpp.orig	2013-03-18 11:44:56.000000000 +0000
+++ intern/itasc/Armature.cpp
+@@ -402,7 +402,7 @@ bool Armature::finalize()
+ 	m_armlength = 0.0;
+ 	for (i=0; i<m_neffector; i++) {
+ 		length = 0.0;
+-		KDL::SegmentMap::const_iterator sit = m_tree.getSegment(m_effectors[i].name);
+		KDL::SegmentMap::value_type const *sit = m_tree.getSegmentPtr(m_effectors[i].name);
+ 		while (sit->first != "root") {
+ 			Frame tip = sit->second.segment.pose(m_qKdl(sit->second.q_nr));
+ 			length += tip.p.Norm();
--- a/graphics/blender/patches/patch-intern_itasc_kdl_frameacc.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_frameacc.hpp
@@ -0,0 +1,94 @@
+$NetBSD: patch-intern_itasc_kdl_frameacc.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/frameacc.hpp.orig	2013-11-20 15:03:18.000000000 +0000
+++ intern/itasc/kdl/frameacc.hpp
+@@ -78,15 +78,18 @@ public:
+     IMETHOD friend VectorAcc operator / (const VectorAcc& r2,const doubleAcc& r1);
+ 
+ 
+-    IMETHOD friend bool Equal(const VectorAcc& r1,const VectorAcc& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const Vector& r1,const VectorAcc& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const VectorAcc& r1,const Vector& r2,double eps=epsilon);
+    IMETHOD friend bool Equal(const VectorAcc& r1,const VectorAcc& r2,double eps);
+    IMETHOD friend bool Equal(const Vector& r1,const VectorAcc& r2,double eps);
+    IMETHOD friend bool Equal(const VectorAcc& r1,const Vector& r2,double eps);
+     IMETHOD friend VectorAcc operator - (const VectorAcc& r);
+     IMETHOD friend doubleAcc dot(const VectorAcc& lhs,const VectorAcc& rhs);
+     IMETHOD friend doubleAcc dot(const VectorAcc& lhs,const Vector& rhs);
+     IMETHOD friend doubleAcc dot(const Vector& lhs,const VectorAcc& rhs);
+ };
+ 
+bool Equal(const VectorAcc& r1,const VectorAcc& r2,double eps=epsilon);
+bool Equal(const Vector& r1,const VectorAcc& r2,double eps=epsilon);
+bool Equal(const VectorAcc& r1,const Vector& r2,double eps=epsilon);
+ 
+ 
+ class RotationAcc
+@@ -132,15 +135,18 @@ public:
+     IMETHOD friend RotationAcc operator* (const RotationAcc& r1,const RotationAcc& r2);
+     IMETHOD friend RotationAcc operator* (const Rotation& r1,const RotationAcc& r2);
+     IMETHOD friend RotationAcc operator* (const RotationAcc& r1,const Rotation& r2);
+-    IMETHOD friend bool Equal(const RotationAcc& r1,const RotationAcc& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const Rotation& r1,const RotationAcc& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const RotationAcc& r1,const Rotation& r2,double eps=epsilon);
+    IMETHOD friend bool Equal(const RotationAcc& r1,const RotationAcc& r2,double eps);
+    IMETHOD friend bool Equal(const Rotation& r1,const RotationAcc& r2,double eps);
+    IMETHOD friend bool Equal(const RotationAcc& r1,const Rotation& r2,double eps);
+     IMETHOD TwistAcc Inverse(const TwistAcc& arg) const;
+     IMETHOD TwistAcc Inverse(const Twist& arg) const;
+     IMETHOD TwistAcc operator * (const TwistAcc& arg) const;
+     IMETHOD TwistAcc operator * (const Twist& arg) const;
+ };
+ 
+bool Equal(const RotationAcc& r1,const RotationAcc& r2,double eps=epsilon);
+bool Equal(const Rotation& r1,const RotationAcc& r2,double eps=epsilon);
+bool Equal(const RotationAcc& r1,const Rotation& r2,double eps=epsilon);
+ 
+ 
+ 
+@@ -170,9 +176,9 @@ public:
+     IMETHOD friend FrameAcc operator * (const FrameAcc& f1,const FrameAcc& f2);
+     IMETHOD friend FrameAcc operator * (const Frame& f1,const FrameAcc& f2);
+     IMETHOD friend FrameAcc operator * (const FrameAcc& f1,const Frame& f2);
+-    IMETHOD friend bool Equal(const FrameAcc& r1,const FrameAcc& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const Frame& r1,const FrameAcc& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const FrameAcc& r1,const Frame& r2,double eps=epsilon);
+    IMETHOD friend bool Equal(const FrameAcc& r1,const FrameAcc& r2,double eps);
+    IMETHOD friend bool Equal(const Frame& r1,const FrameAcc& r2,double eps);
+    IMETHOD friend bool Equal(const FrameAcc& r1,const Frame& r2,double eps);
+ 
+     IMETHOD TwistAcc  Inverse(const TwistAcc& arg) const;
+     IMETHOD TwistAcc  Inverse(const Twist& arg) const;
+@@ -180,6 +186,9 @@ public:
+     IMETHOD TwistAcc operator * (const Twist& arg) const;
+ };
+ 
+bool Equal(const FrameAcc& r1,const FrameAcc& r2,double eps=epsilon);
+bool Equal(const Frame& r1,const FrameAcc& r2,double eps=epsilon);
+bool Equal(const FrameAcc& r1,const Frame& r2,double eps=epsilon);
+ 
+ 
+ 
+@@ -226,9 +235,9 @@ public:
+      // the new point.
+      // Complexity : 6M+6A
+ 
+-     IMETHOD friend bool Equal(const TwistAcc& a,const TwistAcc& b,double eps=epsilon);
+-     IMETHOD friend bool Equal(const Twist& a,const TwistAcc& b,double eps=epsilon);
+-     IMETHOD friend bool Equal(const TwistAcc& a,const Twist& b,double eps=epsilon);
+     IMETHOD friend bool Equal(const TwistAcc& a,const TwistAcc& b,double eps);
+     IMETHOD friend bool Equal(const Twist& a,const TwistAcc& b,double eps);
+     IMETHOD friend bool Equal(const TwistAcc& a,const Twist& b,double eps);
+ 
+ 
+      IMETHOD Twist GetTwist() const;
+@@ -239,6 +248,9 @@ public:
+ 
+ };
+ 
+bool Equal(const TwistAcc& a,const TwistAcc& b,double eps=epsilon);
+bool Equal(const Twist& a,const TwistAcc& b,double eps=epsilon);
+bool Equal(const TwistAcc& a,const Twist& b,double eps=epsilon);
+ 
+ 
+ 
--- a/graphics/blender/patches/patch-intern_itasc_kdl_frames.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_frames.hpp
@@ -0,0 +1,93 @@
+$NetBSD: patch-intern_itasc_kdl_frames.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/frames.hpp.orig	2013-11-20 14:46:29.000000000 +0000
+++ intern/itasc/kdl/frames.hpp
+@@ -248,10 +248,10 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     inline friend bool Equal(const Vector& a,const Vector& b,double eps=epsilon);
+     inline friend bool Equal(const Vector& a,const Vector& b,double eps);
+ 
+ 	 //! return a normalized vector
+-	 inline friend Vector Normalize(const Vector& a, double eps=epsilon);
+	 inline friend Vector Normalize(const Vector& a, double eps);
+ 
+ 	 //! The literal equality operator==(), also identical.
+      inline friend bool operator==(const Vector& a,const Vector& b);
+@@ -502,7 +502,7 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     friend bool Equal(const Rotation& a,const Rotation& b,double eps=epsilon);
+     friend bool Equal(const Rotation& a,const Rotation& b,double eps);
+ 
+ 	 //! The literal equality operator==(), also identical.
+      friend bool operator==(const Rotation& a,const Rotation& b);
+@@ -663,7 +663,7 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     inline friend bool Equal(const Frame& a,const Frame& b,double eps=epsilon);
+     inline friend bool Equal(const Frame& a,const Frame& b,double eps);
+ 
+ 	 //! The literal equality operator==(), also identical.
+      inline friend bool operator==(const Frame& a,const Frame& b);
+@@ -735,7 +735,7 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     inline friend bool Equal(const Twist& a,const Twist& b,double eps=epsilon);
+     inline friend bool Equal(const Twist& a,const Twist& b,double eps);
+ 
+ 	 //! The literal equality operator==(), also identical.
+      inline friend bool operator==(const Twist& a,const Twist& b);
+@@ -898,7 +898,7 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     inline friend bool Equal(const Wrench& a,const Wrench& b,double eps=epsilon);
+     inline friend bool Equal(const Wrench& a,const Wrench& b,double eps);
+ 
+ 	 //! The literal equality operator==(), also identical.
+      inline friend bool operator==(const Wrench& a,const Wrench& b);
+@@ -979,7 +979,7 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     inline friend bool Equal(const Vector2& a,const Vector2& b,double eps=epsilon);
+     inline friend bool Equal(const Vector2& a,const Vector2& b,double eps);
+ 
+     friend class Rotation2;
+ };
+@@ -1026,7 +1026,7 @@ public:
+ 
+      //! do not use operator == because the definition of Equal(.,.) is slightly
+      //! different.  It compares whether the 2 arguments are equal in an eps-interval
+-     inline friend bool Equal(const Rotation2& a,const Rotation2& b,double eps=epsilon);
+     inline friend bool Equal(const Rotation2& a,const Rotation2& b,double eps);
+ };
+ 
+ //! A 2D frame class, for further documentation see the Frames class
+@@ -1067,9 +1067,20 @@ public:
+         tmp.SetIdentity();
+         return tmp;
+      }
+-     inline friend bool Equal(const Frame2& a,const Frame2& b,double eps=epsilon);
+     inline friend bool Equal(const Frame2& a,const Frame2& b,double eps);
+ };
+ 
+
+Vector Normalize(const Vector& a, double eps=epsilon);
+bool Equal(const Vector& a,const Vector& b,double eps=epsilon);
+bool Equal(const Rotation& a,const Rotation& b,double eps=epsilon);
+bool Equal(const Frame& a,const Frame& b,double eps=epsilon);
+bool Equal(const Twist& a,const Twist& b,double eps=epsilon);
+bool Equal(const Wrench& a,const Wrench& b,double eps=epsilon);
+bool Equal(const Vector2& a,const Vector2& b,double eps=epsilon);
+bool Equal(const Rotation2& a,const Rotation2& b,double eps=epsilon);
+bool Equal(const Frame2& a,const Frame2& b,double eps=epsilon);
+
+ IMETHOD Vector diff(const Vector& a,const Vector& b,double dt=1);
+ IMETHOD Vector diff(const Rotation& R_a_b1,const Rotation& R_a_b2,double dt=1);
+ IMETHOD Twist diff(const Frame& F_a_b1,const Frame& F_a_b2,double dt=1);
--- a/graphics/blender/patches/patch-intern_itasc_kdl_framevel.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_framevel.hpp
@@ -0,0 +1,96 @@
+$NetBSD: patch-intern_itasc_kdl_framevel.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/framevel.hpp.orig	2013-11-20 14:52:47.000000000 +0000
+++ intern/itasc/kdl/framevel.hpp
+@@ -110,15 +110,18 @@ public:
+     IMETHOD friend void SetToZero(VectorVel& v);
+ 
+ 
+-    IMETHOD friend bool Equal(const VectorVel& r1,const VectorVel& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const Vector& r1,const VectorVel& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const VectorVel& r1,const Vector& r2,double eps=epsilon);
+    IMETHOD friend bool Equal(const VectorVel& r1,const VectorVel& r2,double eps);
+    IMETHOD friend bool Equal(const Vector& r1,const VectorVel& r2,double eps);
+    IMETHOD friend bool Equal(const VectorVel& r1,const Vector& r2,double eps);
+     IMETHOD friend VectorVel operator - (const VectorVel& r);
+     IMETHOD friend doubleVel dot(const VectorVel& lhs,const VectorVel& rhs);
+     IMETHOD friend doubleVel dot(const VectorVel& lhs,const Vector& rhs);
+     IMETHOD friend doubleVel dot(const Vector& lhs,const VectorVel& rhs);
+ };
+ 
+bool Equal(const VectorVel& r1,const VectorVel& r2,double eps=epsilon);
+bool Equal(const Vector& r1,const VectorVel& r2,double eps=epsilon);
+bool Equal(const VectorVel& r1,const Vector& r2,double eps=epsilon);
+ 
+ 
+ class RotationVel
+@@ -166,9 +169,9 @@ public:
+     IMETHOD friend RotationVel operator* (const RotationVel& r1,const RotationVel& r2);
+     IMETHOD friend RotationVel operator* (const Rotation& r1,const RotationVel& r2);
+     IMETHOD friend RotationVel operator* (const RotationVel& r1,const Rotation& r2);
+-    IMETHOD friend bool Equal(const RotationVel& r1,const RotationVel& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const Rotation& r1,const RotationVel& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const RotationVel& r1,const Rotation& r2,double eps=epsilon);
+    IMETHOD friend bool Equal(const RotationVel& r1,const RotationVel& r2,double eps);
+    IMETHOD friend bool Equal(const Rotation& r1,const RotationVel& r2,double eps);
+    IMETHOD friend bool Equal(const RotationVel& r1,const Rotation& r2,double eps);
+ 
+     IMETHOD TwistVel Inverse(const TwistVel& arg) const;
+     IMETHOD TwistVel Inverse(const Twist& arg) const;
+@@ -176,6 +179,9 @@ public:
+     IMETHOD TwistVel operator * (const Twist& arg) const;
+ };
+ 
+bool Equal(const RotationVel& r1,const RotationVel& r2,double eps=epsilon);
+bool Equal(const Rotation& r1,const RotationVel& r2,double eps=epsilon);
+bool Equal(const RotationVel& r1,const Rotation& r2,double eps=epsilon);
+ 
+ 
+ 
+@@ -220,9 +226,9 @@ public:
+     IMETHOD friend FrameVel operator * (const FrameVel& f1,const FrameVel& f2);
+     IMETHOD friend FrameVel operator * (const Frame& f1,const FrameVel& f2);
+     IMETHOD friend FrameVel operator * (const FrameVel& f1,const Frame& f2);
+-    IMETHOD friend bool Equal(const FrameVel& r1,const FrameVel& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const Frame& r1,const FrameVel& r2,double eps=epsilon);
+-    IMETHOD friend bool Equal(const FrameVel& r1,const Frame& r2,double eps=epsilon);
+    IMETHOD friend bool Equal(const FrameVel& r1,const FrameVel& r2,double eps);
+    IMETHOD friend bool Equal(const Frame& r1,const FrameVel& r2,double eps);
+    IMETHOD friend bool Equal(const FrameVel& r1,const Frame& r2,double eps);
+ 
+     IMETHOD TwistVel  Inverse(const TwistVel& arg) const;
+     IMETHOD TwistVel  Inverse(const Twist& arg) const;
+@@ -230,6 +236,9 @@ public:
+     IMETHOD TwistVel operator * (const Twist& arg) const;
+ };
+ 
+bool Equal(const FrameVel& r1,const FrameVel& r2,double eps=epsilon);
+bool Equal(const Frame& r1,const FrameVel& r2,double eps=epsilon);
+bool Equal(const FrameVel& r1,const Frame& r2,double eps=epsilon);
+ 
+ 
+ 
+@@ -292,9 +301,9 @@ public:
+      // = Equality operators
+      // do not use operator == because the definition of Equal(.,.) is slightly
+      // different.  It compares whether the 2 arguments are equal in an eps-interval
+-     IMETHOD friend bool Equal(const TwistVel& a,const TwistVel& b,double eps=epsilon);
+-     IMETHOD friend bool Equal(const Twist& a,const TwistVel& b,double eps=epsilon);
+-     IMETHOD friend bool Equal(const TwistVel& a,const Twist& b,double eps=epsilon);
+     IMETHOD friend bool Equal(const TwistVel& a,const TwistVel& b,double eps);
+     IMETHOD friend bool Equal(const Twist& a,const TwistVel& b,double eps);
+     IMETHOD friend bool Equal(const TwistVel& a,const Twist& b,double eps);
+ 
+ // = Conversion to other entities
+      IMETHOD Twist GetTwist() const;
+@@ -305,6 +314,10 @@ public:
+ 
+ };
+ 
+bool Equal(const TwistVel& a,const TwistVel& b,double eps=epsilon);
+bool Equal(const Twist& a,const TwistVel& b,double eps=epsilon);
+bool Equal(const TwistVel& a,const Twist& b,double eps=epsilon);
+
+ IMETHOD VectorVel diff(const VectorVel& a,const VectorVel& b,double dt=1.0) {
+ 	return VectorVel(diff(a.p,b.p,dt),diff(a.v,b.v,dt));
+ }
--- a/graphics/blender/patches/patch-intern_itasc_kdl_jacobian.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_jacobian.hpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-intern_itasc_kdl_jacobian.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/jacobian.hpp.orig	2013-11-20 14:57:39.000000000 +0000
+++ intern/itasc/kdl/jacobian.hpp
+@@ -45,7 +45,7 @@ namespace KDL
+         bool operator ==(const Jacobian& arg);
+         bool operator !=(const Jacobian& arg);
+         
+-        friend bool Equal(const Jacobian& a,const Jacobian& b,double eps=epsilon);
+        friend bool Equal(const Jacobian& a,const Jacobian& b,double eps);
+         
+ 
+         ~Jacobian();
+@@ -63,6 +63,9 @@ namespace KDL
+ 
+ 
+     };
+
+    bool Equal(const Jacobian& a,const Jacobian& b,double eps=epsilon);
+ }
+ 
+
+ #endif
--- a/graphics/blender/patches/patch-intern_itasc_kdl_jntarray.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_jntarray.hpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-intern_itasc_kdl_jntarray.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/jntarray.hpp.orig	2013-11-20 14:54:27.000000000 +0000
+++ intern/itasc/kdl/jntarray.hpp
+@@ -209,12 +209,13 @@ class MyTask : public RTT::TaskContext
+          * @return true if each element of src1 is within eps of the same
+ 		 * element in src2, or if both src1 and src2 have no data (ie 0==rows())
+          */
+-        friend bool Equal(const JntArray& src1,const JntArray& src2,double eps=epsilon);
+        friend bool Equal(const JntArray& src1,const JntArray& src2,double eps);
+ 
+         friend bool operator==(const JntArray& src1,const JntArray& src2);
+         //friend bool operator!=(const JntArray& src1,const JntArray& src2);
+         };
+ 
+    bool Equal(const JntArray& src1,const JntArray& src2,double eps=epsilon);
+     bool operator==(const JntArray& src1,const JntArray& src2);
+     //bool operator!=(const JntArray& src1,const JntArray& src2);
+ 
--- a/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayacc.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayacc.hpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-intern_itasc_kdl_jntarrayacc.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/jntarrayacc.hpp.orig	2013-11-20 15:09:06.000000000 +0000
+++ intern/itasc/kdl/jntarrayacc.hpp
+@@ -58,9 +58,11 @@ namespace KDL
+         friend void Divide(const JntArrayAcc& src,const doubleVel& factor,JntArrayAcc& dest);
+         friend void Divide(const JntArrayAcc& src,const doubleAcc& factor,JntArrayAcc& dest);
+         friend void SetToZero(JntArrayAcc& array);
+-        friend bool Equal(const JntArrayAcc& src1,const JntArrayAcc& src2,double eps=epsilon);
+        friend bool Equal(const JntArrayAcc& src1,const JntArrayAcc& src2,double eps);
+ 
+     };
+
+    bool Equal(const JntArrayAcc& src1,const JntArrayAcc& src2,double eps=epsilon);
+ }
+ 
+ #endif
--- a/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayvel.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayvel.hpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-intern_itasc_kdl_jntarrayvel.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/jntarrayvel.hpp.orig	2013-11-20 15:08:46.000000000 +0000
+++ intern/itasc/kdl/jntarrayvel.hpp
+@@ -51,9 +51,11 @@ namespace KDL
+         friend void Divide(const JntArrayVel& src,const double& factor,JntArrayVel& dest);
+         friend void Divide(const JntArrayVel& src,const doubleVel& factor,JntArrayVel& dest);
+         friend void SetToZero(JntArrayVel& array);
+-        friend bool Equal(const JntArrayVel& src1,const JntArrayVel& src2,double eps=epsilon);
+        friend bool Equal(const JntArrayVel& src1,const JntArrayVel& src2,double eps);
+ 
+     };
+
+    bool Equal(const JntArrayVel& src1,const JntArrayVel& src2,double eps=epsilon);
+ }
+ 
+ #endif
--- a/graphics/blender/patches/patch-intern_itasc_kdl_tree.cpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_tree.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-intern_itasc_kdl_tree.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/tree.cpp.orig	2012-06-03 12:00:41.000000000 +0000
+++ intern/itasc/kdl/tree.cpp
+@@ -64,7 +64,7 @@ bool Tree::addSegment(const Segment& seg
+         return false;
+     pair<SegmentMap::iterator, bool> retval;
+     //insert new element
+-	TreeElement elem(segment, parent, nrOfJoints);
+	TreeElement elem(segment, *parent, nrOfJoints);
+ 	std::pair<std::string, TreeElement> val(segment_name, elem);
+ 
+     retval = segments.insert(val);
--- a/graphics/blender/patches/patch-intern_itasc_kdl_tree.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_tree.hpp
@@ -0,0 +1,59 @@
+$NetBSD: patch-intern_itasc_kdl_tree.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/tree.hpp.orig	2012-12-15 11:15:05.000000000 +0000
+++ intern/itasc/kdl/tree.hpp
+@@ -41,32 +41,28 @@ namespace KDL
+ {
+     //Forward declaration
+     class TreeElement;
+-#if defined(__APPLE__)
+-#  if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050
+#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= 1050
+     typedef std::map<std::string,TreeElement> SegmentMap;
+-#  else
+-    // Eigen allocator is needed for alignment of Eigen data types
+-    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
+-#  endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
+ #else
+     // Eigen allocator is needed for alignment of Eigen data types
+     typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
+ #endif
+
+     class TreeElement
+     {
+     public:
+-        TreeElement():q_nr(0)
+        TreeElement():q_nr(0),parent(0)
+         {};
+     public:
+         Segment segment;
+         unsigned int q_nr;
+-        SegmentMap::const_iterator  parent;
+        SegmentMap::value_type const *parent;
+         std::vector<SegmentMap::const_iterator > children;
+-        TreeElement(const Segment& segment_in,const SegmentMap::const_iterator& parent_in,unsigned int q_nr_in)
+        TreeElement(const Segment& segment_in,const SegmentMap::value_type& parent_in,unsigned int q_nr_in)
+         {
+ 			q_nr=q_nr_in;
+             segment=segment_in;
+-            parent=parent_in;
+            parent=&parent_in;
+         };
+         static TreeElement Root()
+         {
+@@ -167,7 +163,15 @@ namespace KDL
+             return segments.find(segment_name);
+         };
+ 
+        SegmentMap::value_type const* getSegmentPtr(const std::string& segment_name)const
+        {
+            SegmentMap::const_iterator it = segments.find(segment_name);
+            
+            if (it == segments.end())
+                return 0;
+ 
+            return &*it;
+        };
+ 
+         const SegmentMap& getSegments()const
+         {
--- a/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.cpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.cpp
@@ -0,0 +1,44 @@
+$NetBSD: patch-intern_itasc_kdl_treefksolverpos__recursive.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/treefksolverpos_recursive.cpp.orig	2011-10-23 18:38:16.000000000 +0000
+++ intern/itasc/kdl/treefksolverpos_recursive.cpp
+@@ -35,22 +35,22 @@ namespace KDL {
+ 
+     int TreeFkSolverPos_recursive::JntToCart(const JntArray& q_in, Frame& p_out, const std::string& segmentName, const std::string& baseName)
+     {      
+-		SegmentMap::const_iterator it = tree.getSegment(segmentName); 
+-		SegmentMap::const_iterator baseit = tree.getSegment(baseName); 
+		SegmentMap::value_type const* it = tree.getSegmentPtr(segmentName); 
+		SegmentMap::value_type const* baseit = tree.getSegmentPtr(baseName); 
+         
+         if(q_in.rows() != tree.getNrOfJoints())
+     	    	return -1;
+-        else if(it == tree.getSegments().end()) //if the segment name is not found
+        else if(!it) //if the segment name is not found
+          	return -2;
+-        else if(baseit == tree.getSegments().end()) //if the base segment name is not found
+        else if(!baseit) //if the base segment name is not found
+          	return -3;
+         else{
+-			p_out = recursiveFk(q_in, it, baseit);	
+-        	return 0;        	
+			p_out = recursiveFk(q_in, it, baseit);
+        	return 0;
+         }
+     }
+ 
+-	Frame TreeFkSolverPos_recursive::recursiveFk(const JntArray& q_in, const SegmentMap::const_iterator& it, const SegmentMap::const_iterator& baseit)
+	Frame TreeFkSolverPos_recursive::recursiveFk(const JntArray& q_in, SegmentMap::value_type const* it, SegmentMap::value_type const* baseit)
+ 	{
+ 		//gets the frame for the current element (segment)
+ 		const TreeElement& currentElement = it->second;
+@@ -60,8 +60,7 @@ namespace KDL {
+ 		}
+ 		else{
+ 			Frame currentFrame = currentElement.segment.pose(((JntArray&)q_in)(currentElement.q_nr));
+-			SegmentMap::const_iterator parentIt = currentElement.parent;
+-			return recursiveFk(q_in, parentIt, baseit) * currentFrame;
+			return recursiveFk(q_in, currentElement.parent, baseit) * currentFrame;
+ 		}
+ 	}
+ 
--- a/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.hpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-intern_itasc_kdl_treefksolverpos__recursive.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/treefksolverpos_recursive.hpp.orig	2009-07-14 15:36:21.000000000 +0000
+++ intern/itasc/kdl/treefksolverpos_recursive.hpp
+@@ -45,7 +45,7 @@ namespace KDL {
+     private:
+         const Tree tree;
+         
+-        Frame recursiveFk(const JntArray& q_in, const SegmentMap::const_iterator& it, const SegmentMap::const_iterator& baseit);
+        Frame recursiveFk(const JntArray& q_in, SegmentMap::value_type const* it, SegmentMap::value_type const* baseit);
+     };
+ 
+ }
--- a/graphics/blender/patches/patch-intern_itasc_kdl_treejnttojacsolver.cpp
+++ b/graphics/blender/patches/patch-intern_itasc_kdl_treejnttojacsolver.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-intern_itasc_kdl_treejnttojacsolver.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $
+
+--- intern/itasc/kdl/treejnttojacsolver.cpp.orig	2011-10-23 18:38:16.000000000 +0000
+++ intern/itasc/kdl/treejnttojacsolver.cpp
+@@ -28,16 +28,16 @@ int TreeJntToJacSolver::JntToJac(const J
+         return -1;
+ 
+     //Lets search the tree-element
+-    SegmentMap::const_iterator it = tree.getSegments().find(segmentname);
+    SegmentMap::value_type const* it = tree.getSegmentPtr(segmentname);
+ 
+     //If segmentname is not inside the tree, back out:
+-    if (it == tree.getSegments().end())
+    if (!it)
+         return -2;
+ 
+     //Let's make the jacobian zero:
+     SetToZero(jac);
+ 
+-    SegmentMap::const_iterator root = tree.getSegments().find("root");
+    SegmentMap::value_type const* root = tree.getSegmentPtr("root");
+ 
+     Frame T_total = Frame::Identity();
+ 	Frame T_local, T_joint;
--- a/graphics/blender/patches/patch-intern_opennl_superlu_superlusystypes.h
+++ b/graphics/blender/patches/patch-intern_opennl_superlu_superlusystypes.h
@@ -1,13 +0,0 @@
-$NetBSD: patch-intern_opennl_superlu_superlu__sys__types.h,v 1.1 2012/12/03 13:15:52 ryoon Exp $
-
--- intern/opennl/superlu/superlu_sys_types.h.orig	2012-10-09 18:34:26.000000000 +0000
-+++ intern/opennl/superlu/superlu_sys_types.h
-@@ -119,7 +119,7 @@ unsigned long __attribute__((__stdcall__
- #define ntohl(x) correctByteOrder(x)
- #endif
- #endif
-#elif defined (__FreeBSD__) || defined (__OpenBSD__) 
-+#elif defined (__FreeBSD__) || defined (__OpenBSD__)  || defined (__NetBSD__)
- #include <sys/param.h>
- #elif defined (__APPLE__)
- #include <sys/types.h>
--- a/graphics/blinkenthemes/Makefile
+++ b/graphics/blinkenthemes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2013/06/06 12:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/10 14:42:12 ryoon Exp $
 #

 DISTNAME=	blinkenthemes-0.8
-PKGREVISION=	22
+PKGREVISION=	24
 CATEGORIES=	graphics
 MASTER_SITES=	http://sven.gimp.org/blinkenlights/old/

--- a/graphics/blinkentools/Makefile
+++ b/graphics/blinkentools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/06/06 12:54:27 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2013/10/10 14:42:12 ryoon Exp $
 #

 DISTNAME=		blinkentools-2.2
-PKGREVISION=		24
+PKGREVISION=		27
 CATEGORIES=		graphics
 MASTER_SITES=		http://sven.gimp.org/blinkenlights/old/

--- a/graphics/cairo-gobject/DESCR
+++ b/graphics/cairo-gobject/DESCR
@@ -9,7 +9,7 @@ Render Extension).

 The cairo API provides operations similar to the drawing operators of
 PostScript and PDF. Operations in cairo including stroking and filling cubic
-Bézier splines, transforming and compositing translucent images, and
+Bezier splines, transforming and compositing translucent images, and
 antialiased text rendering. All drawing operations can be transformed by any
 affine transformation (scale, rotation, shear, etc.)

--- a/graphics/cairo-gobject/Makefile
+++ b/graphics/cairo-gobject/Makefile
@@ -1,58 +1,21 @@
-# $NetBSD: Makefile,v 1.26 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/31 22:19:32 adam Exp $
+
+.include "../../graphics/cairo/Makefile.common"

-DISTNAME=	cairo-1.12.14
 PKGNAME=	${DISTNAME:S/-/-gobject-/}
-PKGREVISION=	4
-CATEGORIES=	graphics
-MASTER_SITES=	http://cairographics.org/releases/
-EXTRACT_SUFX=	.tar.xz

-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cairographics.org/
-COMMENT=	Vector graphics library with cross-device output support
-LICENSE=	gnu-lgpl-v2.1 AND mpl-1.1
-
-PATCHDIR=	${.CURDIR}/../../graphics/cairo/patches
-DISTINFO_FILE=	${.CURDIR}/../../graphics/cairo/distinfo
 BUILD_DIRS=	util/cairo-gobject
 INSTALL_DIRS=	util/cairo-gobject

-USE_LANGUAGES+=		c99
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config
-PKGCONFIG_OVERRIDE+=	src/cairo.pc.in src/cairo-features.pc.in
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-pdf
-CONFIGURE_ARGS+=	--enable-ps
-
 INSTALLATION_DIRS+=	lib/pkgconfig

-.include "options.mk"
-
-# For snprintf() and ctime_r()
-CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
-
-# PR#43928
-.include "../../mk/compiler.mk"
-.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
-CONFIGURE_ENV+=		ac_cv_type___uint128_t=no
-.endif
+.include "../../mk/bsd.prefs.mk"

 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/cairo-gobject.pc \
 		${DESTDIR}${PREFIX}/lib/pkgconfig

-.include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.9
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-# include?
-#.include "../../print/libspectre/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/graphics/cairo-gobject/buildlink3.mk
+++ b/graphics/cairo-gobject/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2013/09/02 19:50:39 adam Exp $

 BUILDLINK_TREE+=	cairo-gobject

@@ -6,16 +6,11 @@ BUILDLINK_TREE+=	cairo-gobject
 CAIRO_GOBJECT_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.10.2
-BUILDLINK_ABI_DEPENDS.cairo-gobject+=	cairo-gobject>=1.12.14nb4
+BUILDLINK_ABI_DEPENDS.cairo-gobject+=	cairo-gobject>=1.12.16
 BUILDLINK_PKGSRCDIR.cairo-gobject?=	../../graphics/cairo-gobject

-.include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .endif	# CAIRO_GOBJECT_BUILDLINK3_MK

 BUILDLINK_TREE+=	-cairo-gobject
--- a/graphics/cairo-gobject/options.mk
+++ b/graphics/cairo-gobject/options.mk
@@ -1,26 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2013/05/05 13:44:23 spz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo-gobject
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		x11
-
-###
-### decide between Quartz, GL or nothing
-###
-.if exists(/System/Library/Frameworks/Carbon.framework)
-CONFIGURE_ARGS+=        --enable-quartz
-CONFIGURE_ARGS+=        --enable-quartz-font
-CONFIGURE_ARGS+=        --enable-quartz-image
-CONFIGURE_ARGS+=        --disable-gl
-CONFIGURE_ARGS+=        --disable-xlib
-CONFIGURE_ARGS+=        --disable-xlib-xrender
-.else
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=	--enable-gl
-.endif
-.endif
-
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,50 +1,16 @@
-# $NetBSD: Makefile,v 1.129 2013/06/05 08:13:56 tron Exp $
+# $NetBSD: Makefile,v 1.132 2014/02/12 23:17:59 tron Exp $

-DISTNAME=	cairo-1.12.14
-PKGREVISION=	4
-CATEGORIES=	graphics
-MASTER_SITES=	http://cairographics.org/releases/
-EXTRACT_SUFX=	.tar.xz
+.include "../../graphics/cairo/Makefile.common"

-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cairographics.org/
-COMMENT=	Vector graphics library with cross-device output support
-LICENSE=	gnu-lgpl-v2.1 AND mpl-1.1
-
-USE_LANGUAGES=		c99
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-gl
-CONFIGURE_ARGS+=	--enable-pdf
-CONFIGURE_ARGS+=	--enable-ps
-CONFIGURE_ARGS+=	--enable-tee
-
-PKGCONFIG_OVERRIDE+=	src/cairo.pc.in
-PKGCONFIG_OVERRIDE+=	src/cairo-features.pc.in
-
-.include "options.mk"
-
-.if exists(/System/Library/Frameworks/Carbon.framework)
-CONFIGURE_ARGS+=	--enable-quartz
-CONFIGURE_ARGS+=	--enable-quartz-font
-CONFIGURE_ARGS+=	--enable-quartz-image
-PLIST.carbon=		yes
-.endif
-
-# For snprintf() and ctime_r()
-CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+PKGREVISION=			1

 TEST_TARGET=			check

-# PR#43928
-.include "../../mk/compiler.mk"
-.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
-CONFIGURE_ENV+=		ac_cv_type___uint128_t=no
-.endif
+.include "options.mk"

+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.2.95
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.9
 .include "../../graphics/freetype2/buildlink3.mk"
--- a/graphics/cairo/Makefile.common
+++ b/graphics/cairo/Makefile.common
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile.common,v 1.1 2013/08/31 22:19:32 adam Exp $
+#
+# used by graphics/cairo/Makefile
+# used by graphics/cairo-gobject/Makefile
+
+DISTNAME=	cairo-1.12.16
+CATEGORIES=	graphics
+MASTER_SITES=	http://cairographics.org/releases/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER?=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://cairographics.org/
+COMMENT=	Vector graphics library with cross-device output support
+LICENSE=	gnu-lgpl-v2.1 AND mpl-1.1
+
+DISTINFO_FILE=	${.CURDIR}/../../graphics/cairo/distinfo
+PATCHDIR=	${.CURDIR}/../../graphics/cairo/patches
+
+USE_LANGUAGES=		c99
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+# does not build against NetBSD-5's MesaLib, and is according
+# to upstream, only used by "toy applications"
+CONFIGURE_ARGS+=	--disable-gl
+CONFIGURE_ARGS+=	--enable-fc
+CONFIGURE_ARGS+=	--enable-pdf
+CONFIGURE_ARGS+=	--enable-ps
+CONFIGURE_ARGS+=	--enable-tee
+
+PKGCONFIG_OVERRIDE+=	src/cairo.pc.in
+PKGCONFIG_OVERRIDE+=	src/cairo-features.pc.in
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=		quartz
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--enable-quartz
+CONFIGURE_ARGS+=	--enable-quartz-font
+CONFIGURE_ARGS+=	--enable-quartz-image
+PLIST.quartz=		yes
+.endif
+
+# For snprintf() and ctime_r()
+CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+
+# PR#43928
+.include "../../mk/compiler.mk"
+.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
+CONFIGURE_ENV+=		ac_cv_type___uint128_t=no
+.endif
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.33 2012/11/01 08:54:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.34 2013/08/31 22:19:32 adam Exp $
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
-${PLIST.carbon}include/cairo/cairo-quartz.h
-${PLIST.carbon}include/cairo/cairo-quartz-image.h
+${PLIST.quartz}include/cairo/cairo-quartz.h
+${PLIST.quartz}include/cairo/cairo-quartz-image.h
 include/cairo/cairo-script-interpreter.h
 include/cairo/cairo-script.h
 include/cairo/cairo-svg.h
@@ -25,9 +25,9 @@ lib/pkgconfig/cairo-ft.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
-${PLIST.carbon}lib/pkgconfig/cairo-quartz-font.pc
-${PLIST.carbon}lib/pkgconfig/cairo-quartz-image.pc
-${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc
+${PLIST.quartz}lib/pkgconfig/cairo-quartz-font.pc
+${PLIST.quartz}lib/pkgconfig/cairo-quartz-image.pc
+${PLIST.quartz}lib/pkgconfig/cairo-quartz.pc
 lib/pkgconfig/cairo-script.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-tee.pc
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.49 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.50 2013/08/31 22:19:32 adam Exp $

 BUILDLINK_TREE+=	cairo

@@ -26,6 +26,8 @@ pkgbase := cairo
 .include "../../x11/libXrender/buildlink3.mk"
 .endif

+.include "../../archivers/lzo/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.75 2013/02/12 20:08:29 wiz Exp $
+$NetBSD: distinfo,v 1.76 2013/08/31 22:19:32 adam Exp $

-SHA1 (cairo-1.12.14.tar.xz) = 9106ab09b2e7b9f90521b18dd4a7e9577eba6c15
-RMD160 (cairo-1.12.14.tar.xz) = 8198930d820f91480b69c8736b5b090b1a2e3100
-Size (cairo-1.12.14.tar.xz) = 42132464 bytes
+SHA1 (cairo-1.12.16.tar.xz) = 4f6e337d5d3edd7ea79d1426f575331552b003ec
+RMD160 (cairo-1.12.16.tar.xz) = 379283c2f5c9690bdfd69c629b8efd59be7a8670
+Size (cairo-1.12.16.tar.xz) = 35889824 bytes
 SHA1 (patch-aa) = b01bc60f77a7122b0c0d0d9b25ad512bac7c190c
 SHA1 (patch-ab) = 11f7e0e59bd5c51a8fdacb48dcf2f2fefdf3b768
 SHA1 (patch-ac) = 1785bbef6bcab4781bf89e1b986a7eb96e5f2b64
--- a/graphics/cairo/options.mk
+++ b/graphics/cairo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2013/06/05 08:13:56 tron Exp $
+# $NetBSD: options.mk,v 1.15 2013/08/31 22:19:32 adam Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS=	x11 xcb
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=	x11 xcb

 .include "../../mk/bsd.options.mk"

-PLIST_VARS+=		carbon x11 xcb
+PLIST_VARS+=		x11 xcb

 ###
 ### X11 and XCB support (XCB implies X11)
@@ -14,25 +14,23 @@ PLIST_VARS+=		carbon x11 xcb
 .if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
 CONFIGURE_ARGS+=	--enable-xlib
 CONFIGURE_ARGS+=	--enable-xlib-xrender
-# does not build against NetBSD-5's MesaLib, and is according
-# to upstream, only used by "toy applications"
-CONFIGURE_ARGS+=	--disable-gl
 PLIST.x11=		yes
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXt?=	build # only for configure
+BUILDLINK_DEPMETHOD.libXt+=	build # only for configure
 .include "../../x11/libXt/buildlink3.mk"

 .  if !empty(PKG_OPTIONS:Mxcb)
 CONFIGURE_ARGS+=	--enable-xcb
 PLIST.xcb=		yes
 .  include "../../x11/libxcb/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--enable-xcb=no
 .  endif

 .else
-CONFIGURE_ARGS+=	--disable-gl
 CONFIGURE_ARGS+=	--disable-xlib
 CONFIGURE_ARGS+=	--disable-xlib-xrender
 .endif
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: Makefile,v 1.28 2013/09/02 19:50:39 adam Exp $

 DISTNAME=	cairomm-1.10.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/

--- a/graphics/cairomm/buildlink3.mk
+++ b/graphics/cairomm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/06/04 22:16:14 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/09/02 19:50:39 adam Exp $

 BUILDLINK_TREE+=	cairomm

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	cairomm
 CAIROMM_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.cairomm+=	cairomm>=1.2.2
-BUILDLINK_ABI_DEPENDS.cairomm+=	cairomm>=1.10.0nb8
+BUILDLINK_ABI_DEPENDS.cairomm+=	cairomm>=1.10.0nb9
 BUILDLINK_PKGSRCDIR.cairomm?=	../../graphics/cairomm

 .include "../../graphics/cairo/buildlink3.mk"
--- a/graphics/cal3d-examples/distinfo
+++ b/graphics/cal3d-examples/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/01/26 22:01:24 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/08/31 14:49:40 joerg Exp $

 SHA1 (TheCallyDemo-0.9.1b.zip) = e4d1d4b14504e0971f5cb56e7daa1133f62ad2b8
 RMD160 (TheCallyDemo-0.9.1b.zip) = bbcb4dec803b754a55d0318aa3c6eb8656dc309b
@@ -10,11 +10,15 @@ SHA1 (patch-ab) = 74ca6b1b75016253bd45e38ba09fce1f2f7573f1
 SHA1 (patch-ac) = 7c71ee949fecf2755d0461962075dda496a6bc51
 SHA1 (patch-ad) = 3128f69512bf3c88d1b04b2f10c9b0ee6660a8df
 SHA1 (patch-ae) = b5e6552950208c996e74bef982b9d2b3a7b06aee
+SHA1 (patch-autogen.sh) = dd32770bac6ae94d75ec6316190918c2a3d79761
+SHA1 (patch-examples_cally_autogen.sh) = b7b20a95d6680821c4e4f720402ae03c25025a99
 SHA1 (patch-examples_cally_configure.in) = 5b165efc254179bde309a12afa66159c1a5ce8bd
 SHA1 (patch-examples_cally_src_demo.h) = e3bde0785970183dba1d3f360b50c73da49f1812
 SHA1 (patch-examples_cally_src_model.cpp) = 4bba658d7ec766033af69b4b9ce10fad13984560
+SHA1 (patch-examples_miniviewer__gl_autogen.sh) = 27807cc2181bc131595cabb8f89daedbe17979f7
 SHA1 (patch-examples_miniviewer__gl_configure.in) = a17ec7755f8fe2f91717673fcad8abf0da4ef22f
 SHA1 (patch-examples_miniviewer__gl_src_viewer.cpp) = f44a9f26f52efcfb03a9907c6d24c7f33ff72f55
 SHA1 (patch-examples_miniviewer__gl_src_viewer.h) = 19dae4f8bdab3d4de0bc4c08844b00aa9f728779
+SHA1 (patch-tools_converter_autogen.sh) = 6873251f0f96431accd29daa956addfbc188deac
 SHA1 (patch-tools_converter_configure.in) = 4c16aaff687658c30011650fd87cf65119595a35
 SHA1 (patch-tools_converter_src_main.cpp) = da8a3915ae45d2dcaf7549708c71fe40733f1e9e
--- a/Show More
+++ b/Show More