Attachment #177695 for bug #215078

Lines 2-11 Link Here

(-)math/qhull/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qhull	4	PORTNAME= qhull
5	PORTVERSION= 2012.1	5	PORTVERSION= 2015.2
6	CATEGORIES= math	6	CATEGORIES= math
7	MASTER_SITES= http://www.qhull.org/download/	7	MASTER_SITES= http://www.qhull.org/download/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	8	DISTNAME= ${PORTNAME}-2015-src-7.2.0
9		9
10	MAINTAINER= stephen@FreeBSD.org	10	MAINTAINER= stephen@FreeBSD.org
11	COMMENT= Qhull computes convex hulls, Delaunay triangulations, and halfspaces	11	COMMENT= Qhull computes convex hulls, Delaunay triangulations, and halfspaces

Lines 1-2 Link Here

(-)math/qhull/distinfo (-2 / +3 lines)
1	SHA256 (qhull-2012.1-src.tgz) = a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88	1	TIMESTAMP = 1472570343
2	SIZE (qhull-2012.1-src.tgz) = 716665	2	SHA256 (qhull-2015-src-7.2.0.tgz) = 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436
		3	SIZE (qhull-2015-src-7.2.0.tgz) = 1010153




Install docs into share/doc/ rather than include/

--- CMakeLists.txt.orig	2016-01-19 00:21:32 UTC
+++ CMakeLists.txt
@@ -91,7 +91,7 @@ else()
     if(WIN32)
         set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
     else()
-        set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+        set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
     endif()
 endif()
 if(DOC_INSTALL_DIR)
@@ -616,9 +616,9 @@ install(TARGETS ${qhull_TARGETS_INSTALL}
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
 
 install(FILES ${libqhull_HEADERS}    DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
-install(FILES ${libqhull_DOC}        DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
+install(FILES ${libqhull_DOC}        DESTINATION ${DOC_INSTALL_DIR}/libqhull)
 install(FILES ${libqhullr_HEADERS}    DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r)
-install(FILES ${libqhullr_DOC}        DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r)
+install(FILES ${libqhullr_DOC}        DESTINATION ${DOC_INSTALL_DIR}/libqhull_r)
 install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp)
 install(FILES html/qhull.man         DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1)
 install(FILES html/rbox.man          DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)




--- src/libqhullcpp/QhullIterator.h.orig	2012-01-26 04:32:05.000000000 +0100
+++ src/libqhullcpp/QhullIterator.h	2014-12-19 15:19:26.000000000 +0100
@@ -16,8 +16,7 @@
 #include <assert.h>
 #include <string>
 #include <vector>
-//! Avoid dependence on <iterator>
-namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
+#include <iterator>
 
 namespace orgQhull {
 

Lines 1-11 Link Here

(-)math/qhull/files/patch-src__libqhullcpp__QhullLinkedList.h (-11 lines)
1	--- src/libqhullcpp/QhullLinkedList.h.orig 2012-01-26 04:32:05.000000000 +0100
2	+++ src/libqhullcpp/QhullLinkedList.h 2014-12-19 15:19:26.000000000 +0100
3	@@ -9,7 +9,7 @@
4	#ifndef QHULLLINKEDLIST_H
5	#define QHULLLINKEDLIST_H
6
7	-namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
8	+#include <iterator>
9
10	#include "QhullError.h"
11




c++ 4.2 (in base 9.x) gives a bogus error:
/usr/ports/math/qhull/work/qhull-2015.2/src/libqhullcpp/QhullSet.h:330: error: expected `;' before 'i'

 Work around that by removing overspecified part of type declaration.

--- src/libqhullcpp/QhullSet.h.orig	2016-01-18 19:45:12 UTC
+++ src/libqhullcpp/QhullSet.h
@@ -327,8 +327,8 @@ template <typename T>
 std::vector<T> QhullSet<T>::
 toStdVector() const
 {
-    QhullSet<T>::const_iterator i= begin();
-    QhullSet<T>::const_iterator e= end();
+    const_iterator i= begin();
+    const_iterator e= end();
     std::vector<T> vs;
     while(i!=e){
         vs.push_back(*i++);




bin/qvoronoi
bin/rbox
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
include/libqhull/stat.h
include/libqhull/user.h
include/libqhull_r/geom_r.h
include/libqhull_r/io_r.h
include/libqhull_r/libqhull_r.h
include/libqhull_r/mem_r.h
include/libqhull_r/merge_r.h
include/libqhull_r/poly_r.h
include/libqhull_r/qhull_ra.h
include/libqhull_r/qset_r.h
include/libqhull_r/random_r.h
include/libqhull_r/stat_r.h
include/libqhull_r/user_r.h
include/libqhullcpp/Coordinates.h
include/libqhullcpp/PointCoordinates.h
include/libqhullcpp/Qhull.h

include/libqhullcpp/RoadError.h
include/libqhullcpp/RoadLogEvent.h
include/libqhullcpp/RoadTest.h
include/libqhullcpp/UsingLibQhull.h
include/libqhullcpp/functionObjects.h
lib/libqhull.so
lib/libqhull.so.7
lib/libqhull.so.7.2.0
lib/libqhull_p.so
lib/libqhull_p.so.7
lib/libqhull_p.so.7.2.0
lib/libqhull_r.so
lib/libqhull_r.so.7
lib/libqhull_r.so.7.2.0
lib/libqhullcpp.a
lib/libqhullstatic.a
lib/libqhullstatic_r.a
man/man1/qhull.1.gz
man/man1/rbox.1.gz
%%PORTDOCS%%%%DOCSDIR%%/Announce.txt

%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/REGISTER.txt
%%PORTDOCS%%%%DOCSDIR%%/index.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/DEPRECATED.txt
%%PORTDOCS%%%%DOCSDIR%%/libqhull/index.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-geom.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-globa.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-io.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-mem.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-merge.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-poly.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-qhull.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-set.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-stat.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-user.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/index.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-geom_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-globa_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-io_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-mem_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-merge_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-poly_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-qhull_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-set_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-stat_r.htm
%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-user_r.htm
%%PORTDOCS%%%%DOCSDIR%%/normal_voronoi_knauss_oesterle.jpg
%%PORTDOCS%%%%DOCSDIR%%/qconvex.htm
%%PORTDOCS%%%%DOCSDIR%%/qdelau_f.htm

Return to bug 215078

Line 0 Link Here

(-)math/qhull/files/patch-CMakeLists.txt (+25 lines)
	1	Install docs into share/doc/ rather than include/
	2
	3	--- CMakeLists.txt.orig 2016-01-19 00:21:32 UTC
	4	+++ CMakeLists.txt
	5	@@ -91,7 +91,7 @@ else()
	6	if(WIN32)
	7	set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
	8	else()
	9	- set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man1)
	10	+ set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
	11	endif()
	12	endif()
	13	if(DOC_INSTALL_DIR)
	14	@@ -616,9 +616,9 @@ install(TARGETS ${qhull_TARGETS_INSTALL}
	15	ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
	16
	17	install(FILES ${libqhull_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
	18	-install(FILES ${libqhull_DOC} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
	19	+install(FILES ${libqhull_DOC} DESTINATION ${DOC_INSTALL_DIR}/libqhull)
	20	install(FILES ${libqhullr_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r)
	21	-install(FILES ${libqhullr_DOC} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r)
	22	+install(FILES ${libqhullr_DOC} DESTINATION ${DOC_INSTALL_DIR}/libqhull_r)
	23	install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp)
	24	install(FILES html/qhull.man DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1)
	25	install(FILES html/rbox.man DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)

Lines 1-12 Link Here

(-)math/qhull/files/patch-src__libqhullcpp__QhullIterator.h (-12 lines)
1	--- src/libqhullcpp/QhullIterator.h.orig 2012-01-26 04:32:05.000000000 +0100
2	+++ src/libqhullcpp/QhullIterator.h 2014-12-19 15:19:26.000000000 +0100
3	@@ -16,8 +16,7 @@
4	#include <assert.h>
5	#include <string>
6	#include <vector>
7	-//! Avoid dependence on <iterator>
8	-namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
9	+#include <iterator>
10
11	namespace orgQhull {
12

Line 0 Link Here

(-)math/qhull/files/patch-src_libqhullcpp_QhullSet.h (+18 lines)
	1	c++ 4.2 (in base 9.x) gives a bogus error:
	2	/usr/ports/math/qhull/work/qhull-2015.2/src/libqhullcpp/QhullSet.h:330: error: expected `;' before 'i'
	3
	4	Work around that by removing overspecified part of type declaration.
	5
	6	--- src/libqhullcpp/QhullSet.h.orig 2016-01-18 19:45:12 UTC
	7	+++ src/libqhullcpp/QhullSet.h
	8	@@ -327,8 +327,8 @@ template <typename T>
	9	std::vector<T> QhullSet<T>::
	10	toStdVector() const
	11	{
	12	- QhullSet<T>::const_iterator i= begin();
	13	- QhullSet<T>::const_iterator e= end();
	14	+ const_iterator i= begin();
	15	+ const_iterator e= end();
	16	std::vector<T> vs;
	17	while(i!=e){
	18	vs.push_back(*i++);

Lines 5-31 Link Here

(-)math/qhull/pkg-plist (-15 / +42 lines)
5	bin/qvoronoi	5	bin/qvoronoi
6	bin/rbox	6	bin/rbox
7	include/libqhull/geom.h	7	include/libqhull/geom.h
8	include/libqhull/index.htm
9	include/libqhull/io.h	8	include/libqhull/io.h
10	include/libqhull/libqhull.h	9	include/libqhull/libqhull.h
11	include/libqhull/mem.h	10	include/libqhull/mem.h
12	include/libqhull/merge.h	11	include/libqhull/merge.h
13	include/libqhull/poly.h	12	include/libqhull/poly.h
14	include/libqhull/qh-geom.htm
15	include/libqhull/qh-globa.htm
16	include/libqhull/qh-io.htm
17	include/libqhull/qh-mem.htm
18	include/libqhull/qh-merge.htm
19	include/libqhull/qh-poly.htm
20	include/libqhull/qh-qhull.htm
21	include/libqhull/qh-set.htm
22	include/libqhull/qh-stat.htm
23	include/libqhull/qh-user.htm
24	include/libqhull/qhull_a.h	13	include/libqhull/qhull_a.h
25	include/libqhull/qset.h	14	include/libqhull/qset.h
26	include/libqhull/random.h	15	include/libqhull/random.h
27	include/libqhull/stat.h	16	include/libqhull/stat.h
28	include/libqhull/user.h	17	include/libqhull/user.h
		18	include/libqhull_r/geom_r.h
		19	include/libqhull_r/io_r.h
		20	include/libqhull_r/libqhull_r.h
		21	include/libqhull_r/mem_r.h
		22	include/libqhull_r/merge_r.h
		23	include/libqhull_r/poly_r.h
		24	include/libqhull_r/qhull_ra.h
		25	include/libqhull_r/qset_r.h
		26	include/libqhull_r/random_r.h
		27	include/libqhull_r/stat_r.h
		28	include/libqhull_r/user_r.h
29	include/libqhullcpp/Coordinates.h	29	include/libqhullcpp/Coordinates.h
30	include/libqhullcpp/PointCoordinates.h	30	include/libqhullcpp/PointCoordinates.h
31	include/libqhullcpp/Qhull.h	31	include/libqhullcpp/Qhull.h
Lines 50-64 Link Here
50	include/libqhullcpp/RoadError.h	50	include/libqhullcpp/RoadError.h
51	include/libqhullcpp/RoadLogEvent.h	51	include/libqhullcpp/RoadLogEvent.h
52	include/libqhullcpp/RoadTest.h	52	include/libqhullcpp/RoadTest.h
53	include/libqhullcpp/UsingLibQhull.h
54	include/libqhullcpp/functionObjects.h	53	include/libqhullcpp/functionObjects.h
55	lib/libqhull.so	54	lib/libqhull.so
56	lib/libqhull.so.6	55	lib/libqhull.so.7
		56	lib/libqhull.so.7.2.0
57	lib/libqhull_p.so	57	lib/libqhull_p.so
58	lib/libqhull_p.so.6	58	lib/libqhull_p.so.7
		59	lib/libqhull_p.so.7.2.0
		60	lib/libqhull_r.so
		61	lib/libqhull_r.so.7
		62	lib/libqhull_r.so.7.2.0
59	lib/libqhullcpp.a	63	lib/libqhullcpp.a
60	lib/libqhullstatic.a	64	lib/libqhullstatic.a
61	lib/libqhullstatic_p.a	65	lib/libqhullstatic_r.a
62	man/man1/qhull.1.gz	66	man/man1/qhull.1.gz
63	man/man1/rbox.1.gz	67	man/man1/rbox.1.gz
64	%%PORTDOCS%%%%DOCSDIR%%/Announce.txt	68	%%PORTDOCS%%%%DOCSDIR%%/Announce.txt
Lines 66-71 Link Here
66	%%PORTDOCS%%%%DOCSDIR%%/README.txt	70	%%PORTDOCS%%%%DOCSDIR%%/README.txt
67	%%PORTDOCS%%%%DOCSDIR%%/REGISTER.txt	71	%%PORTDOCS%%%%DOCSDIR%%/REGISTER.txt
68	%%PORTDOCS%%%%DOCSDIR%%/index.htm	72	%%PORTDOCS%%%%DOCSDIR%%/index.htm
		73	%%PORTDOCS%%%%DOCSDIR%%/libqhull/DEPRECATED.txt
		74	%%PORTDOCS%%%%DOCSDIR%%/libqhull/index.htm
		75	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-geom.htm
		76	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-globa.htm
		77	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-io.htm
		78	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-mem.htm
		79	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-merge.htm
		80	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-poly.htm
		81	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-qhull.htm
		82	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-set.htm
		83	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-stat.htm
		84	%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-user.htm
		85	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/index.htm
		86	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-geom_r.htm
		87	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-globa_r.htm
		88	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-io_r.htm
		89	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-mem_r.htm
		90	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-merge_r.htm
		91	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-poly_r.htm
		92	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-qhull_r.htm
		93	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-set_r.htm
		94	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-stat_r.htm
		95	%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-user_r.htm
69	%%PORTDOCS%%%%DOCSDIR%%/normal_voronoi_knauss_oesterle.jpg	96	%%PORTDOCS%%%%DOCSDIR%%/normal_voronoi_knauss_oesterle.jpg
70	%%PORTDOCS%%%%DOCSDIR%%/qconvex.htm	97	%%PORTDOCS%%%%DOCSDIR%%/qconvex.htm
71	%%PORTDOCS%%%%DOCSDIR%%/qdelau_f.htm	98	%%PORTDOCS%%%%DOCSDIR%%/qdelau_f.htm