Deal with limitations of Qt4's moc when parsing certain Boost headers.

4 files changed, 40 insertions, 3 deletions

diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 82d90aee30e..a39103df506 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:29 tnn Exp $
+# $NetBSD: Makefile,v 1.29 2016/01/17 15:17:09 joerg Exp $
 
 PKGNAME=	cgal-3.9
 DISTNAME=	CGAL-3.9
@@ -15,7 +15,7 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 pre-install:
-	cd ${WRKSRC} && rm -f include/CGAL/Mesh_2/Do_not_refine_edges.h.orig include/CGAL/config.h.orig
+	find ${WRKSRC} -name \*.orig -exec rm {} \;
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/math/cgal/distinfo b/math/cgal/distinfo
index 18a24bd108a..6f6a357605f 100644
--- a/math/cgal/distinfo
+++ b/math/cgal/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.5 2015/12/16 11:29:47 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2016/01/17 15:17:09 joerg Exp $
 
 SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb
 RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47
 SHA512 (CGAL-3.9.tar.gz) = 9b03c08aae470877eb7fb2f16d7091a4ea2c79a643ba075d7b1bd5c056342c10e6fb3eed48a2756d74da48f6b7171f7d041446a0edb57ca212f0bb053912995d
 Size (CGAL-3.9.tar.gz) = 14276059 bytes
 SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489
+SHA1 (patch-include_CGAL_Qt_GraphicsItem.h) = 34f78072a610d7054d9b879aa697b96b7ee62e5a
+SHA1 (patch-include_CGAL_Qt_GraphicsViewInput.h) = f842396bfb15a264cf86528781fac90c61c58ce9
 SHA1 (patch-include_CGAL_config.h) = ba29667305fc4868a9995048801408e95d75bd41
 SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6
 SHA1 (patch-src-CMakeLists.txt) = 26e92c17b26bce8f0dd5a97ded689764fd243da0
diff --git a/math/cgal/patches/patch-include_CGAL_Qt_GraphicsItem.h b/math/cgal/patches/patch-include_CGAL_Qt_GraphicsItem.h
new file mode 100644
index 00000000000..0f7a296bfe5
--- /dev/null
+++ b/math/cgal/patches/patch-include_CGAL_Qt_GraphicsItem.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_CGAL_Qt_GraphicsItem.h,v 1.1 2016/01/17 15:17:10 joerg Exp $
+
+qt4's moc can't deal with BOOST_JOIN in newer versions of Boost, so hide
+the problematic includes.
+
+--- include/CGAL/Qt/GraphicsItem.h.orig	2016-01-16 15:12:02.000000000 +0000
++++ include/CGAL/Qt/GraphicsItem.h
+@@ -24,8 +24,9 @@
+ #include <CGAL/auto_link/Qt4.h>
+ #include <QObject>
+ #include <QGraphicsItem>
++#ifndef Q_MOC_RUN
+ #include <CGAL/Object.h>
+-
++#endif
+ 
+ 
+ namespace CGAL {
diff --git a/math/cgal/patches/patch-include_CGAL_Qt_GraphicsViewInput.h b/math/cgal/patches/patch-include_CGAL_Qt_GraphicsViewInput.h
new file mode 100644
index 00000000000..3b033f86f71
--- /dev/null
+++ b/math/cgal/patches/patch-include_CGAL_Qt_GraphicsViewInput.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_CGAL_Qt_GraphicsViewInput.h,v 1.1 2016/01/17 15:17:10 joerg Exp $
+
+qt4's moc can't deal with BOOST_JOIN in newer versions of Boost, so hide
+the problematic includes.
+
+--- include/CGAL/Qt/GraphicsViewInput.h.orig	2016-01-16 15:09:29.000000000 +0000
++++ include/CGAL/Qt/GraphicsViewInput.h
+@@ -22,7 +22,9 @@
+ #define CGAL_QT_GRAPHICS_VIEW_INPUT_H
+ 
+ #include <CGAL/auto_link/Qt4.h>
++#ifndef Q_MOC_RUN
+ #include <CGAL/Object.h>
++#endif
+ #include <QObject>
+ 
+ namespace CGAL {