[63289] trunk/dports/math/qhull

[mmoll at macports.org]

Revision: 63289
          http://trac.macports.org/changeset/63289
Author:   mmoll at macports.org
Date:     2010-01-31 14:06:00 -0800 (Sun, 31 Jan 2010)
Log Message:
-----------
qhull: install man pages, missing header files, simplify patches. Closes #23420.

Modified Paths:
--------------
    trunk/dports/math/qhull/Portfile
    trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff
    trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff

Modified: trunk/dports/math/qhull/Portfile
===================================================================
--- trunk/dports/math/qhull/Portfile	2010-01-31 19:54:46 UTC (rev 63288)
+++ trunk/dports/math/qhull/Portfile	2010-01-31 22:06:00 UTC (rev 63289)
@@ -4,6 +4,7 @@
 PortGroup cmake 1.0
 name		qhull
 version		2010.1
+revision	1
 categories	math
 platforms	darwin
 maintainers	mmoll
@@ -27,6 +28,7 @@
                     sha1    ed480912e03efdd767195c06c7e8c252c78112b1 \
                     rmd160  840530f0d103cfa0bd86d0226a41084866dd5ca2
 patchfiles	patch-CMakeLists.txt.diff patch-src-CMakeLists.txt.diff
+configure.args	-DCMAKE_C_FLAGS=\"-fno-common\"
 worksrcdir	${name}-${version}	
 livecheck.type  regex
 livecheck.url   ${master_sites}

Modified: trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff	2010-01-31 19:54:46 UTC (rev 63288)
+++ trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff	2010-01-31 22:06:00 UTC (rev 63289)
@@ -1,7 +1,9 @@
---- CMakeLists.txt.orig	2010-01-19 09:02:25.000000000 -0600
-+++ CMakeLists.txt	2010-01-19 09:24:29.000000000 -0600
-@@ -6,3 +6,4 @@
+--- 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 @@
  
  add_subdirectory(src)
  
 +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)

Modified: trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff
===================================================================
--- trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff	2010-01-31 19:54:46 UTC (rev 63288)
+++ trunk/dports/math/qhull/files/patch-src-CMakeLists.txt.diff	2010-01-31 22:06:00 UTC (rev 63289)
@@ -1,12 +1,25 @@
---- src/CMakeLists.txt.orig	2010-01-19 08:44:09.000000000 -0600
-+++ src/CMakeLists.txt	2010-01-19 09:23:29.000000000 -0600
-@@ -23,8 +23,21 @@
+--- 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 
@@ -23,20 +36,39 @@
  
  set(qhullcmd_SOURCES  unix.c)
  set(rbox_SOURCES  rbox.c)
-@@ -36,6 +49,7 @@
+@@ -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(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")
- 
- add_executable(rbox ${rbox_SOURCES})
- target_link_libraries(rbox qhull)
-@@ -52,3 +66,8 @@
- add_executable(qhalf ${qhalf_SOURCES})
- target_link_libraries(qhalf qhull)
- 
-+install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
++
++install(TARGETS qhull qhullstatic ${PROGS}
 +	RUNTIME DESTINATION bin
 +	LIBRARY DESTINATION lib
 +	ARCHIVE DESTINATION lib)
-+install(FILES libqhull.h DESTINATION include)
++install(FILES ${qhull_hdr} DESTINATION include)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100131/42913d74/attachment.html>