4 files changed, 37 insertions, 40 deletions

diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index cea0a15dcc10..2b20c728bc44 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	qhull
-# Date created:				3 March 2004
-# Whom:					pusto@web.de
-#
+# Created by: pusto@web.de
 # $FreeBSD$
 
 PORTNAME=	qhull
-PORTVERSION=	2011.1
+PORTVERSION=	2012.1
 CATEGORIES=	math
 MASTER_SITES=	http://www.qhull.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -23,15 +20,11 @@ MAN1=	qhull.1 rbox.1
 CONFLICTS=	qhull-1.0* afni-[0-9]*
 
 post-patch:
-.if !defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's#share/doc/packages#share/doc#g' \
+	${REINPLACE_CMD} -e 's#share/man/man#man/man#g' \
 		${WRKSRC}/CMakeLists.txt
-.else
+
+.if defined(NOPORTDOCS)
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-CMakeLists.txt
 .endif
 
-post-install:
-	${LN} -sf ${PREFIX}/lib/libqhull6.so.6.2.0.1385 \
-		${PREFIX}/lib/libqhull6.so.6
-
 .include <bsd.port.mk>
diff --git a/math/qhull/distinfo b/math/qhull/distinfo
index afa5f1773a9a..a7c52af1d2b9 100644
--- a/math/qhull/distinfo
+++ b/math/qhull/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qhull-2011.1-src.tgz) = adae4425f51c2eaf491e822dc5b0a0c2fdebc258841e1c185bbb8a5200c754c4
-SIZE (qhull-2011.1-src.tgz) = 687728
+SHA256 (qhull-2012.1-src.tgz) = a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88
+SIZE (qhull-2012.1-src.tgz) = 716665
diff --git a/math/qhull/files/extra-patch-CMakeLists.txt b/math/qhull/files/extra-patch-CMakeLists.txt
index 576f6ac53670..85f9945962cb 100644
--- a/math/qhull/files/extra-patch-CMakeLists.txt
+++ b/math/qhull/files/extra-patch-CMakeLists.txt
@@ -1,7 +1,8 @@
---- CMakeLists.txt.orig	2011-09-03 23:42:33.000000000 +0000
-+++ CMakeLists.txt	2011-09-03 23:42:48.000000000 +0000
-@@ -331,4 +331,3 @@
- install(FILES ${road_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/road)
- install(FILES html/qhull.man DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1)
- install(FILES html/rbox.man DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)
--install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})
+--- CMakeLists.txt-orig	2012-11-03 23:37:35.000000000 +0000
++++ CMakeLists.txt	2012-11-03 23:38:47.000000000 +0000
+@@ -428,5 +428,3 @@
+ 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)
+-install(FILES ${doc_FILES}           DESTINATION ${DOC_INSTALL_DIR})
+-install(DIRECTORY html/              DESTINATION ${DOC_INSTALL_DIR})
diff --git a/math/qhull/pkg-plist b/math/qhull/pkg-plist
index 6104ddc0e04b..975317c5d7fd 100644
--- a/math/qhull/pkg-plist
+++ b/math/qhull/pkg-plist
@@ -1,27 +1,26 @@
 bin/qconvex
-bin/qconvex-6.2.0.1385
 bin/qdelaunay
-bin/qdelaunay-6.2.0.1385
 bin/qhalf
-bin/qhalf-6.2.0.1385
 bin/qhull
-bin/qhull-6.2.0.1385
 bin/qvoronoi
-bin/qvoronoi-6.2.0.1385
-bin/user_eg
-bin/user_eg-6.2.0.1385
-bin/user_eg2
-bin/user_eg2-6.2.0.1385
-bin/user_eg3
-bin/user_eg3-6.2.0.1385
 bin/rbox
-bin/rbox-6.2.0.1385
 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
@@ -48,20 +47,24 @@ 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/RoadError.h
-include/road/RoadLogEvent.h
-include/road/RoadTest.h
-lib/libqhull6.so
-lib/libqhull6.so.6
-lib/libqhull6.so.6.2.0.1385
+lib/libqhull.so
+lib/libqhull.so.6
+lib/libqhull_p.so
+lib/libqhull_p.so.6
 lib/libqhullcpp.a
 lib/libqhullstatic.a
 lib/libqhullstatic_p.a
 @dirrm include/libqhull
 @dirrm include/libqhullcpp
-@dirrm include/road
+%%PORTDOCS%%%%DOCSDIR%%/Announce.txt
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/REGISTER.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/normal_voronoi_knauss_oesterle.jpg
 %%PORTDOCS%%%%DOCSDIR%%/qconvex.htm