Revision: 83274 http://trac.macports.org/changeset/83274 Author: mmoll@macports.org Date: 2011-08-29 07:12:21 -0700 (Mon, 29 Aug 2011) Log Message: ----------- math/qhull: update to 2011.1 Modified Paths: -------------- trunk/dports/math/qhull/Portfile trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff Removed Paths: ------------- trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff Modified: trunk/dports/math/qhull/Portfile =================================================================== --- trunk/dports/math/qhull/Portfile 2011-08-29 14:08:11 UTC (rev 83273) +++ trunk/dports/math/qhull/Portfile 2011-08-29 14:12:21 UTC (rev 83274) @@ -3,8 +3,7 @@ PortSystem 1.0 PortGroup cmake 1.0 name qhull -version 2010.1 -revision 3 +version 2011.1 categories math platforms darwin maintainers mmoll @@ -24,11 +23,12 @@ master_sites ${homepage}/download distname ${name}-${version}-src extract.suffix .tgz -checksums md5 e64138470acdeb18f752a0bc2a11ceb4 \ - sha1 ed480912e03efdd767195c06c7e8c252c78112b1 \ - rmd160 840530f0d103cfa0bd86d0226a41084866dd5ca2 -patchfiles patch-CMakeLists.txt.diff patch-src-CMakeLists.txt.diff +checksums md5 a65061cf2a6e6581182f4df0f3667a8e \ + sha1 3639b52e99bc0837fb2670d3a8a4bac3f0347ab8 \ + rmd160 4689ece746c1125757f1d0e162bbe95d3864ba5b +patchfiles patch-CMakeLists.txt.diff worksrcdir ${name}-${version} +configure.args-append -DDOC_INSTALL_DIR=share/doc/qhull livecheck.type regex livecheck.url ${master_sites} livecheck.regex Download: Qhull (\[0-9.\]+) for Unix Modified: trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff 2011-08-29 14:08:11 UTC (rev 83273) +++ trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff 2011-08-29 14:12:21 UTC (rev 83274) @@ -1,9 +1,49 @@ ---- CMakeLists.txt.orig 2010-01-31 15:34:37.000000000 -0600 -+++ CMakeLists.txt 2010-01-31 16:03:39.000000000 -0600 -@@ -6,3 +6,6 @@ +--- CMakeLists.txt.orig 2011-05-18 20:53:36.000000000 -0500 ++++ CMakeLists.txt 2011-08-29 08:19:35.000000000 -0500 +@@ -181,7 +181,6 @@ + qhull_TARGETS + ${qhull_CPP} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP} + qhull rbox qconvex qdelaunay qvoronoi qhalf +- user_eg user_eg2 user_eg3 + ) - add_subdirectory(src) + # --------------------------------------- +@@ -254,38 +253,24 @@ -+install(DIRECTORY html DESTINATION share/doc/qhull) -+install(FILES html/qhull.man DESTINATION share/man/man1 RENAME qhull.1) -+install(FILES html/rbox.man DESTINATION share/man/man1 RENAME rbox.1) + add_executable(qhull ${qhull_SOURCES}) + target_link_libraries(qhull ${qhull_STATIC}) +-set_target_properties(qhull PROPERTIES +- VERSION ${qhull_VERSION}) + + add_executable(rbox ${rbox_SOURCES}) + target_link_libraries(rbox ${qhull_STATIC}) +-set_target_properties(rbox PROPERTIES +- VERSION ${qhull_VERSION}) + + add_executable(qconvex ${qconvex_SOURCES}) + target_link_libraries(qconvex ${qhull_STATIC}) +-set_target_properties(qconvex PROPERTIES +- VERSION ${qhull_VERSION}) + + add_executable(qdelaunay ${qdelaunay_SOURCES}) + target_link_libraries(qdelaunay ${qhull_STATIC}) +-set_target_properties(qdelaunay PROPERTIES +- VERSION ${qhull_VERSION}) + + add_executable(qvoronoi ${qvoronoi_SOURCES}) + target_link_libraries(qvoronoi ${qhull_STATIC}) +-set_target_properties(qvoronoi PROPERTIES +- VERSION ${qhull_VERSION}) + + add_executable(qhalf ${qhalf_SOURCES}) + target_link_libraries(qhalf ${qhull_STATIC}) +-set_target_properties(qhalf PROPERTIES +- VERSION ${qhull_VERSION}) + + add_executable(user_eg2 ${user_eg2_SOURCES}) + target_link_libraries(user_eg2 ${qhull_STATIC}) +-set_target_properties(user_eg2 PROPERTIES +- VERSION ${qhull_VERSION}) + + # --------------------------------------- + # Define qhull executables linked to qhull shared library Deleted: trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff =================================================================== --- trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff 2011-08-29 14:08:11 UTC (rev 83273) +++ trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff 2011-08-29 14:12:21 UTC (rev 83274) @@ -1,74 +0,0 @@ ---- src/CMakeLists.txt.orig 2010-01-31 15:33:20.000000000 -0600 -+++ src/CMakeLists.txt 2010-01-31 15:56:29.000000000 -0600 -@@ -1,5 +1,10 @@ - project(qhull_lib) - -+# Change before each release whenever there has been an API change of any -+# kind. -+set(qhull_SOVERSION 5) -+set(qhull_VERSION ${qhull_SOVERSION}.0.0) -+ - # Order object files by frequency of execution. Small files at end. - set( - qhull_src -@@ -23,8 +28,23 @@ - - file(GLOB qhull_hdr *.h) - --add_library(qhull ${qhull_src}) -+add_library(qhull SHARED ${qhull_src}) - target_link_libraries(qhull m) -+set_target_properties(qhull PROPERTIES -+ SOVERSION ${qhull_SOVERSION} VERSION ${qhull_VERSION}) -+if(UNIX) -+ if(APPLE) -+ set_target_properties(qhull PROPERTIES -+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") -+ else(APPLE) -+ set_target_properties(qhull PROPERTIES -+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" -+ INSTALL_RPATH_USE_LINK_PATH TRUE -+ BUILD_WITH_INSTALL_RPATH FALSE) -+ endif(APPLE) -+endif(UNIX) -+add_library(qhullstatic STATIC ${qhull_src}) -+set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull") - - set(qhullcmd_SOURCES unix.c) - set(rbox_SOURCES rbox.c) -@@ -33,22 +53,16 @@ - set(qvoronoi_SOURCES qvoronoi.c) - set(qhalf_SOURCES qhalf.c) - -- --add_executable(qhullcmd ${qhullcmd_SOURCES}) --target_link_libraries(qhullcmd qhull) -- --add_executable(rbox ${rbox_SOURCES}) --target_link_libraries(rbox qhull) -- --add_executable(qconvex ${qconvex_SOURCES}) --target_link_libraries(qconvex qhull) -- --add_executable(qdelaunay ${qdelaunay_SOURCES}) --target_link_libraries(qdelaunay qhull) -- --add_executable(qvoronoi ${qvoronoi_SOURCES}) --target_link_libraries(qvoronoi qhull) -- --add_executable(qhalf ${qhalf_SOURCES}) --target_link_libraries(qhalf qhull) -- -+set(PROGS qhullcmd rbox qconvex qdelaunay qvoronoi qhalf) -+foreach(PROG ${PROGS}) -+ add_executable(${PROG} ${${PROG}_SOURCES}) -+ target_link_libraries(${PROG} qhull) -+endforeach(PROG ${PROGS}) -+ -+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull") -+ -+install(TARGETS qhull qhullstatic ${PROGS} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+install(FILES ${qhull_hdr} DESTINATION include/qhull)