Attachment #202492 for bug #236142

Lines 2-11 Link Here

(-)math/qhull/Makefile (-10 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qhull	4	PORTNAME= qhull
5	PORTVERSION= 2015.2	5	DISTVERSIONPREFIX= v
		6	DISTVERSION= 7.2.1
		7	PORTEPOCH= 1
6	CATEGORIES= math	8	CATEGORIES= math
7	MASTER_SITES= http://www.qhull.org/download/
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 15-32 Link Here
15	LICENSE_FILE= ${WRKSRC}/COPYING.txt	15	LICENSE_FILE= ${WRKSRC}/COPYING.txt
16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17		17
18	USES= cmake tar:tgz	18	USES= cmake
		19	USE_GITHUB= yes
19	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
21		21
22	CONFLICTS= qhull-1.0* afni-[0-9]* qhull5-*	22	CONFLICTS= qhull afni qhull5
23		23
24	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS
25		25
		26	PORTDOCS= *
		27
26	DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt	28	DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt
27		29
28	post-patch:
29	${REINPLACE_CMD} -e 's#share/man/man#man/man#g' \
30	${WRKSRC}/CMakeLists.txt
31
32	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)math/qhull/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1472570343	1	TIMESTAMP = 1551483695
2	SHA256 (qhull-2015-src-7.2.0.tgz) = 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436	2	SHA256 (qhull-qhull-v7.2.1_GH0.tar.gz) = 6fc251e0b75467e00943bfb7191e986fce0e1f8f6f0251f9c6ce5a843821ea78
3	SIZE (qhull-2015-src-7.2.0.tgz) = 1010153	3	SIZE (qhull-qhull-v7.2.1_GH0.tar.gz) = 1047843




c++ 4.2 (in base 9.x) has a weakness that emits 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 (can remove after 9.x EOL).

--- 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++);




lib/libqhullstatic_r.a
man/man1/qhull.1.gz
man/man1/rbox.1.gz
%%PORTDOCS%%%%DOCSDIR%%/Announce.txt
%%PORTDOCS%%%%DOCSDIR%%/COPYING.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
%%PORTDOCS%%%%DOCSDIR%%/qdelaun.htm
%%PORTDOCS%%%%DOCSDIR%%/qh--4d.gif
%%PORTDOCS%%%%DOCSDIR%%/qh--cone.gif
%%PORTDOCS%%%%DOCSDIR%%/qh--dt.gif
%%PORTDOCS%%%%DOCSDIR%%/qh--geom.gif
%%PORTDOCS%%%%DOCSDIR%%/qh--half.gif
%%PORTDOCS%%%%DOCSDIR%%/qh--rand.gif
%%PORTDOCS%%%%DOCSDIR%%/qh-code.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-eg.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-faq.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-get.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-impre.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-optc.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-optf.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-optg.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-opto.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-optp.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-optq.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-optt.htm
%%PORTDOCS%%%%DOCSDIR%%/qh-quick.htm
%%PORTDOCS%%%%DOCSDIR%%/qhalf.htm
%%PORTDOCS%%%%DOCSDIR%%/qhull-cpp.xml
%%PORTDOCS%%%%DOCSDIR%%/qhull.htm
%%PORTDOCS%%%%DOCSDIR%%/qhull.man
%%PORTDOCS%%%%DOCSDIR%%/qhull.txt
%%PORTDOCS%%%%DOCSDIR%%/qvoron_f.htm
%%PORTDOCS%%%%DOCSDIR%%/qvoronoi.htm
%%PORTDOCS%%%%DOCSDIR%%/rbox.htm
%%PORTDOCS%%%%DOCSDIR%%/rbox.man
%%PORTDOCS%%%%DOCSDIR%%/rbox.txt

Return to bug 236142

Lines 1-18 Link Here

(-)math/qhull/files/patch-src_libqhullcpp_QhullSet.h (-18 lines)
1	c++ 4.2 (in base 9.x) has a weakness that emits 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 (can remove after 9.x EOL).
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 65-128 Link Here

(-)math/qhull/pkg-plist (-61 lines)
65	lib/libqhullstatic_r.a	65	lib/libqhullstatic_r.a
66	man/man1/qhull.1.gz	66	man/man1/qhull.1.gz
67	man/man1/rbox.1.gz	67	man/man1/rbox.1.gz
68	%%PORTDOCS%%%%DOCSDIR%%/Announce.txt
69	%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
70	%%PORTDOCS%%%%DOCSDIR%%/README.txt
71	%%PORTDOCS%%%%DOCSDIR%%/REGISTER.txt
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
96	%%PORTDOCS%%%%DOCSDIR%%/normal_voronoi_knauss_oesterle.jpg
97	%%PORTDOCS%%%%DOCSDIR%%/qconvex.htm
98	%%PORTDOCS%%%%DOCSDIR%%/qdelau_f.htm
99	%%PORTDOCS%%%%DOCSDIR%%/qdelaun.htm
100	%%PORTDOCS%%%%DOCSDIR%%/qh--4d.gif
101	%%PORTDOCS%%%%DOCSDIR%%/qh--cone.gif
102	%%PORTDOCS%%%%DOCSDIR%%/qh--dt.gif
103	%%PORTDOCS%%%%DOCSDIR%%/qh--geom.gif
104	%%PORTDOCS%%%%DOCSDIR%%/qh--half.gif
105	%%PORTDOCS%%%%DOCSDIR%%/qh--rand.gif
106	%%PORTDOCS%%%%DOCSDIR%%/qh-code.htm
107	%%PORTDOCS%%%%DOCSDIR%%/qh-eg.htm
108	%%PORTDOCS%%%%DOCSDIR%%/qh-faq.htm
109	%%PORTDOCS%%%%DOCSDIR%%/qh-get.htm
110	%%PORTDOCS%%%%DOCSDIR%%/qh-impre.htm
111	%%PORTDOCS%%%%DOCSDIR%%/qh-optc.htm
112	%%PORTDOCS%%%%DOCSDIR%%/qh-optf.htm
113	%%PORTDOCS%%%%DOCSDIR%%/qh-optg.htm
114	%%PORTDOCS%%%%DOCSDIR%%/qh-opto.htm
115	%%PORTDOCS%%%%DOCSDIR%%/qh-optp.htm
116	%%PORTDOCS%%%%DOCSDIR%%/qh-optq.htm
117	%%PORTDOCS%%%%DOCSDIR%%/qh-optt.htm
118	%%PORTDOCS%%%%DOCSDIR%%/qh-quick.htm
119	%%PORTDOCS%%%%DOCSDIR%%/qhalf.htm
120	%%PORTDOCS%%%%DOCSDIR%%/qhull-cpp.xml
121	%%PORTDOCS%%%%DOCSDIR%%/qhull.htm
122	%%PORTDOCS%%%%DOCSDIR%%/qhull.man
123	%%PORTDOCS%%%%DOCSDIR%%/qhull.txt
124	%%PORTDOCS%%%%DOCSDIR%%/qvoron_f.htm
125	%%PORTDOCS%%%%DOCSDIR%%/qvoronoi.htm
126	%%PORTDOCS%%%%DOCSDIR%%/rbox.htm
127	%%PORTDOCS%%%%DOCSDIR%%/rbox.man
128	%%PORTDOCS%%%%DOCSDIR%%/rbox.txt