Index: head/math/fityk/Makefile
===================================================================
--- head/math/fityk/Makefile	(revision 385069)
+++ head/math/fityk/Makefile	(revision 385070)
@@ -1,74 +1,76 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	fityk
 PORTVERSION=	0.9.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	GHC SF/xylib:xylib
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
 		${XYLIB_DISTNAME}${EXTRACT_SUFX}:xylib
 
 MAINTAINER=	sperber@FreeBSD.org
 COMMENT=	Free peak fitting software
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:${PORTSDIR}/devel/boost-libs \
 		gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
-USES=		desktop-file-utils gmake libtool shared-mime-info tar:bzip2
+USES=		compiler:c++11-lib desktop-file-utils gmake libtool \
+		shared-mime-info tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LDFLAGS+=	-lbz2 -lz
 USE_GITHUB=	yes
 GH_ACCOUNT=	wojdyr
+USE_CXXSTD=	c++11
 USE_GNOME=	gtk20
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-doc --disable-xyconvert
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	*
 
 CFLAGS+=	-D_GNU_SOURCE
 CPPFLAGS+=	-I${WRKDIR}/${XYLIB_DISTNAME} \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
 		-lpthread -L${LOCALBASE}/lib
 
 XYLIB_DISTNAME=	xylib-1.1
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/HELP_DEF/s|pkgdatadir|docdir|g' \
 		${WRKSRC}/src/wxgui/Makefile.in
 	@${REINPLACE_CMD} -e '/XYLIB_USE_TR1_MEMORY/s| 1| 0|g' \
 		${WRKDIR}/${XYLIB_DISTNAME}/xylib/cache.h
 
 pre-configure:
 	@cd ${WRKDIR}/${XYLIB_DISTNAME} \
 		&& ${SH} ./configure --disable-shared \
 			CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" \
 			CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-build:
 	@cd ${WRKDIR}/${XYLIB_DISTNAME} \
 		&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 			${ALL_TARGET}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/fityk.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKDIR}/${XYLIB_DISTNAME}/xyconv ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/${XYLIB_DISTNAME}/xyconv.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/math/fityk/files/patch-src__guess.cpp
===================================================================
--- head/math/fityk/files/patch-src__guess.cpp	(nonexistent)
+++ head/math/fityk/files/patch-src__guess.cpp	(revision 385070)
@@ -0,0 +1,12 @@
+--- src/guess.cpp.orig	2011-06-04 00:10:02 UTC
++++ src/guess.cpp
+@@ -15,7 +15,8 @@
+ #include "settings.h"
+ 
+ using namespace std;
+-using boost::array;
++// Macro to avoid ambiguity with std::array (C++11)
++#define array boost::array
+ 
+ const array<string, 3> Guess::linear_traits =
+                                     {{ "slope", "intercept", "avgy" }};

Property changes on: head/math/fityk/files/patch-src__guess.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/math/fityk/files/patch-src__wxgui__sidebar.cpp
===================================================================
--- head/math/fityk/files/patch-src__wxgui__sidebar.cpp	(nonexistent)
+++ head/math/fityk/files/patch-src__wxgui__sidebar.cpp	(revision 385070)
@@ -0,0 +1,11 @@
+--- src/wxgui/sidebar.cpp.orig	2015-04-30 21:04:15 UTC
++++ src/wxgui/sidebar.cpp
+@@ -897,7 +897,7 @@ void SideBar::update_func_inf()
+     realt a;
+     if (func->get_center(&a))
+         inf->AppendText(wxT("Center: ")
+-                   + s2wx(format1<realt, 30>("%.10"REALT_LENGTH_MOD"g", a)));
++                   + s2wx(format1<realt, 30>("%.10" REALT_LENGTH_MOD "g", a)));
+     if (func->get_area(&a))
+         inf->AppendText(wxT("\nArea: ") + s2wx(S(a)));
+     if (func->get_height(&a))

Property changes on: head/math/fityk/files/patch-src__wxgui__sidebar.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