Diff below updates CGAL from 3.8 to 3.9. A few remarks:
* cgal-3.8 has to be uninstalled before cgal-3.9 can be built. The
package tries to include older installed headers from
/usr/local/include before the newer packaged headers, so many
prototypes are missing or wrong. (I spent a little while
investigating if this could be resolved somehow, but I'm pretty
clueless with CMake and failed to figure it out.)
* I renamed /usr/local/share/doc/CGAL-3.9 to /usr/local/share/doc/CGAL.
* I bumped all the shared library versions; not sure if major bumps
are really necessary, but it didn't seem worth looking into more
closely.
* Switched to .tar.xz since CGAL doesn't build on VAX anyway (due to
IEEE floating point hardware dependencies for fenv.h).
Quickly tested that OpenSCAD still compiles and runs on amd64.
Index: Makefile
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/ports/math/cgal/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 16 Sep 2011 10:31:22 -0000 1.4
+++ Makefile 29 Nov 2011 22:09:18 -0000
@@ -5,15 +5,14 @@ NOT_FOR_ARCHS = vax
COMMENT = Computational Geometry Algorithms Library
-DISTNAME = CGAL-3.8
+DISTNAME = CGAL-3.9
PKGNAME = ${DISTNAME:L}
-REVISION = 1
SHARED_ONLY = Yes
-SHARED_LIBS = CGAL 0.0 \
- CGAL_Core 0.0 \
- CGAL_ImageIO 0.0 \
- CGAL_Qt4 0.0
+SHARED_LIBS = CGAL 1.0 \
+ CGAL_Core 1.0 \
+ CGAL_ImageIO 1.0 \
+ CGAL_Qt4 1.0
CATEGORIES = math
@@ -29,8 +28,10 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL GLU ICE SM X11 Xext boost_thread-mt gmp gmpxx \
lib/qt4/QtGui lib/qt4/QtOpenGL m>=5.3 mpfr stdc++ z
+EXTRACT_SUFX = .tar.xz
+
# Awkward hosting site; see https://gforge.inria.fr/frs/?group_id=52 for files
index.
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/28500/
+MASTER_SITES = https://gforge.inria.fr/frs/download.php/29122/
MODULES = devel/cmake \
x11/qt4
@@ -45,5 +46,8 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS
post-patch:
rm ${WRKSRC}/scripts/cgal_make_macosx_app
+
+post-install:
+ cd ${PREFIX}/share/doc && mv CGAL-3.9 CGAL
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/ports/math/cgal/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 29 Apr 2011 17:47:50 -0000 1.1.1.1
+++ distinfo 29 Nov 2011 21:33:52 -0000
@@ -1,5 +1,5 @@
-MD5 (CGAL-3.8.tar.gz) = uKeeYuTYuotknYFa670cCg==
-RMD160 (CGAL-3.8.tar.gz) = Xl4TI65FPZKOhbT2p2R/nW0pc9A=
-SHA1 (CGAL-3.8.tar.gz) = I3SN8eYNYtoWbS45VzKuL+J0MX0=
-SHA256 (CGAL-3.8.tar.gz) = se3VGIYTTPCG0XmCxQ9xAleBFWHSiLQ5rzprxjI4ntQ=
-SIZE (CGAL-3.8.tar.gz) = 14112547
+MD5 (CGAL-3.9.tar.xz) = VCSQ4j0R211BmkNnkBaQCA==
+RMD160 (CGAL-3.9.tar.xz) = A0CDe7V4JNvwg2HiW/u5G9AaFmg=
+SHA1 (CGAL-3.9.tar.xz) = SL/4erJuATtYPuNPAhpgJcS4HN8=
+SHA256 (CGAL-3.9.tar.xz) = pdUPN4ixrNNKIO+EwHH462burMXhJ2ApLW98D/BBAiw=
+SIZE (CGAL-3.9.tar.xz) = 9853500
Index: pkg/PLIST
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/ports/math/cgal/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 25 Jun 2011 19:12:36 -0000 1.2
+++ pkg/PLIST 29 Nov 2011 21:59:53 -0000
@@ -162,6 +162,7 @@ include/CGAL/Arr_default_dcel.h
include/CGAL/Arr_default_overlay_traits.h
include/CGAL/Arr_enums.h
include/CGAL/Arr_extended_dcel.h
+include/CGAL/Arr_extended_rational_arc_traits_d_1.h
include/CGAL/Arr_face_index_map.h
include/CGAL/Arr_face_map.h
include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h
@@ -181,7 +182,6 @@ include/CGAL/Arr_geometry_traits/Conic_x
include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h
include/CGAL/Arr_geometry_traits/Curve_data_aux.h
include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h
-include/CGAL/Arr_geometry_traits/One_root_number.h
include/CGAL/Arr_geometry_traits/Polyline_2.h
include/CGAL/Arr_geometry_traits/Rational_arc_2.h
include/CGAL/Arr_geometry_traits/Segment_assertions.h
@@ -223,7 +223,19 @@ include/CGAL/Arr_point_location/Trapezoi
include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_iostream.h
include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h
include/CGAL/Arr_polyline_traits_2.h
+include/CGAL/Arr_rat_arc/
+include/CGAL/Arr_rat_arc/Algebraic_point_2.h
+include/CGAL/Arr_rat_arc/Base_rational_arc_ds_1.h
+include/CGAL/Arr_rat_arc/Cache.h
+include/CGAL/Arr_rat_arc/Rational_arc_d_1.h
+include/CGAL/Arr_rat_arc/Rational_function.h
+include/CGAL/Arr_rat_arc/Rational_function_canonicalized_pair.h
+include/CGAL/Arr_rat_arc/Rational_function_ordered_pair.h
+include/CGAL/Arr_rat_arc/Rational_function_pair.h
+include/CGAL/Arr_rat_arc/Singleton.h
+include/CGAL/Arr_rat_arc/Vertical_segment_d_1.h
include/CGAL/Arr_rational_arc_traits_2.h
+include/CGAL/Arr_rational_function_traits_2.h
include/CGAL/Arr_segment_traits_2.h
include/CGAL/Arr_simple_point_location.h
include/CGAL/Arr_spherical_gaussian_map_3/
@@ -264,6 +276,9 @@ include/CGAL/Arr_tracing_traits_2.h
include/CGAL/Arr_trapezoid_ric_point_location.h
include/CGAL/Arr_triangulation_point_location.h
include/CGAL/Arr_unb_planar_topology_traits_2.h
+include/CGAL/Arr_ver_support/
+include/CGAL/Arr_ver_support/Rational_arc_with_ver_d_1.h
+include/CGAL/Arr_ver_support/Visitors_d_1.h
include/CGAL/Arr_vertex_index_map.h
include/CGAL/Arr_vertex_map.h
include/CGAL/Arr_vertical_decomposition_2.h
@@ -441,6 +456,9 @@ include/CGAL/Cartesian/solve_3.h
include/CGAL/Cartesian_converter.h
include/CGAL/Cartesian_d.h
include/CGAL/Cartesian_matrix.h
+include/CGAL/Cell_attribute.h
+include/CGAL/Cell_const_iterators.h
+include/CGAL/Cell_iterators.h
include/CGAL/Chinese_remainder_traits.h
include/CGAL/Circle_2.h
include/CGAL/Circle_2_Circle_2_intersection.h
@@ -490,6 +508,11 @@ include/CGAL/Circulator_identity.h
include/CGAL/Circulator_on_node.h
include/CGAL/Circulator_project.h
include/CGAL/Coercion_traits.h
+include/CGAL/Combinatorial_map.h
+include/CGAL/Combinatorial_map_basic_operations.h
+include/CGAL/Combinatorial_map_constructors.h
+include/CGAL/Combinatorial_map_min_items.h
+include/CGAL/Combinatorial_map_operations.h
include/CGAL/Compact_container.h
include/CGAL/Complex_2_in_triangulation_3.h
include/CGAL/Complex_2_in_triangulation_cell_base_3.h
@@ -537,6 +560,7 @@ include/CGAL/Convex_hull_2/convexity_che
include/CGAL/Convex_hull_d.h
include/CGAL/Convex_hull_d_to_polyhedron_3.h
include/CGAL/Convex_hull_d_traits_3.h
+include/CGAL/Convex_hull_face_base_2.h
include/CGAL/Convex_hull_projective_xy_traits_2.h
include/CGAL/Convex_hull_projective_xz_traits_2.h
include/CGAL/Convex_hull_projective_yz_traits_2.h
@@ -566,6 +590,9 @@ include/CGAL/Curved_kernel_via_analysis_
include/CGAL/Curved_kernel_via_analysis_2/gfx/Subdivision_2.h
include/CGAL/Curved_kernel_via_analysis_2/test/
include/CGAL/Curved_kernel_via_analysis_2/test/simple_models.h
+include/CGAL/Dart.h
+include/CGAL/Dart_const_iterators.h
+include/CGAL/Dart_iterators.h
include/CGAL/Default.h
include/CGAL/Delaunay_d.h
include/CGAL/Delaunay_mesh_area_criteria_2.h
@@ -693,9 +720,18 @@ include/CGAL/Handle_for.h
include/CGAL/Handle_for_virtual.h
include/CGAL/Handle_hash_function.h
include/CGAL/Handle_with_policy.h
+include/CGAL/Hilbert_policy_tags.h
include/CGAL/Hilbert_sort_2.h
include/CGAL/Hilbert_sort_3.h
include/CGAL/Hilbert_sort_base.h
+include/CGAL/Hilbert_sort_d.h
+include/CGAL/Hilbert_sort_median_2.h
+include/CGAL/Hilbert_sort_median_3.h
+include/CGAL/Hilbert_sort_median_d.h
+include/CGAL/Hilbert_sort_middle_2.h
+include/CGAL/Hilbert_sort_middle_3.h
+include/CGAL/Hilbert_sort_middle_base.h
+include/CGAL/Hilbert_sort_middle_d.h
include/CGAL/Homogeneous/
include/CGAL/Homogeneous.h
include/CGAL/Homogeneous/Aff_transformationH2.h
@@ -1105,6 +1141,7 @@ include/CGAL/Linear_algebraCd.h
include/CGAL/Linear_algebraHd.h
include/CGAL/Location_policy.h
include/CGAL/MP_Float.h
+include/CGAL/MP_Float_arithmetic_kernel.h
include/CGAL/Manhattan_distance_iso_box_point.h
include/CGAL/Marching_tetrahedra_observer_default_3.h
include/CGAL/Marching_tetrahedra_traits_skin_surface_3.h
@@ -1697,6 +1734,7 @@ include/CGAL/QP_solver/functors.h
include/CGAL/Qt/
include/CGAL/Qt/AlphaShapeGraphicsItem.h
include/CGAL/Qt/ApolloniusGraphGraphicsItem.h
+include/CGAL/Qt/CGAL_Qt4_config.h
include/CGAL/Qt/CircularArcGraphicsItem.h
include/CGAL/Qt/ConstrainedTriangulationGraphicsItem.h
include/CGAL/Qt/Converter.h
@@ -1728,6 +1766,7 @@ include/CGAL/Qt/StreamLinesGraphicsItem.
include/CGAL/Qt/TriangulationGraphicsItem.h
include/CGAL/Qt/VoronoiGraphicsItem.h
include/CGAL/Qt/debug.h
+include/CGAL/Qt/resources.h
include/CGAL/Qt/utility.h
include/CGAL/Qualified_result_of.h
include/CGAL/Quotient.h
@@ -1745,13 +1784,16 @@ include/CGAL/RS/basic.h
include/CGAL/RS/compare_1.h
include/CGAL/RS/crt.h
include/CGAL/RS/dyadic.h
-include/CGAL/RS/functors.h
+include/CGAL/RS/functors_1.h
include/CGAL/RS/inverse.h
+include/CGAL/RS/isolator_1.h
+include/CGAL/RS/isole_1.h
include/CGAL/RS/p.h
include/CGAL/RS/pagealloc.h
include/CGAL/RS/polynomial_1.h
include/CGAL/RS/polynomial_1_constructors.h
include/CGAL/RS/polynomial_1_eval.h
+include/CGAL/RS/polynomial_1_functors.h
include/CGAL/RS/polynomial_1_impl.h
include/CGAL/RS/polynomial_1_io.h
include/CGAL/RS/polynomial_1_member.h
@@ -1759,10 +1801,10 @@ include/CGAL/RS/polynomial_1_operators.h
include/CGAL/RS/polynomial_1_parser.h
include/CGAL/RS/polynomial_1_utils.h
include/CGAL/RS/polynomial_converter.h
-include/CGAL/RS/polynomial_functors.h
include/CGAL/RS/pp.h
include/CGAL/RS/primes.h
include/CGAL/RS/refine_1_rs.h
+include/CGAL/RS/rs_calls_1.h
include/CGAL/RS/sign_1.h
include/CGAL/RS/sign_1_no_rs.h
include/CGAL/RS/sign_1_rs.h
@@ -1812,14 +1854,15 @@ include/CGAL/Robust_circumcenter_traits_
include/CGAL/Robust_construction.h
include/CGAL/Root_for_circles_2_2.h
include/CGAL/Root_for_spheres_2_3.h
-include/CGAL/Root_of_2.h
include/CGAL/Root_of_traits.h
+include/CGAL/Root_of_traits_specializations.h
include/CGAL/Runge_kutta_integrator_2.h
include/CGAL/Safe_circulator_from_iterator.h
include/CGAL/Scalar_factor_traits.h
include/CGAL/Search_traits.h
include/CGAL/Search_traits_2.h
include/CGAL/Search_traits_3.h
+include/CGAL/Search_traits_adapter.h
include/CGAL/Search_traits_d.h
include/CGAL/Search_traits_vertex_handle_3.h
include/CGAL/Segment_2.h
@@ -1857,7 +1900,6 @@ include/CGAL/Segment_Delaunay_graph_2/Or
include/CGAL/Segment_Delaunay_graph_2/Predicates_C2.h
include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h
include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h
-include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_1.h
include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_2.h
include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h
include/CGAL/Segment_Delaunay_graph_2/Traits_wrapper_2.h
@@ -1906,6 +1948,9 @@ include/CGAL/Snap_rounding_2.h
include/CGAL/Snap_rounding_kd_2.h
include/CGAL/Snap_rounding_traits_2.h
include/CGAL/Sorted_matrix_search_traits_adaptor.h
+include/CGAL/Spatial_sort_traits_adapter_2.h
+include/CGAL/Spatial_sort_traits_adapter_3.h
+include/CGAL/Spatial_sort_traits_adapter_d.h
include/CGAL/Sphere_3.h
include/CGAL/Spherical_kernel_3.h
include/CGAL/Spherical_kernel_intersections.h
@@ -1926,6 +1971,7 @@ include/CGAL/Sqrt_extension/Sqrt_extensi
include/CGAL/Sqrt_extension/Wang_traits.h
include/CGAL/Sqrt_extension/convert_to_bfi.h
include/CGAL/Sqrt_extension/io.h
+include/CGAL/Sqrt_extension_fwd.h
include/CGAL/Square_border_parameterizer_3.h
include/CGAL/Straight_2.h
include/CGAL/Straight_skeleton_2/
@@ -2182,7 +2228,7 @@ include/CGAL/assertions.h
include/CGAL/assertions_behaviour.h
include/CGAL/auto_link/
include/CGAL/auto_link/CGAL.h
-include/CGAL/auto_link/CGALQt.h
+include/CGAL/auto_link/CGALQt3.h
include/CGAL/auto_link/CORE.h
include/CGAL/auto_link/GMP.h
include/CGAL/auto_link/ImageIO.h
@@ -2248,6 +2294,7 @@ include/CGAL/convert_to_bfi.h
include/CGAL/convex_decomposition_3.h
include/CGAL/convex_hull_2.h
include/CGAL/convex_hull_3.h
+include/CGAL/convex_hull_3_to_polyhedron_3.h
include/CGAL/convex_hull_constructive_traits_2.h
include/CGAL/convex_hull_incremental_3.h
include/CGAL/convex_hull_traits_2.h
@@ -2305,6 +2352,8 @@ include/CGAL/internal/AABB_tree/AABB_tra
include/CGAL/internal/AABB_tree/nearest_point_segment_3.h
include/CGAL/internal/AABB_tree/nearest_point_triangle_3.h
include/CGAL/internal/Classification_type.h
+include/CGAL/internal/Combinatorial_map_functors.h
+include/CGAL/internal/Combinatorial_map_utility.h
include/CGAL/internal/Delaunay_triangulation_hierarchy_3.h
include/CGAL/internal/Dummy_tds_3.h
include/CGAL/internal/Exact_type_selector.h
@@ -2341,10 +2390,16 @@ include/CGAL/internal/Static_filters/Sta
include/CGAL/internal/Static_filters/tools.h
include/CGAL/internal/Triangulation_ds_circulators_3.h
include/CGAL/internal/Triangulation_ds_iterators_3.h
+include/CGAL/internal/boost/
+include/CGAL/internal/boost/array_binary_tree.hpp
+include/CGAL/internal/boost/mutable_heap.hpp
+include/CGAL/internal/boost/mutable_queue.hpp
+include/CGAL/internal/boost/property_map.h
include/CGAL/internal/bounded_priority_queue.h
include/CGAL/internal/container_fwd_fixed.hpp
+include/CGAL/internal/deprecation_warning.h
include/CGAL/internal/gcc_cpp0x.h
-include/CGAL/internal/spatial_sorting_traits_with_indices.h
+include/CGAL/internal/info_check.h
include/CGAL/interpolation_functions.h
include/CGAL/intersection_2.h
include/CGAL/intersection_2_1.h
@@ -2355,6 +2410,7 @@ include/CGAL/intersection_3_1.h
include/CGAL/intersections.h
include/CGAL/intersections_d.h
include/CGAL/ipower.h
+include/CGAL/is_convertible.h
include/CGAL/is_iterator.h
include/CGAL/is_y_monotone_2.h
include/CGAL/iterator.h
@@ -2482,6 +2538,7 @@ include/CGAL/squared_distance_3_0.h
include/CGAL/squared_distance_3_1.h
include/CGAL/squared_distance_3_2.h
include/CGAL/squared_distance_utils.h
+include/CGAL/sse2.h
include/CGAL/streamlines_assertions.h
include/CGAL/subdivide_skin_surface_mesh_3.h
include/CGAL/subdivide_union_of_balls_mesh_3.h
@@ -2531,10 +2588,14 @@ lib/CGAL/CGAL_SetupFlags.cmake
lib/CGAL/CGAL_SetupGMP.cmake
lib/CGAL/CGAL_SetupGMPXX.cmake
lib/CGAL/CGAL_SetupLEDA.cmake
+lib/CGAL/CGAL_SetupMPFI.cmake
+lib/CGAL/CGAL_SetupNTL.cmake
+lib/CGAL/CGAL_SetupRS.cmake
lib/CGAL/CGAL_UseBLAS.cmake
lib/CGAL/CGAL_UseLAPACK.cmake
lib/CGAL/CGAL_UseMKL.cmake
lib/CGAL/CGAL_UseMPFI.cmake
+lib/CGAL/CGAL_UseNTL.cmake
lib/CGAL/CGAL_UseRS.cmake
lib/CGAL/CGAL_UseTAUCS.cmake
lib/CGAL/CGAL_VersionUtils.cmake
@@ -2553,6 +2614,7 @@ lib/CGAL/FindLEDA.cmake
lib/CGAL/FindMKL.cmake
lib/CGAL/FindMPFI.cmake
lib/CGAL/FindMPFR.cmake
+lib/CGAL/FindNTL.cmake
lib/CGAL/FindOpenGL.cmake
lib/CGAL/FindPackageMessage.cmake
lib/CGAL/FindQGLViewer.cmake
@@ -2568,10 +2630,10 @@ lib/CGAL/test_MPFI.cpp
@lib lib/libCGAL_ImageIO.so.${LIBCGAL_ImageIO_VERSION}
@lib lib/libCGAL_Qt4.so.${LIBCGAL_Qt4_VERSION}
@man man/man1/cgal_create_cmake_script.1
-share/doc/CGAL-3.8/
-share/doc/CGAL-3.8/AUTHORS
-share/doc/CGAL-3.8/CHANGES
-share/doc/CGAL-3.8/LICENSE
-share/doc/CGAL-3.8/LICENSE.FREE_USE
-share/doc/CGAL-3.8/LICENSE.LGPL
-share/doc/CGAL-3.8/LICENSE.QPL
+share/doc/CGAL/
+share/doc/CGAL/AUTHORS
+share/doc/CGAL/CHANGES
+share/doc/CGAL/LICENSE
+share/doc/CGAL/LICENSE.FREE_USE
+share/doc/CGAL/LICENSE.LGPL
+share/doc/CGAL/LICENSE.QPL
