[87107] trunk/dports/gis/cgal

[ryandesign at macports.org]

Revision: 87107
          http://trac.macports.org/changeset/87107
Author:   ryandesign at macports.org
Date:     2011-11-10 12:17:22 -0800 (Thu, 10 Nov 2011)
Log Message:
-----------
cgal: update to 3.9, use gcc-4.2 instead of 4.0 and when demos variant is being used; see #31562

Modified Paths:
--------------
    trunk/dports/gis/cgal/Portfile
    trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/gis/cgal/Portfile
===================================================================
--- trunk/dports/gis/cgal/Portfile	2011-11-10 19:55:39 UTC (rev 87106)
+++ trunk/dports/gis/cgal/Portfile	2011-11-10 20:17:22 UTC (rev 87107)
@@ -5,7 +5,7 @@
 PortGroup			cmake 1.0
 
 name				cgal
-version				3.8
+version				3.9
 license				LGPL-2.1 QPL Commercial
 categories			gis science
 maintainers			vince
@@ -24,18 +24,31 @@
 homepage			http://www.cgal.org/
 
 fetch.ignore_sslcert 	yes
-master_sites		https://gforge.inria.fr/frs/download.php/28500/
+master_sites		https://gforge.inria.fr/frs/download.php/29125/
 
 distname			CGAL-${version}
-checksums           md5     b8a79e62e4d8ba8b649d815aebbd1c0a \
-                    sha1    23748df1e60d62da166d2e395732ae2fe274317d \
-                    rmd160  5e5e1323ae453d928e85b4f6a7647f9d6d2973d0
+checksums           rmd160  0a5a929ecedeeac3833ec90f802b7f5ac069ad47 \
+                    sha256  241194ad9487d62d1287f863eab3adbbfd0836e2bebcd50c9fc21d473f947ba4
 
 depends_lib-append	port:boost \
 					port:mpfr \
 					port:zlib \
 					port:gmp
 
+configure.args-append   -DCGAL_INSTALL_CMAKE_DIR="${prefix}/lib/cmake"
+
+# gcc 4.0 is too old to compile CGAL properly; see <http://www.cgal.org/FAQ.html#mac_optimization_bug>
+# And the demos don't compile with llvm-gcc-4.2 or clang
+if {${configure.compiler} == "gcc-4.0" || [variant_isset demos]} {
+    configure.compiler gcc-4.2
+    if {![file executable ${configure.cc}]} {
+        depends_build-append port:apple-gcc42
+        configure.compiler apple-gcc-4.2
+        # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+        configure.cxx ${prefix}/bin/g++-apple-4.2
+    }
+}
+
 variant demos description {Create demos} {
 	PortGroup				qt4 1.0
 

Modified: trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff	2011-11-10 19:55:39 UTC (rev 87106)
+++ trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff	2011-11-10 20:17:22 UTC (rev 87107)
@@ -1,5 +1,5 @@
---- demo/Polyhedron/CMakeLists.txt.orig	2011-04-20 17:50:55.000000000 +0200
-+++ demo/Polyhedron/CMakeLists.txt	2011-04-20 17:52:42.000000000 +0200
+--- demo/Mesh_3/CMakeLists.txt.orig	2011-09-05 15:47:29.000000000 +0200
++++ demo/Mesh_3/CMakeLists.txt	2011-09-29 16:51:17.000000000 +0200
 @@ -202,7 +202,7 @@
      else()
        set(other_sources ${ARGN_TAIL})
@@ -9,9 +9,9 @@
      add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
  
      add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Mesh_3/CMakeLists.txt.orig	2011-01-10 21:00:21.000000000 +0100
-+++ demo/Mesh_3/CMakeLists.txt	2011-04-20 17:52:42.000000000 +0200
-@@ -198,7 +198,7 @@
+--- demo/Mesh_3/implicit_functions/CMakeLists.txt.orig	2011-09-05 15:47:29.000000000 +0200
++++ demo/Mesh_3/implicit_functions/CMakeLists.txt	2011-09-29 16:51:17.000000000 +0200
+@@ -51,7 +51,7 @@
      else()
        set(other_sources ${ARGN_TAIL})
      endif()
@@ -20,9 +20,9 @@
      add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
  
      add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Mesh_3/implicit_functions/CMakeLists.txt.orig	2011-04-20 17:51:34.000000000 +0200
-+++ demo/Mesh_3/implicit_functions/CMakeLists.txt	2011-04-20 17:52:42.000000000 +0200
-@@ -47,7 +47,7 @@
+--- demo/Surface_reconstruction_points_3/CMakeLists.txt.orig	2011-09-05 15:47:56.000000000 +0200
++++ demo/Surface_reconstruction_points_3/CMakeLists.txt	2011-09-29 16:51:17.000000000 +0200
+@@ -219,7 +219,7 @@
      else()
        set(other_sources ${ARGN_TAIL})
      endif()
@@ -31,14 +31,3 @@
      add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
  
      add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Surface_reconstruction_points_3/CMakeLists.txt.orig	2011-04-20 17:51:49.000000000 +0200
-+++ demo/Surface_reconstruction_points_3/CMakeLists.txt	2011-04-20 17:52:42.000000000 +0200
-@@ -218,7 +218,7 @@
-     else()
-       set(other_sources ${ARGN_TAIL})
-     endif()
--    qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+    qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
-     add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
- 
-     add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111110/f655c4ac/attachment.html>