author: Baptiste Daroussin <bapt@FreeBSD.org> 2013-01-31 13:38:42 +0000
committer: Baptiste Daroussin <bapt@FreeBSD.org> 2013-01-31 13:38:42 +0000
commit: f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d (patch)
tree: 384a6fe89b7bf8bffcc478f3462d538eea755790 /graphics
parent: 49be72eaa4585216ade79b274fca337c2bf4866a (diff)
download: ports-f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d.tar.gz
ports-f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d.zip
26 files changed, 814 insertions, 98 deletions
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 0a7ae383aeb1..5c82f7a80a70 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	gnome-colorscheme
-# Date created:				30 August 2005
-# Whom:					Piotr Smyrak <smyru@heron.pl>
-#
+# Created by: Piotr Smyrak <smyru@heron.pl>
 # $FreeBSD$
-#
 
 PORTNAME=	agave
 PORTVERSION=	0.4.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 
@@ -15,7 +11,7 @@ MAINTAINER=	smyru@heron.pl
 COMMENT=	A color scheme builder for the GNOME desktop
 
 LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs
+		boost_thread:${PORTSDIR}/devel/boost-libs
 
 # --disable-gnome option is broken in 0.4.2
 #OPTIONS=	GNOME	"Adds GNOME support"	on
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 95f2b8455e15..6d77aeb18df6 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,14 +1,9 @@
-# ex:ts=8
-# Ports collection Makefile for:	aqsis
-# Date created:			Sep 12, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	aqsis
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
@@ -21,7 +16,7 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
-    		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
+    		boost_filesystem:${PORTSDIR}/devel/boost-libs \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 0ed1bd9716b2..0eee00318c14 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.65a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 1c97c1a2a63b..cd1dd3357fb2 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	enblend
-# Date created:			19 september 2004
-# Whom:				cartola@openit.com.br
-#
+# Created by: cartola@openit.com.br
 # $FreeBSD$
-#
 
 PORTNAME=	enblend
 PORTVERSION=	4.0
@@ -16,13 +12,13 @@ DISTNAME=	enblend-enfuse-${PORTVERSION}
 MAINTAINER=	grog@FreeBSD.org
 COMMENT=	A tool for image blending with multiresolution splines
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/pool/pool.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \
 		OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		lcms:${PORTSDIR}/graphics/lcms \
 		xmi:${PORTSDIR}/graphics/plotutils \
-		tiff:${PORTSDIR}/graphics/tiff
+		tiff:${PORTSDIR}/graphics/tiff \
+		boost_filesystem:${PORTSDIR}/devel/boost-libs
 RUN_DEPENDS=	OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
 
 WRKSRC=		${WRKDIR}/enblend-enfuse-4.0-753b534c819d
@@ -39,6 +35,8 @@ CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo"
 USE_GCC=	4.4+
 USE_GL=		glew glut
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	"LIBS=-lboost_system"
+CONFIGURE_ARGS+=	--with-boost-filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/graphics/enblend/files/patch-boost-1.52 b/graphics/enblend/files/patch-boost-1.52
new file mode 100644
index 000000000000..c9827eb53d29
--- /dev/null
+++ b/graphics/enblend/files/patch-boost-1.52
@@ -0,0 +1,125 @@
+--- src/filenameparse.cc	Tue Mar 15 18:52:46 2011 +0100
++++ src/filenameparse.cc	Sat Apr 09 20:17:05 2011 -0700
+@@ -50,7 +50,7 @@
+ #ifdef HAVE_BOOST_FILESYSTEM
+ #include <boost/filesystem.hpp>
+ 
+-typedef boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> basic_path;
++//typedef boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> basic_path;
+ #endif
+ 
+ 
+@@ -60,7 +60,7 @@
+ isRelativePath(const std::string& aFilename)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    const basic_path path(aFilename);
++    const boost::filesystem::path path(aFilename);
+     return !path.has_root_directory();
+ #else
+     const std::string::size_type separator = aFilename.find(PATH_SEPARATOR);
+@@ -80,7 +80,7 @@
+ extractDirname(const std::string& aFilename)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    const basic_path path(aFilename);
++    const boost::filesystem::path path(aFilename);
+     const std::string directory(path.branch_path().string());
+     return directory.empty() ? DOT : directory;
+ #else
+@@ -94,8 +94,8 @@
+ extractBasename(const std::string& aFilename)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    const basic_path path(aFilename);
+-    return path.leaf();
++    const boost::filesystem::path path(aFilename);
++    return path.leaf().string();
+ #else
+     const std::string::size_type separator = aFilename.rfind(PATH_SEPARATOR);
+     return
+@@ -110,7 +110,7 @@
+ extractFilename(const std::string& aFilename)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    const basic_path path(aFilename);
++    const boost::filesystem::path path(aFilename);
+     return basename(path);
+ #else
+     const std::string::size_type separator = aFilename.rfind(PATH_SEPARATOR);
+@@ -134,7 +134,7 @@
+ extractExtension(const std::string& aFilename)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    const basic_path path(aFilename);
++    const boost::filesystem::path path(aFilename);
+     return extension(path);
+ #else
+     const std::string::size_type dot = aFilename.rfind(DOT);
+@@ -151,11 +151,11 @@
+ 
+ #ifdef HAVE_BOOST_FILESYSTEM
+ 
+-inline basic_path
+-removeDotsBoost(const basic_path& aPath)
++inline boost::filesystem::path
++removeDotsBoost(const boost::filesystem::path& aPath)
+ {
+-    basic_path result;
+-    for (basic_path::const_iterator p = aPath.begin(); p != aPath.end(); ++p)
++    boost::filesystem::path result;
++    for (boost::filesystem::path::const_iterator p = aPath.begin(); p != aPath.end(); ++p)
+     {
+         if (*p != DOT)
+         {
+@@ -166,11 +166,12 @@
+ }
+ 
+ 
+-inline basic_path
+-removeDotDotsBoost(const basic_path& aPath)
++inline boost::filesystem::path
++removeDotDotsBoost(const boost::filesystem::path& aPath)
+ {
+     list_t directories;
+-    for (basic_path::const_iterator p = aPath.begin(); p != aPath.end(); ++p)
++    for (boost::filesystem::path::const_iterator p = aPath.begin(); p != aPath.end(); ++p)
++
+     {
+         if (*p == DOTDOT &&
+             !directories.empty() && directories.back() != DOTDOT)
+@@ -179,10 +180,10 @@
+         }
+         else
+         {
+-            directories.push_back(*p);
++            directories.push_back((*p).string());
+         }
+     }
+-    basic_path result;
++    boost::filesystem::path result;
+     for (list_t::const_iterator p = directories.begin(); p != directories.end(); ++p)
+     {
+         result /= *p;
+@@ -295,8 +296,8 @@
+ canonicalizePath(const std::string& aPathname, bool keepDot)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    const basic_path result =
+-        removeDotDotsBoost(removeDotsBoost(basic_path(aPathname)));
++    const boost::filesystem::path result =
++        removeDotDotsBoost(removeDotsBoost(boost::filesystem::path(aPathname)));
+     if (keepDot && result.empty())
+     {
+         return std::string(DOT);
+@@ -331,8 +332,8 @@
+ concatPath(const std::string& aPathname, const std::string& anotherPathname)
+ {
+ #ifdef HAVE_BOOST_FILESYSTEM
+-    basic_path path(aPathname);
+-    basic_path leaf(anotherPathname);
++    boost::filesystem::path path(aPathname);
++    boost::filesystem::path leaf(anotherPathname);
+     path /= leaf;
+     return path.string();
+ #else
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index 4a478e052e3e..122e6d1f1306 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -1,19 +1,16 @@
-# New ports collection makefile for:	evolvotron
-# Date created:				16 Mar 2003
-# Whom:					David Yeske <dyeske@gmail.com>
-#
+# Created by: David Yeske <dyeske@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	evolvotron
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generative software that evolves images/textures/patterns
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 156ab27dc45b..c5cc7315bbf2 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: fracplanet
-# Date created:		15 Sep 2005
-# Whom:			Igor Pokrovsky <ip@doom.homeunix.org>
-#
+# Created by: Igor Pokrovsky <ip@doom.homeunix.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fracplanet
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive generator of planets and terrain
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	boost_program_options.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_program_options:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 653f0cef0627..f6cc0119e882 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/
 
diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile
index 11fbf4b47955..77ee65bb2888 100644
--- a/graphics/gource/Makefile
+++ b/graphics/gource/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   	gource
-# Date created:         Nov 25 2009
-# Whom:                 demon@FreeBSD.org
-#
+# Created by: demon@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	gource
 PORTVERSION=	0.38
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/gource/files/patch-boost-1.52 b/graphics/gource/files/patch-boost-1.52
new file mode 100644
index 000000000000..d10615f48c40
--- /dev/null
+++ b/graphics/gource/files/patch-boost-1.52
@@ -0,0 +1,64 @@
+diff --git a/m4/m4_ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
+index 18df8f4..aebcbf7 100644
+--- m4/m4_ax_boost_filesystem.m4
++++ m4/m4_ax_boost_filesystem.m4
+@@ -31,7 +31,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 22
++#serial 24
+ 
+ AC_DEFUN([AX_BOOST_FILESYSTEM],
+ [
+@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
+ 			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_filesystem_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                  [link_filesystem="no"])
+ 				done
+                 if test "x$link_filesystem" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+diff --git a/m4/m4_ax_boost_system.m4 b/m4/ax_boost_system.m4
+index 7fbf6d3..bf82391 100644
+--- m4/m4_ax_boost_system.m4
++++ m4/m4_ax_boost_system.m4
+@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
+ 
+ 			LDFLAGS_SAVE=$LDFLAGS
+             if test "x$ax_boost_user_system_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                  [link_system="no"])
+ 				done
+                 if test "x$link_system" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+diff --git a/src/logmill.cpp b/src/logmill.cpp
+index 8fc6153..2a9afd9 100644
+--- src/logmill.cpp
++++ src/logmill.cpp
+@@ -176,7 +176,7 @@ RCommitLog* RLogMill::fetchLog(std::string& log_format) {
+                     logfile = repo_path.string();
+                 }
+             }
+-        } catch(boost::filesystem3::filesystem_error& error) {
++        } catch(boost::filesystem::filesystem_error& error) {
+         }
+     }
+ 
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index b07f28026c72..4eb2f7d47adf 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	gSculpt
-# Date created:			Oct 10, 2001
-# Whom:				ijliao
-#
-# $Carpetsmoker: ports/graphics/gsculpt/Makefile,v 1.4 2007/08/02 13:13:45 carpetsmoker Exp $
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	gsculpt
 PORTVERSION=	0.99.47
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,}
 DISTNAME=	gSculpt-${PORTVERSION}-alpha-src
@@ -18,7 +13,7 @@ COMMENT=	An Opensource 3D modelling application
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_python.4:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python-libs
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>0:${PORTSDIR}/graphics/py-opengl \
 		${PYTHON_PKGNAMEPREFIX}gtkglext>0:${PORTSDIR}/x11-toolkits/py-gtkglext
 
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 5cd17aecd783..e722493f4f6e 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   hugin
-# Date created:        26 august 2004
-# Whom:                cartola (Carlos E. G. Carvalho)
-#
+# Created by: cartola (Carlos E. G. Carvalho)
 # $FreeBSD$
-#
 
 PORTNAME=	hugin
 PORTVERSION=	2011.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index a6f29a6db249..27cb28848287 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	k3d
-# Date created:			Jun 9, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	k3d
 PORTVERSION=	0.8.0.2
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index 272dd1a8cfc6..1a5472c1d8da 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	libopenraw
 PORTVERSION=	0.0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Library for camera RAW files decoding
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
 MAKE_JOBS_SAFE=	yes
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index d994678f595f..002a03a63dee 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	LuxRender
-# Date created:				16 March 2010
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	luxrender
 PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://src.luxrender.net/lux/archive/ \
 		http://freebsd.nsu.ru/distfiles/luxrender/
@@ -22,7 +18,7 @@ LICENSE=	GPLv3
 BROKEN=		does not build with boost-1.48.0
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 		png15:${PORTSDIR}/graphics/png \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
 
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index c51a869aceff..925441431550 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mapnik
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
@@ -19,12 +19,12 @@ LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
 		tiff:${PORTSDIR}/graphics/tiff \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		icuuc:${PORTSDIR}/devel/icu \
-		boost_system:${PORTSDIR}/devel/boost-libs
+		boost_system:${PORTSDIR}/devel/boost-libs \
+		boost_python:${PORTSDIR}/devel/boost-python-libs
 BUILD_DEPENDS=	${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \
 		icu>=4.2:${PORTSDIR}/devel/icu \
 		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu \
 		boost-libs>=1.47:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/boost/python.hpp:${PORTSDIR}/devel/boost-python-libs
 
 USE_BZIP2=	yes
 USE_PYTHON=	2.6+
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 465d8c7e7cde..b8ee83175ddc 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	openimageio
 PORTVERSION=	1.1.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	graphics multimedia
 MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
 
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index f1e813deec9b..c5f7e582fc6b 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openshadinglanguage
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	FreeBSD@Shaneware.biz
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 2502793c66a9..9cba1734b6e8 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	povray
-PORTREVISION=	1
 DISTVERSION=	3.7.0.RC6
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.povray.org/beta/source/
 DIST_SUBDIR=	${UNIQUENAME}
@@ -10,7 +10,7 @@ DIST_SUBDIR=	${UNIQUENAME}
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Persistence of Vision Ray Tracer
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
 OPTIONS_DEFINE=	X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
 OPTIONS_DEFAULT=	PNG JPEG EXAMPLES DOCS
@@ -116,6 +116,13 @@ DOC_FILES=	AUTHORS ChangeLog NEWS
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+post-patch:
+# Fix with boost 1.52
+	@${REINPLACE_CMD} -e 's/TIME_UTC/TIME_UTC_/g' ${WRKSRC}/source/backend/scene/view.cpp \
+		${WRKSRC}/source/base/timer.cpp \
+		${WRKSRC}/vfe/vfepovms.cpp \
+		${WRKSRC}/vfe/unix/platformbase.cpp \
+		${WRKSRC}/vfe/vfesession.cpp
 pre-build:
 .if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}
 #	graphics/tiff adds dependencies on libjpeg and libjbig
diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile
index 42038a24f7ef..e880345df65a 100644
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	exiv2
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpadlibrarian.net/83595798/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile
index 54a255daf6d4..f28cd932f564 100644
--- a/graphics/py-openimageio/Makefile
+++ b/graphics/py-openimageio/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 9043e12606b7..9e94a878620c 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	visual
 PORTVERSION=	4.b26
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics python
 MASTER_SITES=	SF/${PORTNAME}python/${PORTNAME}-module/VPython%204.beta26
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${PYNUMPY} \
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
 		gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm \
 		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		boost_python.4:${PORTSDIR}/devel/boost-python-libs
+		boost_python:${PORTSDIR}/devel/boost-python-libs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index becfc872c968..b3e7f0cc0608 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	scantailor
-# Date created:		2010-04-13
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	scantailor
-PORTVERSION=	0.9.10
-PORTREVISION=	2
+PORTVERSION=	0.9.11
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/scantailor/distinfo b/graphics/scantailor/distinfo
index f81df36d504e..b2a0b656c50b 100644
--- a/graphics/scantailor/distinfo
+++ b/graphics/scantailor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scantailor-0.9.10.tar.gz) = 0b574eabfb65e4dcf3915d00ad3da31d464060458ffaeb49e4257e97301f93a0
-SIZE (scantailor-0.9.10.tar.gz) = 1124348
+SHA256 (scantailor-0.9.11.tar.gz) = e158fa5c38b1c34dec47e611e27d74a0508bc2b6818b84f0d05f98ba184c9c11
+SIZE (scantailor-0.9.11.tar.gz) = 1175866
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 00acccb94698..aa8c9ee64ad4 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	visionworkbench
-# Date created:		2010-01-03
-# Whom:			Steve Wills <steve@mouf.net>
-#
+# Created by: Steve Wills <steve@mouf.net>
 # $FreeBSD$
-#
 
 PORTNAME=	visionworkbench
 PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/
 DISTNAME=	VisionWorkbench-${PORTVERSION}
@@ -29,8 +25,8 @@ USE_PYTHON=	2.4+
 
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-LIB_DEPENDS+=	boost_thread.4:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS+=	boost_python.4:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS+=	boost_thread:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	boost_python:${PORTSDIR}/devel/boost-python-libs
 LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
@@ -51,6 +47,9 @@ LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
+post-patch:
+	@${REINPLACE_CMD} -e "s,-DBOOST_FILESYSTEM_VERSION=2,,g" ${WRKSRC}/configure
+
 pre-configure:
 	echo "HAVE_PKG_FLAPACK=yes" >> ${WRKSRC}/config.options
 	echo "PKG_FLAPACK_LDFLAGS=-L${LOCALBASE}/lib/${CC}" >> ${WRKSRC}/config.options
diff --git a/graphics/visionworkbench/files/patch-boost-1.52 b/graphics/visionworkbench/files/patch-boost-1.52
new file mode 100644
index 000000000000..86f9c041c482
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-boost-1.52
@@ -0,0 +1,563 @@
+diff --git configure.ac configure.ac
+index 4594e56..896220b 100644
+--- configure.ac
++++ configure.ac
+@@ -481,7 +481,7 @@ AM_CONDITIONAL(MAKE_MODULE_GPU,              [test "$MAKE_MODULE_GPU" = "yes"])
+ # final processing
+ ##################################################
+ 
+-VW_CPPFLAGS="-I\${abs_top_srcdir}/src -I\${abs_top_builddir}/src $OTHER_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2"
++VW_CPPFLAGS="-I\${abs_top_srcdir}/src -I\${abs_top_builddir}/src $OTHER_CPPFLAGS"
+ VW_LDFLAGS="$OTHER_LDFLAGS"
+ 
+ # Do this last, to make sure it's not overridden
+diff --git src/vw/BundleAdjustment/ControlNetworkLoader.cc src/vw/BundleAdjustment/ControlNetworkLoader.cc
+index ed24605..9c092e8 100644
+--- src/vw/BundleAdjustment/ControlNetworkLoader.cc
++++ src/vw/BundleAdjustment/ControlNetworkLoader.cc
+@@ -65,8 +65,8 @@ void vw::ba::triangulate_control_point( ControlPoint& cp,
+         if ( sm.convergence_angle( cp[j].position(),
+                                    cp[k].position() ) >
+              minimum_angle ) {
+-	  count++;
+-	  position_sum += sm( cp[j].position(), cp[k].position(), error );
++          count++;
++          position_sum += sm( cp[j].position(), cp[k].position(), error );
+           error_sum += error;
+         }
+       } catch ( const camera::PixelToRayErr& ) { /* Just let it go */ }
+@@ -110,7 +110,7 @@ void vw::ba::build_control_network( ba::ControlNetwork& cnet,
+     fs::path file_path(file);
+     image_prefix_map[file_path.replace_extension().string()] = count;
+     crn.add_node( ba::CameraNode<ba::IPFeature>( count,
+-                                                 file_path.stem() ) );
++                                                 file_path.stem().string() ) );
+     count++;
+   }
+ 
+@@ -128,7 +128,7 @@ void vw::ba::build_control_network( ba::ControlNetwork& cnet,
+       if ( obj->path().extension() != ".match" ) continue;
+ 
+       // Pull out the prefixes that made up that match file
+-      std::string match_base = obj->path().stem();
++      std::string match_base = obj->path().stem().string();
+       size_t split_pt = match_base.find("__");
+       if ( split_pt == std::string::npos ) continue;
+       std::string prefix1 = match_base.substr(0,split_pt);
+@@ -143,14 +143,14 @@ void vw::ba::build_control_network( ba::ControlNetwork& cnet,
+ 
+       // Actually read in the file as it seems we've found something correct
+       std::vector<ip::InterestPoint> ip1, ip2;
+-      ip::read_binary_match_file( obj->string(), ip1, ip2 );
++      ip::read_binary_match_file( obj->path().string(), ip1, ip2 );
+       if ( ip1.size() < min_matches ) {
+-        vw_out(VerboseDebugMessage,"ba") << "\t" << obj->string() << "    "
++        vw_out(VerboseDebugMessage,"ba") << "\t" << obj->path().string() << "    "
+                                          << it1->second << " <-> " << it2->second << " : "
+                                          << ip1.size() << " matches. [rejected]\n";
+         num_load_rejected += ip1.size();
+       } else {
+-        vw_out(VerboseDebugMessage,"ba") << "\t" << obj->string() << "    "
++        vw_out(VerboseDebugMessage,"ba") << "\t" << obj->path().string() << "    "
+                                          << it1->second << " <-> " << it2->second << " : "
+                                          << ip1.size() << " matches.\n";
+         num_loaded += ip1.size();
+diff --git src/vw/BundleAdjustment/ControlNetworkLoader.h src/vw/BundleAdjustment/ControlNetworkLoader.h
+index 1e4deb4..7e8b270 100644
+--- src/vw/BundleAdjustment/ControlNetworkLoader.h
++++ src/vw/BundleAdjustment/ControlNetworkLoader.h
+@@ -59,7 +59,7 @@
+     LookupType image_lookup;
+     for (size_t i = 0; i < image_files.size(); i++ ) {
+       image_lookup[image_files[i]] = i;
+-      image_lookup[fs::path(image_files[i]).filename()] = i;
++      image_lookup[fs::path(image_files[i]).filename().string()] = i;
+     }
+ 
+     while ( gcp_start != gcp_end ) {
+@@ -139,7 +139,7 @@
+     LookupType image_lookup;
+     for (size_t i = 0; i < image_files.size(); i++ ) {
+       image_lookup[image_files[i]] = i;
+-      image_lookup[fs::path(image_files[i]).filename()] = i;
++      image_lookup[fs::path(image_files[i]).filename().string()] = i;
+     }
+ 
+     while ( gcpcnet_start != gcpcnet_end ) {
+diff --git src/vw/FileIO/KML.cc src/vw/FileIO/KML.cc
+index be91a5f..f04c41b 100644
+--- src/vw/FileIO/KML.cc
++++ src/vw/FileIO/KML.cc
+@@ -259,7 +259,7 @@
+     std::ostringstream path;
+     if ( m_directory != "" )
+       path << m_directory << "/";
+-    fs::path kml_path( path.str(), fs::native );
++    fs::path kml_path( path.str() );
+     fs::create_directories( kml_path );
+     path << m_filename;
+     kml_path = path.str();
+diff --git src/vw/FileIO/tests/TestTemporaryFile.cxx src/vw/FileIO/tests/TestTemporaryFile.cxx
+index 4fcaaaf..05b33cf 100644
+--- src/vw/FileIO/tests/TestTemporaryFile.cxx
++++ src/vw/FileIO/tests/TestTemporaryFile.cxx
+@@ -46,15 +46,15 @@ string get_directory(const TemporaryDir& f) {
+ }
+ 
+ string get_prefix(const TemporaryFile& f, size_t len) {
+-  return fs::path(f.filename()).leaf().substr(0, len);
++  return fs::path(f.filename()).filename().string().substr(0, len);
+ }
+ 
+ string get_prefix(const TemporaryDir& f, size_t len) {
+-  return fs::path(f.filename()).leaf().substr(0, len);
++  return fs::path(f.filename()).filename().string().substr(0, len);
+ }
+ 
+ string get_suffix(const TemporaryFile& f, size_t len) {
+-  string fn = fs::path(f.filename()).leaf();
++  string fn = fs::path(f.filename()).filename().string();
+   return fn.substr(fn.size()-len, len);
+ }
+ 
+diff --git src/vw/Mosaic/CelestiaQuadTreeConfig.cc src/vw/Mosaic/CelestiaQuadTreeConfig.cc
+index d215843..5a27da1 100644
+--- src/vw/Mosaic/CelestiaQuadTreeConfig.cc
++++ src/vw/Mosaic/CelestiaQuadTreeConfig.cc
+@@ -31,7 +31,7 @@
+   }
+ 
+   std::string CelestiaQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+ 
+     Vector<size_t,2> pos(0,0);
+     for ( size_t i=0; i < name.length(); ++i ) {
+@@ -55,7 +55,7 @@
+ 
+     path /= oss.str();
+ 
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+   void CelestiaQuadTreeConfig::configure( QuadTreeGenerator& qtree ) const {
+diff --git src/vw/Mosaic/GMapQuadTreeConfig.cc src/vw/Mosaic/GMapQuadTreeConfig.cc
+index f47fc05..840ab4e 100644
+--- src/vw/Mosaic/GMapQuadTreeConfig.cc
++++ src/vw/Mosaic/GMapQuadTreeConfig.cc
+@@ -30,7 +30,7 @@
+ 
+   // for gmaps, origin is upper left, advancing right and down.
+   std::string GMapQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+ 
+     Vector<size_t, 2> pos(0,0);
+     BOOST_FOREACH(char n, name) {
+@@ -50,11 +50,11 @@
+     oss << name.length() << "/" << pos.x() << "/" << pos.y();
+     path /= oss.str();
+ 
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+   boost::shared_ptr<DstImageResource> GMapQuadTreeConfig::tile_resource( QuadTreeGenerator const& /*qtree*/, QuadTreeGenerator::TileInfo const& info, ImageFormat const& format ) {
+-    create_directories( fs::path( info.filepath, fs::native ).branch_path() );
++    create_directories( fs::path( info.filepath ).parent_path() );
+     return boost::shared_ptr<DstImageResource>( DiskImageResource::create( info.filepath + info.filetype, format, info.filetype ) );
+   }
+ 
+diff --git src/vw/Mosaic/GigapanQuadTreeConfig.cc src/vw/Mosaic/GigapanQuadTreeConfig.cc
+index d9ceac9..685c9fe 100644
+--- src/vw/Mosaic/GigapanQuadTreeConfig.cc
++++ src/vw/Mosaic/GigapanQuadTreeConfig.cc
+@@ -98,7 +98,7 @@
+ 
+     if ( root_node) {
+       std::ostringstream json;
+-      fs::path file_path( info.filepath, fs::native );
++      fs::path file_path( info.filepath );
+       fs::path json_path = change_extension( file_path, ".json" );
+ 
+       json << "{" << std::endl
+diff --git src/vw/Mosaic/KMLQuadTreeConfig.cc src/vw/Mosaic/KMLQuadTreeConfig.cc
+index d527e3a..cd155dc 100644
+--- src/vw/Mosaic/KMLQuadTreeConfig.cc
++++ src/vw/Mosaic/KMLQuadTreeConfig.cc
+@@ -235,8 +235,8 @@
+ 
+   void KMLQuadTreeConfigData::metadata_func( QuadTreeGenerator const& qtree, QuadTreeGenerator::TileInfo const& info ) const {
+     std::ostringstream kml;
+-    fs::path file_path( info.filepath, fs::native );
+-    size_t base_len = file_path.branch_path().native_file_string().size() + 1;
++    fs::path file_path( info.filepath );
++    size_t base_len = file_path.parent_path().string().size() + 1;
+     fs::path kml_path = change_extension( file_path, ".kml" );
+     kml << std::setprecision(10);
+ 
+@@ -264,10 +264,11 @@
+       m_root_node_tags << "  <Style><ListStyle><listItemType>checkHideChildren</listItemType></ListStyle></Style>\n";
+     }
+ 
+-    std::vector<std::pair<std::string,BBox2i> > children = qtree.branches( info.name, info.region_bbox );
++    std::vector<std::pair<std::string,BBox2i> > children =
++      qtree.branches( info.name, info.region_bbox );
+     for( unsigned i=0; i<children.size(); ++i ) {
+       std::string kmlfile = qtree.image_path(children[i].first) + ".kml";
+-      if( exists( fs::path( kmlfile, fs::native ) ) ) {
++      if( exists( fs::path( kmlfile ) ) ) {
+         num_children++;
+         kml << kml_network_link( children[i].first.substr(children[i].first.size()-1),
+                                  kmlfile.substr(base_len),
+@@ -281,7 +282,7 @@
+     int draw_order = m_draw_order_offset + int(info.name.size());
+     BBox2i go_bbox = (qtree.get_crop_images() ? info.image_bbox : info.region_bbox);
+     if( exists( fs::path( info.filepath + info.filetype ) ) ) {
+-      kml << kml_ground_overlay( file_path.leaf() + info.filetype,
++      kml << kml_ground_overlay( file_path.filename().string() + info.filetype,
+                                  pixels_to_longlat( info.region_bbox, qtree.get_dimensions() ),
+                                  pixels_to_longlat( go_bbox, qtree.get_dimensions() ),
+                                  draw_order, qtree.get_tile_size()/2, max_lod );
+@@ -333,7 +334,7 @@
+   }
+ 
+   boost::shared_ptr<DstImageResource> KMLQuadTreeConfigData::tile_resource_func( QuadTreeGenerator const&, QuadTreeGenerator::TileInfo const& info, ImageFormat const& format ) const {
+-    create_directories( fs::path( info.filepath, fs::native ).branch_path() );
++    create_directories( fs::path( info.filepath ).parent_path() );
+     if( info.filetype == ".png" && (format.pixel_format==VW_PIXEL_RGBA || format.pixel_format==VW_PIXEL_GRAYA) ) {
+       return boost::shared_ptr<DstImageResource>( new DiskImageResourcePNGAlphaHack( info.filepath+info.filetype, format ) );
+     }
+diff --git src/vw/Mosaic/QuadTreeGenerator.cc src/vw/Mosaic/QuadTreeGenerator.cc
+index 389825d..a4cba6f 100644
+--- src/vw/Mosaic/QuadTreeGenerator.cc
++++ src/vw/Mosaic/QuadTreeGenerator.cc
+@@ -28,13 +28,13 @@
+ namespace mosaic {
+ 
+   std::string QuadTreeGenerator::simple_image_path::operator()( QuadTreeGenerator const& qtree, std::string const& name ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+     path /= "r" + name;
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+   std::string QuadTreeGenerator::tiered_image_path::operator()( QuadTreeGenerator const& qtree, std::string const& name, int32 levels_per_directory ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+ 
+     std::string rname = "r" + name;
+ 
+@@ -43,14 +43,14 @@
+     }
+     path /= rname;
+ 
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+   std::string QuadTreeGenerator::named_tiered_image_path::operator()( QuadTreeGenerator const& qtree, std::string const& name, int32 levels_per_directory ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+ 
+     if( name.length() == 0 ) {
+-      path /= change_extension( path, "" ).leaf();
++      path /= change_extension( path, "" ).filename();
+     }
+     else {
+       for ( int32 i=0; i<(int32)name.length() - levels_per_directory; i+=levels_per_directory ) {
+@@ -59,7 +59,7 @@
+       path /= name;
+     }
+ 
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+   std::vector<std::pair<std::string,vw::BBox2i> > QuadTreeGenerator::default_branch_func::operator()( QuadTreeGenerator const& qtree, std::string const& name, BBox2i const& region ) {
+@@ -74,7 +74,7 @@
+   }
+ 
+   boost::shared_ptr<DstImageResource> QuadTreeGenerator::default_tile_resource_func::operator()( QuadTreeGenerator const&, TileInfo const& info, ImageFormat const& format ) {
+-    create_directories( fs::path( info.filepath, fs::native ).branch_path() );
++    create_directories( fs::path( info.filepath ).parent_path() );
+     return boost::shared_ptr<DstImageResource>( DiskImageResource::create( info.filepath+info.filetype, format ) );
+   }
+ 
+diff --git src/vw/Mosaic/TMSQuadTreeConfig.cc src/vw/Mosaic/TMSQuadTreeConfig.cc
+index 92f4ab9..2f6c30b 100644
+--- src/vw/Mosaic/TMSQuadTreeConfig.cc
++++ src/vw/Mosaic/TMSQuadTreeConfig.cc
+@@ -25,7 +25,7 @@
+ namespace mosaic {
+ 
+   std::string TMSQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+ 
+     Vector2i pos(0,0);
+     for ( int i=0; i<(int)name.length(); ++i ) {
+@@ -41,7 +41,7 @@
+     oss << name.length() << "/" << pos.x() << "/" << pos.y();
+     path /= oss.str();
+ 
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+   void TMSQuadTreeConfig::configure( QuadTreeGenerator& qtree ) const {
+diff --git src/vw/Mosaic/ToastQuadTreeConfig.h src/vw/Mosaic/ToastQuadTreeConfig.h
+index 209ff0e..ba2aed6 100644
+--- src/vw/Mosaic/ToastQuadTreeConfig.h
++++ src/vw/Mosaic/ToastQuadTreeConfig.h
+@@ -200,13 +200,13 @@
+       }
+ 
+       // Read it in from disk
+-      fs::path path( qtree->get_name(), fs::native );
++      fs::path path( qtree->get_name() );
+       std::ostringstream filename;
+       filename << level << "/" << x << "/" << y << "." << qtree->get_file_type();
+       path /= filename.str();
+       ImageView<PixelT> tile;
+       if( exists(path) ) {
+-        read_image( tile, path.native_file_string() );
++        read_image( tile, path.string() );
+       }
+ 
+       // Save it in the cache.  The cache size of 1024 tiles was chosen
+@@ -251,7 +251,7 @@
+         generate_branch( branch_level, level+1, 2*x+1, 2*y+1, SubProgressCallback(progress_callback, 0.75, 1.00) );
+       }
+       else {
+-        fs::path path( qtree->get_name(), fs::native );
++        fs::path path( qtree->get_name() );
+         std::ostringstream filename;
+         filename << level << "/" << x << "/" << y << "." << qtree->get_file_type();
+         path /= filename.str();
+@@ -288,8 +288,8 @@
+         }
+ 
+         if( ! is_transparent(tile) ) {
+-          create_directories( path.branch_path() );
+-          write_image( path.native_file_string(), tile );
++          create_directories( path.parent_path() );
++          write_image( path.string(), tile );
+         }
+ 
+         progress_callback.report_progress(1);
+diff --git src/vw/Mosaic/UniviewQuadTreeConfig.cc src/vw/Mosaic/UniviewQuadTreeConfig.cc
+index c6c20b3..e94e0d7 100644
+--- src/vw/Mosaic/UniviewQuadTreeConfig.cc
++++ src/vw/Mosaic/UniviewQuadTreeConfig.cc
+@@ -67,7 +67,7 @@
+   }
+ 
+   std::string UniviewQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) {
+-    fs::path path( qtree.get_name(), fs::native );
++    fs::path path( qtree.get_name() );
+ 
+     Vector2i pos(0,0);
+     for ( int i=0; i<(int)name.length(); ++i ) {
+@@ -86,12 +86,12 @@
+       oss << name.length()-1 << "/" << pos.y() << "/" << pos.x();
+     path /= oss.str();
+ 
+-    return path.native_file_string();
++    return path.string();
+   }
+ 
+ 
+   boost::shared_ptr<DstImageResource> UniviewQuadTreeConfig::terrain_tile_resource( QuadTreeGenerator const& /*qtree*/,QuadTreeGenerator::TileInfo const& info, ImageFormat const& format ) {
+-    create_directories( fs::path( info.filepath, fs::native ).branch_path() );
++    create_directories( fs::path( info.filepath ).parent_path() );
+     return boost::shared_ptr<DstImageResource>( new UniviewTerrainResource( info.filepath+info.filetype, format ) );
+   }
+ 
+diff --git src/vw/tools/blend.cc src/vw/tools/blend.cc
+index c0f6e29..dbab5a9 100644
+--- src/vw/tools/blend.cc
++++ src/vw/tools/blend.cc
+@@ -58,7 +58,7 @@ void do_blend() {
+ 
+   std::map<std::string,fs::path> image_files;
+   std::map<std::string,fs::path> offset_files;
+-  fs::path source_dir_path( mosaic_name, fs::native );
++  fs::path source_dir_path( mosaic_name );
+   fs::directory_iterator pi( source_dir_path ), pend;
+   for( ; pi != pend; ++pi ) {
+     if( extension(*pi) == ".offset" )
+diff --git src/vw/tools/correlate.cc src/vw/tools/correlate.cc
+index 521206f..e249e55 100644
+--- src/vw/tools/correlate.cc
++++ src/vw/tools/correlate.cc
+@@ -95,7 +95,9 @@ int main( int argc, char *argv[] ) {
+       return 1;
+     }
+ 
+-    std::string match_filename = fs::path( left_file_name ).replace_extension().string() + "__" + fs::path( right_file_name ).stem() + ".match";
++    std::string match_filename =
++      fs::path( left_file_name ).replace_extension().string() + "__" +
++      fs::path( right_file_name ).stem().string() + ".match";
+     if ( fs::exists( match_filename ) ) {
+       vw_out() << "Found a match file. Using it to pre-align images.\n";
+       std::vector<ip::InterestPoint> matched_ip1, matched_ip2;
+diff --git src/vw/tools/ipalign.cc src/vw/tools/ipalign.cc
+index 76c1689..f513827 100644
+--- src/vw/tools/ipalign.cc
++++ src/vw/tools/ipalign.cc
+@@ -220,7 +220,7 @@ void align_images( Options & opt ) {
+       }
+       std::string output_filename =
+         fs::path(ref_name).replace_extension().string() + "__" +
+-        fs::path(input_name).stem() + ".match";
++        fs::path(input_name).stem().string() + ".match";
+       write_binary_match_file(output_filename, final_ip1, final_ip2);
+     }
+ 
+diff --git src/vw/tools/ipmatch.cc src/vw/tools/ipmatch.cc
+index 06aa88a..96c690b 100644
+--- src/vw/tools/ipmatch.cc
++++ src/vw/tools/ipmatch.cc
+@@ -64,19 +64,19 @@ static void write_match_image(std::string const& out_file_name,
+   mosaic::ImageComposite<PixelRGB<uint8> > composite;
+   if ( irsrc1->has_nodata_read() ) {
+     composite.insert( pixel_cast_rescale<PixelRGB<uint8> >(resample(apply_mask(normalize(create_mask(DiskImageView<PixelGray<float> >(*irsrc1),
+-												     irsrc1->nodata_read()))), sub_scale)),
+-		      0, 0 );
++                                                                                                     irsrc1->nodata_read()))), sub_scale)),
++                      0, 0 );
+   } else {
+     composite.insert( pixel_cast_rescale<PixelRGB<uint8> >(resample(normalize(DiskImageView<PixelGray<float> >(*irsrc1)), sub_scale)),
+-		      0, 0 );
++                      0, 0 );
+   }
+   if ( irsrc2->has_nodata_read() ) {
+     composite.insert(pixel_cast_rescale<PixelRGB<uint8> >(resample(apply_mask(normalize(create_mask(DiskImageView<PixelGray<float> >(*irsrc2),
+-												    irsrc2->nodata_read()))), sub_scale)),
+-		     int32(irsrc1->format().cols * sub_scale), 0 );
++                                                                                                    irsrc2->nodata_read()))), sub_scale)),
++                     int32(irsrc1->format().cols * sub_scale), 0 );
+   } else {
+     composite.insert(pixel_cast_rescale<PixelRGB<uint8> >(resample(normalize(DiskImageView<PixelGray<float> >(*irsrc2)), sub_scale)),
+-		     int32(irsrc1->format().cols * sub_scale), 0 );
++                     int32(irsrc1->format().cols * sub_scale), 0 );
+   }
+   composite.set_draft_mode( true );
+   composite.prepare();
+@@ -101,7 +101,7 @@ static void write_match_image(std::string const& out_file_name,
+ 
+   boost::scoped_ptr<vw::DiskImageResource> rsrc( DiskImageResource::create(out_file_name, comp.format()) );
+   block_write_image( *rsrc, comp,
+-		     TerminalProgressCallback( "tools.ipmatch", "Writing Debug:" ) );
++                     TerminalProgressCallback( "tools.ipmatch", "Writing Debug:" ) );
+ }
+ 
+ int main(int argc, char** argv) {
+@@ -183,7 +183,7 @@ int main(int argc, char** argv) {
+       vw_out() << "Found " << matched_ip1.size() << " putative matches.\n";
+ 
+       std::vector<Vector3> ransac_ip1 = iplist_to_vectorlist(matched_ip1),
+-	ransac_ip2 = iplist_to_vectorlist(matched_ip2);
++        ransac_ip2 = iplist_to_vectorlist(matched_ip2);
+       std::vector<size_t> indices;
+       try {
+         // RANSAC is used to fit a transform between the matched sets
+@@ -214,8 +214,8 @@ int main(int argc, char** argv) {
+             indices.push_back(i);
+         } else {
+           vw_out() << "Unknown RANSAC constraint type: " << ransac_constraint
+-		   << ".  Choose one of: [similarity, homography, fundamental, or none]\n";
+-	  return 1;
++                   << ".  Choose one of: [similarity, homography, fundamental, or none]\n";
++          return 1;
+         }
+       } catch (const vw::math::RANSACErr& e ) {
+         vw_out() << "RANSAC Failed: " << e.what() << "\n";
+@@ -230,8 +230,8 @@ int main(int argc, char** argv) {
+       }
+ 
+       std::string output_prefix =
+-	fs::path(input_file_names[i]).replace_extension().string() + "__" +
+-        fs::path(input_file_names[j]).stem();
++        fs::path(input_file_names[i]).replace_extension().string() + "__" +
++        fs::path(input_file_names[j]).stem().string();
+       write_binary_match_file(output_prefix+".match", final_ip1, final_ip2);
+ 
+       if (vm.count("debug-image")) {
+@@ -244,4 +244,3 @@ int main(int argc, char** argv) {
+ 
+   return 0;
+ }
+-
+diff --git configure.ac configure.ac
+index fc96826..4594e56 100644
+--- configure.ac
++++ configure.ac
+@@ -205,7 +205,7 @@ AX_PKG_BOOST([BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM BOOST_THREAD BOOST_GRAPH],
+   BOOST_REGEX,
+     [AX_PKG_BOOST_LIB(REGEX,           [-lboost_regex],           [boost/regex.hpp], [boost::regex(".*");])],
+   BOOST_DATETIME,
+-    [AX_PKG_BOOST_LIB(DATETIME,        [-lboost_date_time],       [boost/date_time/gregorian/gregorian_types.hpp])],
++    [AX_PKG_BOOST_LIB(DATETIME,        [-lboost_date_time],       [boost/date_time/gregorian/gregorian_types.hpp], [], [$PKG_BOOST_SYSTEM_LIBS])],
+   BOOST_THREAD,
+     [AX_PKG_BOOST_LIB(THREAD,          [-lboost_thread],          [boost/thread/thread.hpp], [boost::mutex();], [$PKG_BOOST_DATETIME_LIBS], [boost/thread/condition.hpp])],
+   BOOST_IOSTREAMS,
+diff --git src/vw/Core/Settings.cc src/vw/Core/Settings.cc
+index 068988c..7c1becb 100644
+--- src/vw/Core/Settings.cc
++++ src/vw/Core/Settings.cc
+@@ -67,7 +67,11 @@ void Settings::reload_config() {
+   // call reload_config and deadlock!
+ 
+   boost::xtime xt;
++#if BOOST_VERSION >= 105000
++  boost::xtime_get(&xt, boost::TIME_UTC_);
++#else
+   boost::xtime_get(&xt, boost::TIME_UTC);
++#endif
+   bool needs_reloading = false;
+ 
+   // Every five seconds, we attempt to open the log config file to see
+diff --git src/vw/Core/Thread.h src/vw/Core/Thread.h
+index b1bbdfd..4040a8a 100644
+--- src/vw/Core/Thread.h
++++ src/vw/Core/Thread.h
+@@ -175,7 +175,11 @@
+     template<typename LockT>
+     bool timed_wait(LockT &lock, unsigned long milliseconds) {
+       boost::xtime xt;
++#if BOOST_VERSION >= 105000
++      boost::xtime_get(&xt, boost::TIME_UTC_);
++#else
+       boost::xtime_get(&xt, boost::TIME_UTC);
++#endif
+       while (milliseconds >= 1000) {
+         xt.sec++;
+         milliseconds -= 1000;
+@@ -187,7 +191,11 @@
+     template<typename LockT, typename Pred>
+     bool timed_wait(LockT &lock, unsigned long milliseconds, Pred pred) {
+       boost::xtime xt;
++#if BOOST_VERSION >= 105000
++      boost::xtime_get(&xt, boost::TIME_UTC_);
++#else
+       boost::xtime_get(&xt, boost::TIME_UTC);
++#endif
+       while (milliseconds >= 1000) {
+         xt.sec++;
+         milliseconds -= 1000;
+@@ -269,7 +277,11 @@
+     /// threads/processes.
+     static inline void sleep_ms( uint32 milliseconds ) {
+       boost::xtime xt;
++#if BOOST_VERSION >= 105000
++      boost::xtime_get(&xt, boost::TIME_UTC_);
++#else
+       boost::xtime_get(&xt, boost::TIME_UTC);
++#endif
+       while (milliseconds >= 1000) {
+         xt.sec++;
+         milliseconds -= 1000;
author	Baptiste Daroussin <bapt@FreeBSD.org>	2013-01-31 13:38:42 +0000
committer	Baptiste Daroussin <bapt@FreeBSD.org>	2013-01-31 13:38:42 +0000
commit	f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d (patch)
tree	384a6fe89b7bf8bffcc478f3462d538eea755790 /graphics
parent	49be72eaa4585216ade79b274fca337c2bf4866a (diff)
download	ports-f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d.tar.gz ports-f5f6cd6d9b51abcfaf7d5a03d342e91dc742074d.zip