* Fix building with GCC (PR#48388).

* Build long double math libraries on NetBSD and FreeBSD.
* Removed obsolete patches.

8 files changed, 28 insertions, 52 deletions

diff --git a/devel/boost-build/toolset.mk b/devel/boost-build/toolset.mk
index 6ffe866e334..27a7513ab83 100644
--- a/devel/boost-build/toolset.mk
+++ b/devel/boost-build/toolset.mk
@@ -1,11 +1,11 @@
-# $NetBSD: toolset.mk,v 1.5 2011/02/24 11:05:34 adam Exp $
+# $NetBSD: toolset.mk,v 1.6 2013/11/20 19:17:55 adam Exp $
 
 .if !empty(PKGSRC_COMPILER:Mgcc)
-.  if ${OPSYS} == "Darwin"
-BOOST_TOOLSET=		darwin
-.  else
+#.  if ${OPSYS} == "Darwin"
+#BOOST_TOOLSET=		darwin
+#.  else
 BOOST_TOOLSET=		gcc
-.  endif
+#.  endif
 .elif !empty(PKGSRC_COMPILER:Mclang)
 BOOST_TOOLSET=		clang
 .elif !empty(PKGSRC_COMPILER:Mmipspro*)
diff --git a/devel/boost-jam/bjam.mk b/devel/boost-jam/bjam.mk
index c38c2a93329..2b502d8a45d 100644
--- a/devel/boost-jam/bjam.mk
+++ b/devel/boost-jam/bjam.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bjam.mk,v 1.14 2013/11/12 16:49:07 adam Exp $
+# $NetBSD: bjam.mk,v 1.15 2013/11/20 19:17:55 adam Exp $
 
 .include "../../devel/boost-jam/buildlink3.mk"
 
@@ -15,20 +15,28 @@ BJAM_ARGS+=		--layout=system
 BJAM_ARGS+=		--toolset=${BOOST_TOOLSET}
 BJAM_ARGS+=		--disable-long-double
 BJAM_ARGS+=		${BJAM_BUILD}
-# GCC 4.4 and above needs this
+
 .include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)
+
+.if !empty(PKGSRC_COMPILER:Mgcc)
+.  if !empty(CC_VERSION:Mgcc-4.[4-7]*)
 BJAM_ARGS+=		cxxflags=-std=c++0x
+CXXFLAGS+=		-std=c++0x
+.  elif !empty(CC_VERSION:Mgcc-4.[89]*)
+BJAM_ARGS+=		cxxflags=-std=c++11
+CXXFLAGS+=		-std=c++11
+.  endif
 .endif
-#
+
 .if !empty(PKGSRC_COMPILER:Mclang)
 BJAM_ARGS+=		cxxflags=-std=c++11
+CXXFLAGS+=		-std=c++11
 .  if !empty(OPSYS:MDarwin)
 BJAM_ARGS+=		cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++
 .  endif
 .endif
 
-BJAM_BUILD+=		release
+BJAM_BUILD+=		variant=release
 BJAM_BUILD+=		threading=multi
 BJAM_BUILD+=		link=shared,static
 
diff --git a/devel/boost-libs/PLIST b/devel/boost-libs/PLIST
index e8fb4016ddb..29f7db1f3f3 100644
--- a/devel/boost-libs/PLIST
+++ b/devel/boost-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2013/11/12 16:49:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2013/11/20 19:17:55 adam Exp $
 lib/libboost_atomic.a
 lib/libboost_atomic.so
 lib/libboost_atomic.so.${BOOST_VERSION}
@@ -24,6 +24,9 @@ lib/libboost_graph.so.${BOOST_VERSION}
 lib/libboost_iostreams.a
 lib/libboost_iostreams.so
 lib/libboost_iostreams.so.${BOOST_VERSION}
+lib/libboost_locale.a
+lib/libboost_locale.so
+lib/libboost_locale.so.${BOOST_VERSION}
 lib/libboost_log.a
 lib/libboost_log.so
 lib/libboost_log.so.${BOOST_VERSION}
@@ -36,12 +39,18 @@ lib/libboost_math_c99.so.${BOOST_VERSION}
 lib/libboost_math_c99f.a
 lib/libboost_math_c99f.so
 lib/libboost_math_c99f.so.${BOOST_VERSION}
+lib/libboost_math_c99l.a
+lib/libboost_math_c99l.so
+lib/libboost_math_c99l.so.${BOOST_VERSION}
 lib/libboost_math_tr1.a
 lib/libboost_math_tr1.so
 lib/libboost_math_tr1.so.${BOOST_VERSION}
 lib/libboost_math_tr1f.a
 lib/libboost_math_tr1f.so
 lib/libboost_math_tr1f.so.${BOOST_VERSION}
+lib/libboost_math_tr1l.a
+lib/libboost_math_tr1l.so
+lib/libboost_math_tr1l.so.${BOOST_VERSION}
 lib/libboost_prg_exec_monitor.a
 lib/libboost_prg_exec_monitor.so
 lib/libboost_prg_exec_monitor.so.${BOOST_VERSION}
diff --git a/devel/boost-libs/PLIST.Darwin b/devel/boost-libs/PLIST.Darwin
deleted file mode 100644
index 104a18462fa..00000000000
--- a/devel/boost-libs/PLIST.Darwin
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.3 2013/02/19 16:39:46 adam Exp $
-lib/libboost_locale.a
-lib/libboost_locale.so
-lib/libboost_locale.so.${BOOST_VERSION}
-lib/libboost_math_c99l.a
-lib/libboost_math_c99l.so
-lib/libboost_math_c99l.so.${BOOST_VERSION}
-lib/libboost_math_tr1l.a
-lib/libboost_math_tr1l.so
-lib/libboost_math_tr1l.so.${BOOST_VERSION}
diff --git a/devel/boost-libs/PLIST.DragonFly b/devel/boost-libs/PLIST.DragonFly
deleted file mode 100644
index e56d192bb1f..00000000000
--- a/devel/boost-libs/PLIST.DragonFly
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.2 2012/01/29 00:10:55 marino Exp $
-lib/libboost_locale.a
-lib/libboost_locale.so
-lib/libboost_locale.so.${BOOST_VERSION}
-lib/libboost_math_c99l.a
-lib/libboost_math_c99l.so
-lib/libboost_math_c99l.so.${BOOST_VERSION}
-lib/libboost_math_tr1l.a
-lib/libboost_math_tr1l.so
-lib/libboost_math_tr1l.so.${BOOST_VERSION}
diff --git a/devel/boost-libs/PLIST.Linux b/devel/boost-libs/PLIST.Linux
deleted file mode 100644
index 813bd2a90f9..00000000000
--- a/devel/boost-libs/PLIST.Linux
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2012/01/17 03:25:35 sbd Exp $
-lib/libboost_locale.a
-lib/libboost_locale.so
-lib/libboost_locale.so.${BOOST_VERSION}
-lib/libboost_math_c99l.a
-lib/libboost_math_c99l.so
-lib/libboost_math_c99l.so.${BOOST_VERSION}
-lib/libboost_math_tr1l.a
-lib/libboost_math_tr1l.so
-lib/libboost_math_tr1l.so.${BOOST_VERSION}
diff --git a/devel/boost-libs/PLIST.NetBSD b/devel/boost-libs/PLIST.NetBSD
deleted file mode 100644
index 101a8401fa6..00000000000
--- a/devel/boost-libs/PLIST.NetBSD
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2012/01/09 14:40:36 adam Exp $
-lib/libboost_locale.a
-lib/libboost_locale.so
-lib/libboost_locale.so.${BOOST_VERSION}
diff --git a/devel/boost-libs/PLIST.SunOS b/devel/boost-libs/PLIST.SunOS
deleted file mode 100644
index ad3a4b7a68d..00000000000
--- a/devel/boost-libs/PLIST.SunOS
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2011/09/14 18:13:37 hans Exp $
-lib/libboost_math_c99l.a
-lib/libboost_math_c99l.so
-lib/libboost_math_c99l.so.${BOOST_VERSION}
-lib/libboost_math_tr1l.a
-lib/libboost_math_tr1l.so
-lib/libboost_math_tr1l.so.${BOOST_VERSION}