Index: math/cgal/pkg-plist
===================================================================
--- math/cgal/pkg-plist	(Revision 416386)
+++ math/cgal/pkg-plist	(Arbeitskopie)
@@ -44,7 +44,7 @@
 include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h
 include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h
 include/CGAL/Algebraic_kernel_d/bound_between_1.h
-include/CGAL/Algebraic_kernel_d/construct_%%QT_BINDIR%%ary.h
+include/CGAL/Algebraic_kernel_d/construct_binary.h
 include/CGAL/Algebraic_kernel_d/enums.h
 include/CGAL/Algebraic_kernel_d/exceptions.h
 include/CGAL/Algebraic_kernel_d/flags.h
@@ -498,16 +498,16 @@
 include/CGAL/Circulator_on_node.h
 include/CGAL/Circulator_project.h
 include/CGAL/Coercion_traits.h
-include/CGAL/Com%%QT_BINDIR%%ation_enumerator.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_basic_operations.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_constructors.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_functors.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_insertions.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_iterators_base.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_min_items.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_operations.h
-include/CGAL/Com%%QT_BINDIR%%atorial_map_storages.h
+include/CGAL/Combination_enumerator.h
+include/CGAL/Combinatorial_map.h
+include/CGAL/Combinatorial_map_basic_operations.h
+include/CGAL/Combinatorial_map_constructors.h
+include/CGAL/Combinatorial_map_functors.h
+include/CGAL/Combinatorial_map_insertions.h
+include/CGAL/Combinatorial_map_iterators_base.h
+include/CGAL/Combinatorial_map_min_items.h
+include/CGAL/Combinatorial_map_operations.h
+include/CGAL/Combinatorial_map_storages.h
 include/CGAL/Compact_container.h
 include/CGAL/Compact_mesh_cell_base_3.h
 include/CGAL/Complex_2_in_triangulation_3.h
@@ -776,7 +776,7 @@
 include/CGAL/Hyperbola_ray_2.h
 include/CGAL/Hyperbola_segment_2.h
 include/CGAL/IEEE_754_unions.h
-include/CGAL/IO/%%QT_BINDIR%%ary_file_io.h
+include/CGAL/IO/binary_file_io.h
 include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h
 include/CGAL/IO/Arr_iostream.h
 include/CGAL/IO/Arr_text_formatter.h
@@ -800,7 +800,7 @@
 include/CGAL/IO/Dxf_writer.h
 include/CGAL/IO/Fig_stream.h
 include/CGAL/IO/Fig_stream_Conic_arc_2.h
-include/CGAL/IO/File_%%QT_BINDIR%%ary_mesh_3.h
+include/CGAL/IO/File_binary_mesh_3.h
 include/CGAL/IO/File_header_OFF.h
 include/CGAL/IO/File_header_extended_OFF.h
 include/CGAL/IO/File_maya.h
@@ -1314,7 +1314,7 @@
 include/CGAL/Minkowski_sum_3/Gaussian_map.h
 include/CGAL/Minkowski_sum_3/Gaussian_map_to_nef_3.h
 include/CGAL/Minkowski_sum_3/PointMark.h
-include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_com%%QT_BINDIR%%ed.h
+include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_combined.h
 include/CGAL/Modifiable_priority_queue.h
 include/CGAL/Modifier_base.h
 include/CGAL/Modular_arithmetic/Residue_type.h
@@ -1348,10 +1348,10 @@
 include/CGAL/Nef_2/gen_point_location.h
 include/CGAL/Nef_2/geninfo.h
 include/CGAL/Nef_2/iterator_tools.h
-include/CGAL/Nef_3/%%QT_BINDIR%%op_intersection_tests.h
+include/CGAL/Nef_3/binop_intersection_tests.h
 include/CGAL/Nef_3/Binary_operation.h
 include/CGAL/Nef_3/Bounding_box_3.h
-include/CGAL/Nef_3/Com%%QT_BINDIR%%e_with_halfspace.h
+include/CGAL/Nef_3/Combine_with_halfspace.h
 include/CGAL/Nef_3/Default_items.h
 include/CGAL/Nef_3/Edge_edge_overlay.h
 include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xy_3.h
@@ -2102,7 +2102,7 @@
 include/CGAL/Surface_mesh_traits_generator_3.h
 include/CGAL/Surface_mesh_triangulation_generator_3.h
 include/CGAL/Surface_mesh_vertex_base_3.h
-include/CGAL/Surface_mesher/Com%%QT_BINDIR%%ing_oracle.h
+include/CGAL/Surface_mesher/Combining_oracle.h
 include/CGAL/Surface_mesher/Has_edges.h
 include/CGAL/Surface_mesher/Implicit_surface_oracle_3.h
 include/CGAL/Surface_mesher/Intersection_data_structure_3.h
@@ -2264,7 +2264,7 @@
 include/CGAL/Voronoi_diagram_2/Construct_dual_points.h
 include/CGAL/Voronoi_diagram_2/Default_site_inserters.h
 include/CGAL/Voronoi_diagram_2/Default_site_removers.h
-include/CGAL/Voronoi_diagram_2/Degeneracy_tester_%%QT_BINDIR%%ders.h
+include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h
 include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h
 include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h
 include/CGAL/Voronoi_diagram_2/Dummy_iterator.h
@@ -2330,7 +2330,7 @@
 include/CGAL/boost/graph/dijkstra_shortest_paths.hpp
 include/CGAL/boost/graph/graph_concepts.h
 include/CGAL/boost/graph/graph_traits_Arrangement_2.h
-include/CGAL/boost/graph/graph_traits_Com%%QT_BINDIR%%atorialMap.h
+include/CGAL/boost/graph/graph_traits_CombinatorialMap.h
 include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
 include/CGAL/boost/graph/graph_traits_Dual_Arrangement_2.h
 include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
@@ -2347,7 +2347,7 @@
 include/CGAL/boost/graph/iterator.h
 include/CGAL/boost/graph/named_function_params.h
 include/CGAL/boost/graph/properties.h
-include/CGAL/boost/graph/properties_Com%%QT_BINDIR%%atorialMap.h
+include/CGAL/boost/graph/properties_CombinatorialMap.h
 include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
 include/CGAL/boost/graph/properties_Polyhedron_3.h
 include/CGAL/boost/graph/properties_Surface_mesh.h
@@ -2459,13 +2459,13 @@
 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/Com%%QT_BINDIR%%ation_enumerator.h
-include/CGAL/internal/Com%%QT_BINDIR%%atorial_map_copy_functors.h
-include/CGAL/internal/Com%%QT_BINDIR%%atorial_map_group_functors.h
-include/CGAL/internal/Com%%QT_BINDIR%%atorial_map_internal_functors.h
-include/CGAL/internal/Com%%QT_BINDIR%%atorial_map_sewable.h
-include/CGAL/internal/Com%%QT_BINDIR%%atorial_map_utility.h
-include/CGAL/internal/Com%%QT_BINDIR%%atorial_map_utility_novariadic.h
+include/CGAL/internal/Combination_enumerator.h
+include/CGAL/internal/Combinatorial_map_copy_functors.h
+include/CGAL/internal/Combinatorial_map_group_functors.h
+include/CGAL/internal/Combinatorial_map_internal_functors.h
+include/CGAL/internal/Combinatorial_map_sewable.h
+include/CGAL/internal/Combinatorial_map_utility.h
+include/CGAL/internal/Combinatorial_map_utility_novariadic.h
 include/CGAL/internal/Delaunay_triangulation_hierarchy_3.h
 include/CGAL/internal/Dummy_tds_3.h
 include/CGAL/internal/Exact_type_selector.h
@@ -2532,13 +2532,13 @@
 include/CGAL/internal/Triangulation_ds_circulators_3.h
 include/CGAL/internal/Triangulation_ds_iterators_3.h
 include/CGAL/internal/auxiliary/graph.h
-include/CGAL/internal/boost/array_%%QT_BINDIR%%ary_tree.hpp
+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/corefinement/Com%%QT_BINDIR%%atorial_map_for_corefinement.h
+include/CGAL/internal/corefinement/Combinatorial_map_for_corefinement.h
 include/CGAL/internal/corefinement/Polyhedron_constness_types.h
 include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h
 include/CGAL/internal/corefinement/intersection_coplanar_triangles_3.h
@@ -2734,7 +2734,7 @@
 lib/CGAL/2.6.2-to-2.8.1/Qt4Macros.cmake
 lib/CGAL/2.6.2-to-2.8.1/UseQt4.cmake
 lib/CGAL/CGALConfig.cmake
-lib/CGAL/CGALConfig_%%QT_BINDIR%%ary.cmake.in
+lib/CGAL/CGALConfig_binary.cmake.in
 lib/CGAL/CGALConfig_install.cmake.in
 lib/CGAL/CGAL_CheckCXXFileRuns.cmake
 lib/CGAL/CGAL_Common.cmake