Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.18 2013/06/06 12:53:43 wiz Exp $
|
||||
#
|
||||
# $NetBSD: Makefile,v 1.23 2014/02/12 23:18:11 tron Exp $
|
||||
|
||||
PKGNAME= cgal-3.9
|
||||
DISTNAME= CGAL-3.9
|
||||
PKGREVISION= 17
|
||||
PKGREVISION= 21
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= https://gforge.inria.fr/frs/download.php/29125/
|
||||
|
||||
@@ -12,11 +11,12 @@ HOMEPAGE= http://www.cgal.org/
|
||||
COMMENT= Computational Geometry Algorithms Library
|
||||
LICENSE= gnu-lgpl-v3
|
||||
|
||||
FETCH_USING= curl
|
||||
|
||||
USE_CMAKE= yes
|
||||
USE_LANGUAGES= c c++
|
||||
|
||||
post-patch:
|
||||
cd ${WRKSRC} && rm -f include/CGAL/Mesh_2/Do_not_refine_edges.h.orig
|
||||
|
||||
.include "../../devel/boost-headers/buildlink3.mk"
|
||||
.include "../../devel/boost-libs/buildlink3.mk"
|
||||
.include "../../math/mpfr/buildlink3.mk"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: buildlink3.mk,v 1.16 2013/06/06 12:53:43 wiz Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.19 2014/02/12 23:18:11 tron Exp $
|
||||
|
||||
BUILDLINK_TREE+= cgal
|
||||
|
||||
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= cgal
|
||||
CGAL_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.cgal+= cgal>=3.9
|
||||
BUILDLINK_ABI_DEPENDS.cgal+= cgal>=3.9nb17
|
||||
BUILDLINK_ABI_DEPENDS.cgal+= cgal>=3.9nb21
|
||||
BUILDLINK_PKGSRCDIR.cgal?= ../../math/cgal
|
||||
|
||||
.include "../../devel/boost-headers/buildlink3.mk"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
$NetBSD: distinfo,v 1.1.1.1 2012/02/27 12:46:27 reinoud Exp $
|
||||
$NetBSD: distinfo,v 1.2 2014/02/08 12:16:12 wiedi Exp $
|
||||
|
||||
SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb
|
||||
RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47
|
||||
Size (CGAL-3.9.tar.gz) = 14276059 bytes
|
||||
SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489
|
||||
SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-include_CGAL_Mesh__2_Do__not__refine__edges.h,v 1.1 2014/02/08 12:16:12 wiedi Exp $
|
||||
|
||||
fix building other packages with gcc 4.7 linking cgal
|
||||
see also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673554
|
||||
--- include/CGAL/Mesh_2/Do_not_refine_edges.h.orig 2010-05-14 19:00:16.000000000 +0000
|
||||
+++ include/CGAL/Mesh_2/Do_not_refine_edges.h
|
||||
@@ -79,7 +79,7 @@ public:
|
||||
const Face_handle& fh = eit->first;
|
||||
const int& i = eit->second;
|
||||
|
||||
- if(fh->is_constrained(i) && !is_locally_conform(this->tr, fh, i, p))
|
||||
+ if(fh->is_constrained(i) && !this->is_locally_conform(this->tr, fh, i, p))
|
||||
{
|
||||
return CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED;
|
||||
}
|
||||
Reference in New Issue
Block a user