diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 0debc968cb0e..a369ba879a79 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -1,29 +1,29 @@
 # New ports collection makefile for:	sdts++
 # Date created:         08 Feb 2000
 # Whom:                 erik@habatech.no
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sdts++
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://thor-f5.er.usgs.gov/sdts/sdtsxx/ \
 		http://lychnobite.org/sdts/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for SDTS related development
 
 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include
 MAKE_ARGS=	CXX="${CXX}"
 
 INFO=		sdts++
 
 .include <bsd.port.mk>
diff --git a/devel/sdts++/files/patch-ab b/devel/sdts++/files/patch-ab
index b1c4e1485bc4..6af1acd323e8 100644
--- a/devel/sdts++/files/patch-ab
+++ b/devel/sdts++/files/patch-ab
@@ -1,64 +1,65 @@
---- sdts++/builder/sb_Accessor.cpp.orig	Tue Jun 10 22:51:40 2003
-+++ sdts++/builder/sb_Accessor.cpp	Sat Dec 13 14:17:48 2003
-@@ -26,6 +26,12 @@
+--- sdts++/builder/sb_Accessor.cpp.orig	2003-06-11 00:51:40.000000000 +0400
++++ sdts++/builder/sb_Accessor.cpp	2012-03-11 20:18:18.000000000 +0300
+@@ -26,6 +26,13 @@
  #include <cctype>
  #include <cstring>
  
 +#ifdef __FreeBSD__
 +#  include <osreldate.h>
 +#  if __FreeBSD_version < 500035
 +#    include <stlport/iosfwd>
 +#  endif
 +#endif
++namespace std { using ::mbstate_t; }
  #include <boost/smart_ptr.hpp>
  #include <boost/filesystem/path.hpp>
  #include <boost/filesystem/operations.hpp>
-@@ -155,27 +158,27 @@
+@@ -155,27 +162,27 @@
  
  
  
 -static const char* module_mnemonics_[] =
 -{ 
 -  {"CATS"},
 -  {"CATD"},
 -  {"DDOM"},
 -  {"DDSH"},
 -  {"MDOM"},
 -  {"MDEF"},
 -  {"DQHL"},
 -  {"DQPA"},
 -  {"DQAA"},
 -  {"DQLC"},
 -  {"DQCG"},
 -  {"IDEN"},
 -  {"IREF"},
 -  {"LDEF"},
 -  {"RSDF"},
 -  {"STAT"},
 -  {"XREF"},
 -  {""}
 -}; // module_mnemonics
 +static const char* module_mnemonics_[] =
 +{ 
 +  "CATS",
 +  "CATD",
 +  "DDOM",
 +  "DDSH",
 +  "MDOM",
 +  "MDEF",
 +  "DQHL",
 +  "DQPA",
 +  "DQAA",
 +  "DQLC",
 +  "DQCG",
 +  "IDEN",
 +  "IREF",
 +  "LDEF",
 +  "RSDF",
 +  "STAT",
 +  "XREF",
 +  ""
 +}; // module_mnemonics
  
  
  
diff --git a/devel/sdts++/files/patch-configure.in b/devel/sdts++/files/patch-configure.in
new file mode 100644
index 000000000000..a55b7b32c609
--- /dev/null
+++ b/devel/sdts++/files/patch-configure.in
@@ -0,0 +1,31 @@
+--- configure.in.orig	2012-03-11 19:45:25.000000000 +0300
++++ configure.in	2012-03-11 19:46:08.000000000 +0300
+@@ -23,13 +23,6 @@
+ 
+ AC_HEADER_STAT
+ 
+-dnl
+-dnl see if std::vector<char>::iterator == char *
+-dnl
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <vector>]], [[
+-char v[2];
+-std::vector<char>::iterator i = &v[0];
+-]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ])
+ 
+ dnl program checks
+ 
+@@ -93,6 +86,14 @@
+ export BOOST_HEADER
+ 
+ 
++dnl
++dnl see if std::vector<char>::iterator == char *
++dnl
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stlport/vector>]], [[
++char const v[2];
++std::vector<char>::const_iterator i = &v[0];
++]])],[],[AC_DEFINE(VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT) ])
++
+ 
+ dnl
+ dnl let's make sure the sysutils package is happy
diff --git a/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h b/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h
new file mode 100644
index 000000000000..8fefa8747c08
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++-io-sio_8211Converter.h
@@ -0,0 +1,54 @@
+--- sdts++/io/sio_8211Converter.h.orig	2002-12-03 21:48:05.000000000 +0300
++++ sdts++/io/sio_8211Converter.h	2012-03-11 19:56:04.000000000 +0300
+@@ -51,14 +51,16 @@
+                                      char const* data,
+                                      long bitLength) const = 0;
+ 
+-#ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
+-      long makeFixedSubfield(sc_Subfield& subfield,
+-                                     std::vector<char>::const_iterator & data,
+-                                     long bitLength) const
+-        {
+-          return makeFixedSubfield( subfield, &data[0], bitLength );
+-        }
+-#endif
++// The overload, incorrectly permitted by Autoconf, is disabled
++
++// #ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
++//       long makeFixedSubfield(sc_Subfield& subfield,
++//                                      std::vector<char>::const_iterator & data,
++//                                      long bitLength) const
++//         {
++//           return makeFixedSubfield( subfield, &data[0], bitLength );
++//         }
++// #endif
+ 
+       /// Variable width subfields
+       /** Returns the length of the data converted. This does not__ included
+@@ -68,15 +70,17 @@
+                                    long maxLength,
+                                    char delimiter) const;
+ 
+-#ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
+-      long makeVarSubfield(sc_Subfield& subfield,
+-                                   std::vector<char>::const_iterator & data,
+-                                   long maxLength,
+-                                   char delimiter) const
+-        {
+-          return makeVarSubfield( subfield, &data[0], maxLength, delimiter );
+-        }
+-#endif
++// The overload, incorrectly permitted by Autoconf, is disabled
++
++// #ifdef VECTOR_ITERATOR_POINTER_NOT_EQUIVALENT
++//       long makeVarSubfield(sc_Subfield& subfield,
++//                                    std::vector<char>::const_iterator & data,
++//                                    long maxLength,
++//                                    char delimiter) const
++//         {
++//           return makeVarSubfield( subfield, &data[0], maxLength, delimiter );
++//         }
++// #endif
+ 
+       /// Adds a "null field" (adds an end-of-field character) to the buffer.
+       virtual long addEmptySubfield(sio_Buffer& buffer) const;
diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile
index 986f30eb6a74..08998014aab5 100644
--- a/games/frogatto/Makefile
+++ b/games/frogatto/Makefile
@@ -1,64 +1,64 @@
 # New ports collection makefile for:	Frogatto & Friends
 # Date created:				14 Jul 2010
 # Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	frogatto
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.frogatto.com/files/
 
 MAINTAINER=	fiziologus@gmail.com
 COMMENT=	An old-school 2D classic adventure platformer game
 
 NO_PACKAGE=	Package will be 144M, set FORCE_PACKAGE if you really want it
 
 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	game server
 USE_GL=		glew
 USE_SDL=	image mixer ttf
 
 PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}-server
 
 post-patch:
 # Sanitize Makefile: honor CC/CXX and C[XX]FLAGS, trim `-mt' suffix from boost
 # libraries, remove superfluous libraries when linking server executable (add
 # missing -pthread instead), etc.
 	@${REINPLACE_CMD} -E -e 's,= (ccache )?gcc,:= $$(CC) $$(CFLAGS),' \
 		-e 's,= (ccache )?g\+\+,:= $$(CXX) $$(CXXFLAGS),' \
 		-e 's, -O2,, ; s, -g,, ; s, -L/usr/lib,, ; s, -L/sw/lib,,' \
 		-e '/server/s,`.*mixer,-L${LOCALBASE}/lib ${PTHREAD_LIBS},' \
 		-e 's,-mt,,g' ${WRKSRC}/Makefile
 # Point to the right location where to look for resources on FreeBSD
 	@${REINPLACE_CMD} -e 's,HAVE_CONFIG_H,__FreeBSD__,' \
 		-e 's,DATADIR,"${DATADIR}",' ${WRKSRC}/src/filesystem.cpp
 	@${REINPLACE_CMD} -E 's,(music|sounds)/,${DATADIR}/&,' \
 		${WRKSRC}/src/sound.cpp
 	@${REINPLACE_CMD} -e '/\/locale\//s,\.,${PREFIX}/share,' \
 		${WRKSRC}/src/i18n.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/game ${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/server ${PREFIX}/bin/${PORTNAME}-server
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "data images music sounds" \
 		${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "locale" ${PREFIX}/share
 # Fix permissions on DATADIR after COPYTREE_SHARE (cpio(1) defaults to 700
 # if target directory (${DATADIR}) does not exist)
 	@${CHMOD} 755 ${DATADIR}
 # Dynamically generate part of the PLIST for NLS files and game resources
 # (lots of them)
 	@${FIND} ${PREFIX}/share/locale -name ${PORTNAME}.mo | \
 		${SED} 's,^${PREFIX}/,,' | ${SORT} >> ${TMPPLIST}
 	@${FIND} ${DATADIR} -not -type d | \
 		${SED} 's,^${PREFIX}/,,' | ${SORT} >> ${TMPPLIST}
 	@${FIND} ${DATADIR} -type d | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' | ${SORT} -r >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/games/frogatto/files/patch-src-server.cpp b/games/frogatto/files/patch-src-server.cpp
new file mode 100644
index 000000000000..5304afd98839
--- /dev/null
+++ b/games/frogatto/files/patch-src-server.cpp
@@ -0,0 +1,11 @@
+--- src/server.cpp.orig	2012-03-12 10:21:03.000000000 +0300
++++ src/server.cpp	2012-03-12 10:21:15.000000000 +0300
+@@ -37,7 +37,7 @@
+ private:
+ 	void start_accept()
+ 	{
+-		socket_ptr socket(new tcp::socket(acceptor_.io_service()));
++		socket_ptr socket(new tcp::socket(acceptor_.get_io_service()));
+ 		acceptor_.async_accept(*socket, boost::bind(&server::handle_accept, this, socket, boost::asio::placeholders::error));
+ 	}
+ 
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index cfb830fa7533..2a6518717827 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,47 +1,47 @@
 # ex:ts=8
 # Ports collection Makefile for:	aqsis
 # Date created:			Sep 12, 2002
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aqsis
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 DISTNAME=	Aqsis-${PORTVERSION}-Source
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A photorealistic rendering system
 
 LICENSE=	BSD GPLv2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
     		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=	yes
 CMAKE_VERBOSE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	opengl qmake moc rcc uic
 PLIST_SUB+=	LIBVERS=${PORTVERSION:R}
 
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
 BROKEN=		does not compile on 6.X
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/aqsis/files/patch-libs-core-api-ri.cpp b/graphics/aqsis/files/patch-libs-core-api-ri.cpp
new file mode 100644
index 000000000000..7e77fcdc61a0
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-core-api-ri.cpp
@@ -0,0 +1,44 @@
+--- libs/core/api/ri.cpp.orig	2012-02-20 18:29:00.000000000 +0300
++++ libs/core/api/ri.cpp	2012-02-20 18:29:35.000000000 +0300
+@@ -488,12 +488,12 @@
+ 
+ 	// Read in the system configuration file.
+ 	boost::filesystem::path systemRcPath = rootPath / AQSIS_XSTR(AQSIS_MAIN_CONFIG_NAME);
+-	std::ifstream rcFile(systemRcPath.file_string().c_str(), std::ios::binary);
++	std::ifstream rcFile(systemRcPath.string().c_str(), std::ios::binary);
+ 	if(rcFile)
+ 	{
+ 		Aqsis::log() << info
+ 			<< "Reading system config \"" << systemRcPath << "\"\n";
+-		QGetRenderContext()->parseRibStream(rcFile, systemRcPath.file_string());
++		QGetRenderContext()->parseRibStream(rcFile, systemRcPath.string());
+ 		rcFile.close();
+ 	}
+ 	else
+@@ -508,22 +508,22 @@
+ 		boost::filesystem::path homeRcPath = homePath;
+ 		homeRcPath /= ".aqsisrc";
+ 
+-		std::ifstream rcFile(homeRcPath.file_string().c_str(), std::ios::binary);
++		std::ifstream rcFile(homeRcPath.string().c_str(), std::ios::binary);
+ 		if(rcFile)
+ 		{
+ 			Aqsis::log() << info << "Reading user config \"" << homeRcPath << "\"\n";
+-			QGetRenderContext()->parseRibStream(rcFile, homeRcPath.file_string());
++			QGetRenderContext()->parseRibStream(rcFile, homeRcPath.string());
+ 		}
+ 		else
+ 		{
+ 			boost::filesystem::path homeRcPath2 = homePath;
+ 			homeRcPath2 /= "_aqsisrc";
+ 		
+-			std::ifstream rcFile(homeRcPath2.file_string().c_str(), std::ios::binary);
++			std::ifstream rcFile(homeRcPath2.string().c_str(), std::ios::binary);
+ 			if(rcFile)
+ 			{
+ 				Aqsis::log() << info << "Reading user config \"" << homeRcPath2 << "\"\n";
+-				QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.file_string());
++				QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.string());
+ 			}
+ 			else
+ 			{
diff --git a/graphics/aqsis/files/patch-libs-core-ddmanager-ddmanager.cpp b/graphics/aqsis/files/patch-libs-core-ddmanager-ddmanager.cpp
new file mode 100644
index 000000000000..585382b6fef5
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-core-ddmanager-ddmanager.cpp
@@ -0,0 +1,11 @@
+--- libs/core/ddmanager/ddmanager.cpp.orig	2012-02-20 18:31:11.000000000 +0300
++++ libs/core/ddmanager/ddmanager.cpp	2012-02-20 18:31:27.000000000 +0300
+@@ -349,7 +349,7 @@
+ 		}
+ 		
+ 		// Load the dynamic object and locate the relevant symbols.
+-		CqString strDriverPathAndFile = displayPath.file_string();
++		CqString strDriverPathAndFile = displayPath.string();
+ 		m_DriverHandle = dspyPlugin.SimpleDLOpen( &strDriverPathAndFile );
+ 		if ( m_DriverHandle != NULL )
+ 		{
diff --git a/graphics/aqsis/files/patch-libs-core-geometry-blobby.cpp b/graphics/aqsis/files/patch-libs-core-geometry-blobby.cpp
new file mode 100644
index 000000000000..62d44efd1342
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-core-geometry-blobby.cpp
@@ -0,0 +1,11 @@
+--- libs/core/geometry/blobby.cpp.orig	2012-02-20 18:32:53.000000000 +0300
++++ libs/core/geometry/blobby.cpp	2012-02-20 18:33:07.000000000 +0300
+@@ -392,7 +392,7 @@
+ 							try
+ 							{
+ 								CqString fullName = QGetRenderContext()->poptCurrent()
+-									->findRiFile(dboName, "procedural").file_string();
++									->findRiFile(dboName, "procedural").string();
+ 								DBO_handle = DBO.SimpleDLOpen(&fullName);
+ 							}
+ 							catch(XqInvalidFile& /*e*/)
diff --git a/graphics/aqsis/files/patch-libs-core-geometry-procedural.cpp b/graphics/aqsis/files/patch-libs-core-geometry-procedural.cpp
new file mode 100644
index 000000000000..5d70143a7823
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-core-geometry-procedural.cpp
@@ -0,0 +1,20 @@
+--- libs/core/geometry/procedural.cpp.orig	2012-02-20 18:54:32.000000000 +0300
++++ libs/core/geometry/procedural.cpp	2012-02-20 18:54:50.000000000 +0300
+@@ -155,7 +155,7 @@
+ 				          + CqString ("\" in current searchpath");
+ 				return;
+ 			}
+-			CqString strRealName = dsoPath.file_string();
++			CqString strRealName = dsoPath.string();
+ 			void *handle = DLOpen( &strRealName );
+ 
+ 			if ( ( m_ppvfcts = ( void * ( * ) ( char * ) ) DLSym(handle, &strConver) ) == NULL )
+@@ -315,7 +315,7 @@
+ 		AQSIS_THROW_XQERROR(XqValidation, EqE_BadToken, "program name not present");
+ 	// Attempt to find the program in the procedural path
+ 	std::string progName = QGetRenderContext()->poptCurrent()
+-		->findRiFileNothrow(argv[0], "procedural").file_string();
++		->findRiFileNothrow(argv[0], "procedural").string();
+ 	if(progName.empty())
+ 	{
+ 		progName = argv[0];
diff --git a/graphics/aqsis/files/patch-libs-core-renderer.cpp b/graphics/aqsis/files/patch-libs-core-renderer.cpp
new file mode 100644
index 000000000000..0af18bd72764
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-core-renderer.cpp
@@ -0,0 +1,11 @@
+--- libs/core/renderer.cpp.orig	2012-02-20 18:46:39.000000000 +0300
++++ libs/core/renderer.cpp	2012-02-20 18:46:49.000000000 +0300
+@@ -1195,7 +1195,7 @@
+ 	if(shaderFile)
+ 	{
+ 		Aqsis::log() << info << "Loading shader \"" << strName
+-			<< "\" from file \"" << shaderPath.file_string()
++			<< "\" from file \"" << shaderPath.string()
+ 			<< "\"" << std::endl;
+ 
+ 		std::string dsoPath;
diff --git a/graphics/aqsis/files/patch-libs-core-texturing_old-texturemap_old.cpp b/graphics/aqsis/files/patch-libs-core-texturing_old-texturemap_old.cpp
new file mode 100644
index 000000000000..f3c9748822e2
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-core-texturing_old-texturemap_old.cpp
@@ -0,0 +1,20 @@
+--- libs/core/texturing_old/texturemap_old.cpp.orig	2012-02-20 18:39:35.000000000 +0300
++++ libs/core/texturing_old/texturemap_old.cpp	2012-02-20 18:39:50.000000000 +0300
+@@ -578,7 +578,7 @@
+ 		}
+ 
+ 		// Now open it as a tiff file.
+-		m_pImage = TIFFOpen( imagePath.file_string().c_str(), "r" );
++		m_pImage = TIFFOpen( imagePath.string().c_str(), "r" );
+ 	}
+ 
+ 	if ( m_pImage )
+@@ -1090,7 +1090,7 @@
+ 		Aqsis::log() << error << "Cannot open texture file \"" << m_strName.c_str() << "\"" << std::endl;
+ 		return ;
+ 	}
+-	m_pImage = TIFFOpen(imagePath.file_string().c_str(), "r" );
++	m_pImage = TIFFOpen(imagePath.string().c_str(), "r" );
+ 
+ 	if ( m_pImage )
+ 	{
diff --git a/graphics/aqsis/files/patch-libs-shadervm-dsoshadeops.cpp b/graphics/aqsis/files/patch-libs-shadervm-dsoshadeops.cpp
new file mode 100644
index 000000000000..7f1dc8109749
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-shadervm-dsoshadeops.cpp
@@ -0,0 +1,18 @@
+--- libs/shadervm/dsoshadeops.cpp.orig	2012-02-20 18:12:04.000000000 +0300
++++ libs/shadervm/dsoshadeops.cpp	2012-02-20 18:12:22.000000000 +0300
+@@ -101,13 +101,13 @@
+ 				// If the path points to a directory, we add each library in the
+ 				// named directory to the list of DSO candidates.
+ 				std::vector<std::string> files = Glob(
+-						((*path)/"*" SHARED_LIBRARY_SUFFIX).file_string() );
++						((*path)/"*" SHARED_LIBRARY_SUFFIX).string() );
+ 				m_DSOPathList.insert(m_DSOPathList.end(), files.begin(), files.end());
+ 			}
+ 			else
+ 			{
+ 				// else add the file itself.
+-				m_DSOPathList.push_back(path->file_string());
++				m_DSOPathList.push_back(path->string());
+ 			}
+ 		}
+ 		catch(boost::filesystem::filesystem_error& /*e*/)
diff --git a/graphics/aqsis/files/patch-libs-tex-io-exrinputfile.cpp b/graphics/aqsis/files/patch-libs-tex-io-exrinputfile.cpp
new file mode 100644
index 000000000000..20d50524e33a
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-tex-io-exrinputfile.cpp
@@ -0,0 +1,11 @@
+--- libs/tex/io/exrinputfile.cpp.orig	2012-02-20 18:09:25.000000000 +0300
++++ libs/tex/io/exrinputfile.cpp	2012-02-20 18:09:41.000000000 +0300
+@@ -163,7 +163,7 @@
+ {
+ 	try
+ 	{
+-		m_exrFile.reset(new Imf::InputFile(fileName.file_string().c_str()));
++		m_exrFile.reset(new Imf::InputFile(fileName.string().c_str()));
+ 	}
+ 	catch(Iex::BaseExc &e)
+ 	{
diff --git a/graphics/aqsis/files/patch-libs-tex-io-magicnumber.cpp b/graphics/aqsis/files/patch-libs-tex-io-magicnumber.cpp
new file mode 100644
index 000000000000..8e12c97d1fcf
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-tex-io-magicnumber.cpp
@@ -0,0 +1,11 @@
+--- libs/tex/io/magicnumber.cpp.orig	2012-02-20 18:01:58.000000000 +0300
++++ libs/tex/io/magicnumber.cpp	2012-02-20 18:02:12.000000000 +0300
+@@ -59,7 +59,7 @@
+ 
+ EqImageFileType guessFileType(const boostfs::path& fileName)
+ {
+-	std::ifstream inFile(fileName.file_string().c_str());
++	std::ifstream inFile(fileName.string().c_str());
+ 	if(!inFile)
+ 	{
+ 		AQSIS_THROW_XQERROR(XqInvalidFile, EqE_NoFile, "Cannot open file \""
diff --git a/graphics/aqsis/files/patch-libs-tex-io-tiffdirhandle.cpp b/graphics/aqsis/files/patch-libs-tex-io-tiffdirhandle.cpp
new file mode 100644
index 000000000000..67a4e14c0f9d
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-tex-io-tiffdirhandle.cpp
@@ -0,0 +1,11 @@
+--- libs/tex/io/tiffdirhandle.cpp.orig	2012-02-20 18:04:48.000000000 +0300
++++ libs/tex/io/tiffdirhandle.cpp	2012-02-20 18:05:02.000000000 +0300
+@@ -727,7 +727,7 @@
+ 
+ CqTiffFileHandle::CqTiffFileHandle(const boostfs::path& fileName, const char* openMode)
+ 	: m_fileName(fileName),
+-	m_tiffPtr(TIFFOpen(fileName.file_string().c_str(), openMode), safeTiffClose),
++	m_tiffPtr(TIFFOpen(fileName.string().c_str(), openMode), safeTiffClose),
+ 	m_isInputFile(openMode[0] == 'r'),
+ 	m_currDir(0)
+ {
diff --git a/graphics/aqsis/files/patch-libs-tex-io-zinputfile.cpp b/graphics/aqsis/files/patch-libs-tex-io-zinputfile.cpp
new file mode 100644
index 000000000000..3d89797ec5d2
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-tex-io-zinputfile.cpp
@@ -0,0 +1,11 @@
+--- libs/tex/io/zinputfile.cpp.orig	2012-02-20 18:08:03.000000000 +0300
++++ libs/tex/io/zinputfile.cpp	2012-02-20 18:08:19.000000000 +0300
+@@ -41,7 +41,7 @@
+ CqZInputFile::CqZInputFile(const boostfs::path& fileName)
+ 	: m_header(),
+ 	m_fileName(fileName),
+-	m_fileStream(fileName.file_string().c_str(), std::ios::in | std::ios::binary),
++	m_fileStream(fileName.string().c_str(), std::ios::in | std::ios::binary),
+ 	m_dataBegin(0)
+ {
+ 	if(!m_fileStream.is_open())
diff --git a/graphics/aqsis/files/patch-libs-tex-maketexture-maketexture.cpp b/graphics/aqsis/files/patch-libs-tex-maketexture-maketexture.cpp
new file mode 100644
index 000000000000..81450692f29d
--- /dev/null
+++ b/graphics/aqsis/files/patch-libs-tex-maketexture-maketexture.cpp
@@ -0,0 +1,13 @@
+--- libs/tex/maketexture/maketexture.cpp.orig	2012-02-20 18:10:38.000000000 +0300
++++ libs/tex/maketexture/maketexture.cpp	2012-02-20 18:10:56.000000000 +0300
+@@ -335,8 +335,8 @@
+ 	{
+ 		inFileRealName = inFileName.string() + ".tif";
+ 		TqInt bakeRes = static_cast<TqInt>(paramList.find<TqFloat>("bake", 256));
+-		bakeToTiff(inFileName.file_string().c_str(),
+-				   inFileRealName.file_string().c_str(), bakeRes);
++		bakeToTiff(inFileName.string().c_str(),
++				   inFileRealName.string().c_str(), bakeRes);
+ 	}
+ 
+ 	// Open the input file
diff --git a/graphics/aqsis/files/patch-tools-piqsl-displayserverimage.cpp b/graphics/aqsis/files/patch-tools-piqsl-displayserverimage.cpp
new file mode 100644
index 000000000000..217a3b4c6d30
--- /dev/null
+++ b/graphics/aqsis/files/patch-tools-piqsl-displayserverimage.cpp
@@ -0,0 +1,13 @@
+--- tools/piqsl/displayserverimage.cpp.orig	2012-02-20 18:42:02.000000000 +0300
++++ tools/piqsl/displayserverimage.cpp	2012-02-20 18:42:18.000000000 +0300
+@@ -98,8 +98,8 @@
+ 		++index;
+ 	}
+ 
+-	setFilename(uniquePath.file_string());
+-	saveToFile(uniquePath.file_string());
++	setFilename(uniquePath.string());
++	saveToFile(uniquePath.string());
+ }
+ 
+ 
diff --git a/graphics/aqsis/files/patch-tools-piqsl-piqslmainwindow.cpp b/graphics/aqsis/files/patch-tools-piqsl-piqslmainwindow.cpp
new file mode 100644
index 000000000000..278e92a5aa83
--- /dev/null
+++ b/graphics/aqsis/files/patch-tools-piqsl-piqslmainwindow.cpp
@@ -0,0 +1,11 @@
+--- tools/piqsl/piqslmainwindow.cpp.orig	2012-02-20 18:43:33.000000000 +0300
++++ tools/piqsl/piqslmainwindow.cpp	2012-02-20 18:44:04.000000000 +0300
+@@ -186,7 +186,7 @@
+ 	char* filename = fl_file_chooser("Load Image", "All Supported Files (*.{tif,tiff,exr,env,tx,tex,shad,zfile,sm})\tTIFF Files (*.{tif,tiff})\tOpenEXR Files (*.exr)\tTeqser Files (*.{env,tx,tex})\tShadow Files (*.{shad,zfile,sm})", "");
+ 	if(filename)
+ 	{
+-		std::string name = boost::filesystem::path(filename).leaf();
++                std::string name = boost::filesystem::path(filename).leaf().string();
+ 		loadImageToCurrentBook(name, filename);
+ 		updateImageList();
+ 	}
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index c8ad8b8bef62..7f9d77a891ae 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -1,86 +1,86 @@
 # New ports collection makefile for: net-p2p/eiskaltdc
 # Date created:		28 Aug 2009
 # Whom:			Stas Timokhin <stast@bsdportal.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	eiskaltdcpp-lib
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
 
 MAINTAINER=	gelraen.ua@gmail.com
 COMMENT=	A Direct Connect client shared library
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs
 BUILD_DEPENDS+=	chrpath:${PORTSDIR}/devel/chrpath
 
 PROJECTHOST=	eiskaltdc
 
 USE_XZ=		yes
 USE_GCC=	4.4+
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	LUA	"Lua scripting support"	off \
 		PCRE	"PCRE support in ADL Search" off \
 		IDN	"IDN support" on \
 		DHT	"DHT support" on
 
 .include <bsd.port.options.mk>
 
 CMAKE_ARGS+=	-DINSTALL_HEADERS:BOOL=ON
 CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_ASPELL:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=OFF
 CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
 
 .if defined(WITH_LUA) && !defined(WITHOUT_LUA)
 USE_LUA=	5.1
 CMAKE_ARGS+=	-DLUA_SCRIPT:BOOL=ON
 IGNORE=	crashes on connect attempt if built with Lua support
 .else
 CMAKE_ARGS+=	-DLUA_SCRIPT:BOOL=OFF
 .endif
 
 .if defined(WITH_PCRE) && !defined(WITHOUT_PCRE)
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 CMAKE_ARGS+=	-DPERL_REGEX:BOOL=ON
 .else
 CMAKE_ARGS+=	-DPERL_REGEX:BOOL=OFF
 .endif
 
 .if defined(WITH_IDN) && !defined(WITHOUT_IDN)
 LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
 CMAKE_ARGS+=	-DUSE_IDNA:BOOL=ON
 .else
 CMAKE_ARGS+=	-DUSE_IDNA:BOOL=OFF
 .endif
 
 .if defined(WITH_DHT) && !defined(WITHOUT_DHT)
 CMAKE_ARGS+=	-DWITH_DHT:BOOL=ON
 .else
 CMAKE_ARGS+=	-DWITH_DHT:BOOL=OFF
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700024
 USE_OPENSSL_PORT=yes
 .endif
 
 GCC_LIBS=	"${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"
 
 post-build:
 	${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/dcpp/libeiskaltdcpp.so.2.2"
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp-Atomic.h b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp-Atomic.h
new file mode 100644
index 000000000000..3d8eb02871a8
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp-Atomic.h
@@ -0,0 +1,25 @@
+--- dcpp/Atomic.h.orig	2012-01-27 21:20:06.000000000 +0300
++++ dcpp/Atomic.h	2012-01-27 21:21:11.000000000 +0300
+@@ -57,18 +57,18 @@
+ 
+         // type cast
+         operator value_type() const {
+-                return boost::interprocess::detail::atomic_read32(&m_value);
++                return boost::interprocess::ipcdetail::atomic_read32(&m_value);
+         }
+ 
+         // increment
+-        void inc() { boost::interprocess::detail::atomic_inc32(&m_value); }
++        void inc() { boost::interprocess::ipcdetail::atomic_inc32(&m_value); }
+ 
+         // decrement
+-        void dec() { boost::interprocess::detail::atomic_dec32(&m_value); }
++        void dec() { boost::interprocess::ipcdetail::atomic_dec32(&m_value); }
+ 
+ private:
+         mutable value_type m_value;
+-        void assign(value_type val) { boost::interprocess::detail::atomic_write32(&m_value, val); }
++        void assign(value_type val) { boost::interprocess::ipcdetail::atomic_write32(&m_value, val); }
+ };
+ 
+ // int32_t
diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index 7fb79a8aa9f0..82c527654d70 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -1,71 +1,71 @@
 # New ports collection makefile for:	libtorrent-rasterbar-14
 # Date created:				14 February 2010
 # Whom:					dougb@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libtorrent-rasterbar
 PORTVERSION=	0.14.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	libtorrent
 
 MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	A C++ library implementing a BitTorrent client
 
 LIB_DEPENDS=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
 		GeoIP.5:${PORTSDIR}/net/GeoIP
 
 MAKE_JOBS_SAFE=	yes
 
 CONFLICTS=	libtorrent-rasterbar-0.1[2356789].*
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf libtool
 ACLOCAL_ARGS=	-I m4
 CONFIGURE_ARGS=	--disable-debug \
 		--disable-python-binding \
 		--disable-examples \
 		--with-boost-regex=no \
 		--with-boost-program-options=no \
 		--with-boost=${LOCALBASE} \
 		--with-boost-asio=boost_system \
 		--with-boost-system=boost_system \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-thread=boost_thread \
 		--with-dht=on \
 		--with-encryption=on \
 		--with-libgeoip \
 		--with-zlib=system
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|^AM_CFLAGS|AM_CPPFLAGS|g' \
 		 ${WRKSRC}/src/Makefile.am
 	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Dist
 	@${SED} -e 's#COMPILETIME_OPTIONS+="#COMPILETIME_OPTIONS="$$COMPILETIME_OPTIONS #g' \
 		${WRKSRC}/configure.Dist > ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.css ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-create_torrent.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-create_torrent.hpp
new file mode 100644
index 000000000000..1a5ede745a3f
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-create_torrent.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/create_torrent.hpp.orig	2012-01-27 21:05:27.000000000 +0300
++++ include/libtorrent/create_torrent.hpp	2012-01-27 21:05:56.000000000 +0300
+@@ -152,7 +152,7 @@
+ #if BOOST_VERSION < 103600
+ 					std::string leaf = i->path().leaf();
+ #else
+-					std::string leaf = i->path().filename();
++					std::string leaf = i->path().filename().string();
+ #endif
+ 					if (leaf == ".." || leaf == ".") continue;
+ 					add_files_impl(fs, p, l / leaf, pred);
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-debug.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-debug.hpp
new file mode 100644
index 000000000000..112b73bb973e
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-debug.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/debug.hpp.orig	2012-01-27 20:16:02.000000000 +0300
++++ include/libtorrent/debug.hpp	2012-01-27 20:16:23.000000000 +0300
+@@ -64,7 +64,7 @@
+ 			try
+ 			{
+ #endif
+-				fs::path dir(fs::complete(logpath / ("libtorrent_logs" + boost::lexical_cast<std::string>(instance))));
++				fs::path dir(fs::absolute(logpath / ("libtorrent_logs" + boost::lexical_cast<std::string>(instance))));
+ 				if (!fs::exists(dir)) fs::create_directories(dir);
+ 				m_file.open((dir / filename).string().c_str(), std::ios_base::out | (append ? std::ios_base::app : std::ios_base::out));
+ 				*this << "\n\n\n*** starting log ***\n";
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-create_torrent.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-create_torrent.cpp
new file mode 100644
index 000000000000..f3be87da0a67
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src-create_torrent.cpp
@@ -0,0 +1,11 @@
+--- src/create_torrent.cpp.orig	2010-01-19 04:42:35.000000000 +0300
++++ src/create_torrent.cpp	2012-01-27 21:04:43.000000000 +0300
+@@ -217,7 +217,7 @@
+ 					for (fs::path::iterator j = boost::next(i->path.begin());
+ 						j != i->path.end(); ++j)
+ 					{
+-						path_e.list().push_back(entry(*j));
++                                                path_e.list().push_back(entry((*j).string()));
+ 					}
+ 				}
+ 			}
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-file.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-file.cpp
new file mode 100644
index 000000000000..8f739d6d5f7b
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src-file.cpp
@@ -0,0 +1,11 @@
+--- src/file.cpp.orig	2012-01-27 20:46:48.000000000 +0300
++++ src/file.cpp	2012-01-27 20:47:10.000000000 +0300
+@@ -207,7 +207,7 @@
+ 			| S_IRGRP | S_IWGRP
+ 			| S_IROTH | S_IWOTH;
+ 
+-		m_fd = ::open(path.external_file_string().c_str()
++		m_fd = ::open(path.native().c_str()
+ 			, map_open_mode(mode.m_mask), permissions);
+ 
+ 		if (m_fd == -1)
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-file_storage.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-file_storage.cpp
new file mode 100644
index 000000000000..8005b61ef6c6
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src-file_storage.cpp
@@ -0,0 +1,14 @@
+--- src/file_storage.cpp.orig	2012-01-27 20:52:46.000000000 +0300
++++ src/file_storage.cpp	2012-01-27 20:54:50.000000000 +0300
+@@ -147,9 +147,9 @@
+ 		else
+ 		{
+ 			if (m_files.empty())
+-				m_name = *file.begin();
++                                m_name = (*file.begin()).string();
+ 		}
+-		TORRENT_ASSERT(m_name == *file.begin());
++		TORRENT_ASSERT(m_name == (*file.begin()).string());
+ 		file_entry e;
+ 		m_files.push_back(e);
+ 		m_files.back().size = size;
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-logger.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-logger.cpp
new file mode 100644
index 000000000000..98b98117a919
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src-logger.cpp
@@ -0,0 +1,11 @@
+--- src/logger.cpp.orig	2012-01-27 20:49:39.000000000 +0300
++++ src/logger.cpp	2012-01-27 20:49:56.000000000 +0300
+@@ -63,7 +63,7 @@
+ 	{
+ 		logger_peer_plugin(std::string const& filename)
+ 		{
+-			fs::path dir(fs::complete("libtorrent_ext_logs"));
++			fs::path dir(fs::absolute("libtorrent_ext_logs"));
+ 			if (!fs::exists(dir)) fs::create_directories(dir);
+ 			m_file.open((dir / filename).string().c_str(), std::ios_base::out | std::ios_base::out);
+ 			m_file << "\n\n\n";
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-storage.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-storage.cpp
new file mode 100644
index 000000000000..d018605a9f9f
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src-storage.cpp
@@ -0,0 +1,90 @@
+--- src/storage.cpp.orig	2010-09-06 03:59:03.000000000 +0400
++++ src/storage.cpp	2012-01-27 20:39:22.000000000 +0300
+@@ -161,7 +161,7 @@
+ 	template <class Path>
+ 	void recursive_copy(Path const& old_path, Path const& new_path, error_code& ec)
+ 	{
+-		using boost::filesystem::basic_directory_iterator;
++		using boost::filesystem::directory_iterator;
+ #ifndef BOOST_NO_EXCEPTIONS
+ 		try {
+ #endif
+@@ -169,7 +169,7 @@
+ 		if (is_directory(old_path))
+ 		{
+ 			create_directory(new_path);
+-			for (basic_directory_iterator<Path> i(old_path), end; i != end; ++i)
++			for (directory_iterator i(old_path), end; i != end; ++i)
+ 			{
+ #if BOOST_VERSION < 103600
+ 				recursive_copy(i->path(), new_path / i->path().leaf(), ec);
+@@ -202,13 +202,13 @@
+ 	template <class Path>
+ 	void recursive_remove(Path const& old_path)
+ 	{
+-		using boost::filesystem::basic_directory_iterator;
++		using boost::filesystem::directory_iterator;
+ #ifndef BOOST_NO_EXCEPTIONS
+ 		try {
+ #endif
+ 		if (is_directory(old_path))
+ 		{
+-			for (basic_directory_iterator<Path> i(old_path), end; i != end; ++i)
++			for (directory_iterator i(old_path), end; i != end; ++i)
+ 				recursive_remove(i->path());
+ 			remove(old_path);
+ 		}
+@@ -301,7 +301,7 @@
+ 				|| (!compact_mode && size < s->first))
+ 			{
+ 				if (error) *error = "filesize mismatch for file '"
+-					+ i->path.external_file_string()
++					+ i->path.native()
+ 					+ "', size: " + boost::lexical_cast<std::string>(size)
+ 					+ ", expected to be " + boost::lexical_cast<std::string>(s->first)
+ 					+ " bytes";
+@@ -314,7 +314,7 @@
+ 				(!compact_mode && (time > s->second + 5 * 60 || time < s->second - 1)))
+ 			{
+ 				if (error) *error = "timestamp mismatch for file '"
+-					+ i->path.external_file_string()
++					+ i->path.native()
+ 					+ "', modification date: " + boost::lexical_cast<std::string>(time)
+ 					+ ", expected to have modification date "
+ 					+ boost::lexical_cast<std::string>(s->second);
+@@ -334,7 +334,7 @@
+ 			if (mapped) m_mapped_files.reset(new file_storage(*mapped));
+ 
+ 			TORRENT_ASSERT(m_files.begin() != m_files.end());
+-			m_save_path = fs::complete(path);
++			m_save_path = fs::absolute(path);
+ 			TORRENT_ASSERT(m_save_path.is_complete());
+ 		}
+ 
+@@ -781,7 +781,7 @@
+ 			{
+ 				if (i->size != fs->first)
+ 				{
+-					error = "file size for '" + i->path.external_file_string()
++					error = "file size for '" + i->path.native()
+ 						+ "' was expected to be "
+ 						+ boost::lexical_cast<std::string>(i->size) + " bytes";
+ 					return false;
+@@ -828,7 +828,7 @@
+ 		for (file_storage::iterator i = f.begin()
+ 			, end(f.end()); i != end; ++i)
+ 		{
+-			to_move.insert(to_move.begin(), *i->path.begin());
++                        to_move.insert(to_move.begin(), (*i->path.begin()).string());
+ 		}
+ 
+ 		for (std::set<std::string>::const_iterator i = to_move.begin()
+@@ -1461,7 +1461,7 @@
+ 	{
+ 		if (m_storage->move_storage(save_path))
+ 		{
+-			m_save_path = fs::complete(save_path);
++			m_save_path = fs::absolute(save_path);
+ 			return 0;
+ 		}
+ 		return -1;
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-torrent_info.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-torrent_info.cpp
new file mode 100644
index 000000000000..82632ed24b04
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src-torrent_info.cpp
@@ -0,0 +1,11 @@
+--- src/torrent_info.cpp.orig	2012-01-27 20:42:54.000000000 +0300
++++ src/torrent_info.cpp	2012-01-27 20:44:06.000000000 +0300
+@@ -199,7 +199,7 @@
+ 		fs::path new_path;
+ 		for (fs::path::const_iterator i = p.begin(); i != p.end(); ++i)
+ 		{
+-			if (!valid_path_element(*i)) continue;
++                        if (!valid_path_element((*i).string())) continue;
+ 			new_path /= *i;
+ 		}
+ 		TORRENT_ASSERT(!new_path.is_complete());