Index: head/graphics/scantailor/Makefile
===================================================================
--- head/graphics/scantailor/Makefile	(revision 420615)
+++ head/graphics/scantailor/Makefile	(revision 420616)
@@ -1,69 +1,71 @@
 # Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scantailor
 PORTVERSION=	0.9.11.1
 PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Interactive post-processing tool for scanned pages
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libjbig.so:graphics/jbigkit \
-		libpng.so:graphics/png
+		libpng.so:graphics/png \
+
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
+#MAKE_JOBS_UNSAFE=	yes
 USES=		cmake gettext jpeg
-USE_GCC=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	corelib gui xml qmake_build uic_build moc_build rcc_build \
 		linguist_build
+USE_XORG+=	xrender
 
 DESKTOP_ENTRIES="Scan Tailor" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Graphics;Scanning;" false
 
 OPTIONS_GROUP=	DOXYGEN
 
 OPTIONS_GROUP_DOXYGEN=	HTML LATEX
 
 OPTIONS_DEFAULT=
 
 HTML_DESC=	Install HTML Doxygen files
 LATEX_DESC=	Install LaTeX Doxygen files
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
 PORTDOCS=	*
 .endif
 
 .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
 BUILD_DEPENDS+=	doxygen:devel/doxygen
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_[12]|boost::lambda::&|g; s|bind(|boost::lambda::&|' \
 		${WRKSRC}/filters/*/Filter.cpp
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/icons/appicon-about.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
 	@cd ${WRKSRC} && doxygen .
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MHTML}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MLATEX}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} latex ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/scantailor/files/patch-GridTraverser_cpp
===================================================================
--- head/graphics/scantailor/files/patch-GridTraverser_cpp	(nonexistent)
+++ head/graphics/scantailor/files/patch-GridTraverser_cpp	(revision 420616)
@@ -0,0 +1,11 @@
+--- foundation/GridLineTraverser.cpp
++++ foundation/GridLineTraverser.cpp
+@@ -19,6 +19,7 @@
+ #include "GridLineTraverser.h"
+ #include "LineIntersectionScalar.h"
+ #include <algorithm>
++#include <cstdlib>
+ 
+ GridLineTraverser::GridLineTraverser(QLineF const& line)
+ {
+

Property changes on: head/graphics/scantailor/files/patch-GridTraverser_cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/scantailor/files/patch-MatrixCalc.h
===================================================================
--- head/graphics/scantailor/files/patch-MatrixCalc.h	(nonexistent)
+++ head/graphics/scantailor/files/patch-MatrixCalc.h	(revision 420616)
@@ -0,0 +1,12 @@
+--- math/MatrixCalc.h
++++ math/MatrixCalc.h
+@@ -74,7 +74,7 @@ class DynamicPoolAllocator : public AbstractAllocator<T>
+ template<typename T>
+ class Mat
+ {
+-	template<typename OT, typename Alloc> friend class MatrixCalc;
++	template<typename OT, typename Alloc> friend class ::MatrixCalc;
+ 	template<typename OT> friend Mat<OT> operator+(Mat<OT> const& m1, Mat<OT> const& m2);
+ 	template<typename OT> friend Mat<OT> operator-(Mat<OT> const& m1, Mat<OT> const& m2);
+ 	template<typename OT> friend Mat<OT> operator*(Mat<OT> const& m1, Mat<OT> const& m2);
+

Property changes on: head/graphics/scantailor/files/patch-MatrixCalc.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/scantailor/files/patch-ProfilesDialog_cpp
===================================================================
--- head/graphics/scantailor/files/patch-ProfilesDialog_cpp	(nonexistent)
+++ head/graphics/scantailor/files/patch-ProfilesDialog_cpp	(revision 420616)
@@ -0,0 +1,29 @@
+--- ProjectFilesDialog.cpp
++++ ProjectFilesDialog.cpp
+@@ -279,7 +279,7 @@ ProjectFilesDialog::inProjectFiles() const
+ 	using namespace boost::lambda;
+ 	
+ 	std::vector<ImageFileInfo> files;
+-	m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, ref(files), _1));
++	m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, boost::ref(files), _1));
+ 	
+ 	std::sort(files.begin(), files.end(), imageFileInfoLess);
+ 	
+@@ -439,7 +439,7 @@ ProjectFilesDialog::setInputDir(QString const& dir, bool const auto_add_files)
+ 		files.begin(), files.end(),
+ 		bind(
+ 			&pushItemWithFlags<Item, ItemList>,
+-			_1, ref(items), cref(m_supportedExtensions)
++			_1, boost::ref(items), cref(m_supportedExtensions)
+ 		)
+ 	);
+ 	
+@@ -510,7 +510,7 @@ ProjectFilesDialog::removeFromProject()
+ 	m_ptrInProjectFiles->items(
+ 		selection, bind(
+ 			&pushItemIfSameDir<Item, ItemList>,
+-			ref(items), _1, cref(input_dir)
++			boost::ref(items), _1, cref(input_dir)
+ 		)
+ 	);
+ 	

Property changes on: head/graphics/scantailor/files/patch-ProfilesDialog_cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property