Update of math/qhull from 2011.1 to 2012.1:
- patches/patch-CMakeLists_txt removed as no longer needed
- CFLAGS += -fno-strict-aliasing is no longer needed
Successfully tested on amd64 with x11/kde4/palapeli and WIP math/octave.
OK?
Best regards,
Ingo
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/qhull/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 16 Mar 2015 18:07:50 -0000 1.4
+++ Makefile 14 Jun 2015 07:00:10 -0000
@@ -2,11 +2,10 @@
COMMENT = computing the convex hull
-VERSION = 2011.1
-DISTNAME = qhull-${VERSION}
-REVISION = 0
+DISTNAME = qhull-2012.1
-SHARED_LIBS = qhull6 0.0 # 6.2
+SHARED_LIBS = qhull_p 0.0 # 6.0
+SHARED_LIBS += qhull 0.0 # 6.0
CATEGORIES = math
@@ -15,7 +14,7 @@ HOMEPAGE = http://www.qhull.org/
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c m stdc++
+WANTLIB = c m
MASTER_SITES = ${HOMEPAGE}download/
DISTFILES = ${DISTNAME}-src${EXTRACT_SUFX}
@@ -23,9 +22,6 @@ EXTRACT_SUFX = .tgz
MODULES = devel/cmake
-NO_TEST = Yes
-
-CFLAGS += -fno-strict-aliasing
-CONFIGURE_ARGS += -DDOC_INSTALL_DIR=${PREFIX}/share/doc/qhull
+CONFIGURE_ARGS = -DMAN_INSTALL_DIR=${PREFIX}/man/man1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/qhull/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:14:29 -0000 1.3
+++ distinfo 14 Jun 2015 07:00:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (qhull-2011.1-src.tgz) = ra5EJfUcLq9JHoItxbCgwv3rwliEHhwYW7uKUgDHVMQ=
-SIZE (qhull-2011.1-src.tgz) = 687728
+SHA256 (qhull-2012.1-src.tgz) = o17KphBVC38Fw843PYnDDPdLBZppiA8DCAxVba68/4g=
+SIZE (qhull-2012.1-src.tgz) = 716665
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 16 Apr 2012 08:07:39 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2012/04/16 08:07:39 jasper Exp $
-
-Do not create versioned executables.
-
---- CMakeLists.txt.orig Thu May 19 02:53:36 2011
-+++ CMakeLists.txt Sat Oct 15 10:11:29 2011
-@@ -254,38 +254,24 @@ endif()
-
- 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
-@@ -297,8 +283,7 @@ add_executable(user_eg ${user_eg_SOURCES})
- # user_eg may be linked to qhull_STATIC if user_eg_DEFINES is removed
- target_link_libraries(user_eg ${qhull_SHARED})
- set_target_properties(user_eg PROPERTIES
-- COMPILE_DEFINITIONS "${user_eg_DEFINES}"
-- VERSION ${qhull_VERSION})
-+ COMPILE_DEFINITIONS "${user_eg_DEFINES}")
-
- # ---------------------------------------
- # Define qhull executables linked to qhullstatic_p and qhullcpp static library
-@@ -314,8 +299,7 @@ add_executable(user_eg3 ${user_eg3_SOURCES})
- # qhull_STATICP must be last, otherwise qh_fprintf,etc. are not loaded from
qhull_CPP
- target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICP})
- set_target_properties(user_eg3 PROPERTIES
-- COMPILE_DEFINITIONS "qh_QHpointer"
-- VERSION ${qhull_VERSION})
-+ COMPILE_DEFINITIONS "qh_QHpointer")
-
- # ---------------------------------------
- # Define install
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/qhull/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:50 -0000 1.3
+++ pkg/PLIST 14 Jun 2015 07:00:10 -0000
@@ -5,16 +5,24 @@
@bin bin/qhull
@bin bin/qvoronoi
@bin bin/rbox
-@bin bin/user_eg
-@bin bin/user_eg2
-@bin bin/user_eg3
include/libqhull/
include/libqhull/geom.h
+include/libqhull/index.htm
include/libqhull/io.h
include/libqhull/libqhull.h
include/libqhull/mem.h
include/libqhull/merge.h
include/libqhull/poly.h
+include/libqhull/qh-geom.htm
+include/libqhull/qh-globa.htm
+include/libqhull/qh-io.htm
+include/libqhull/qh-mem.htm
+include/libqhull/qh-merge.htm
+include/libqhull/qh-poly.htm
+include/libqhull/qh-qhull.htm
+include/libqhull/qh-set.htm
+include/libqhull/qh-stat.htm
+include/libqhull/qh-user.htm
include/libqhull/qhull_a.h
include/libqhull/qset.h
include/libqhull/random.h
@@ -42,19 +50,23 @@ include/libqhullcpp/QhullStat.h
include/libqhullcpp/QhullVertex.h
include/libqhullcpp/QhullVertexSet.h
include/libqhullcpp/RboxPoints.h
+include/libqhullcpp/RoadError.h
+include/libqhullcpp/RoadLogEvent.h
+include/libqhullcpp/RoadTest.h
include/libqhullcpp/UsingLibQhull.h
include/libqhullcpp/functionObjects.h
-include/road/
-include/road/RoadError.h
-include/road/RoadLogEvent.h
-include/road/RoadTest.h
-@lib lib/libqhull6.so.${LIBqhull6_VERSION}
+@lib lib/libqhull.so.${LIBqhull_VERSION}
+@lib lib/libqhull_p.so.${LIBqhull_p_VERSION}
lib/libqhullcpp.a
lib/libqhullstatic.a
lib/libqhullstatic_p.a
@man man/man1/qhull.1
@man man/man1/rbox.1
share/doc/qhull/
+share/doc/qhull/Announce.txt
+share/doc/qhull/COPYING.txt
+share/doc/qhull/README.txt
+share/doc/qhull/REGISTER.txt
share/doc/qhull/index.htm
share/doc/qhull/normal_voronoi_knauss_oesterle.jpg
share/doc/qhull/qconvex.htm
