From owner-svn-ports-head@FreeBSD.ORG Sat Nov 3 23:49:09 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8AD121FA; Sat, 3 Nov 2012 23:49:09 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 67D8B8FC08; Sat, 3 Nov 2012 23:49:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA3Nn9Cq069829; Sat, 3 Nov 2012 23:49:09 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA3Nn93x069824; Sat, 3 Nov 2012 23:49:09 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201211032349.qA3Nn93x069824@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Sat, 3 Nov 2012 23:49:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306943 - in head/math/qhull: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2012 23:49:09 -0000 Author: stephen Date: Sat Nov 3 23:49:08 2012 New Revision: 306943 URL: http://svn.freebsd.org/changeset/ports/306943 Log: - Update to 2012.1. Feature safe: yes Modified: head/math/qhull/Makefile head/math/qhull/distinfo head/math/qhull/files/extra-patch-CMakeLists.txt head/math/qhull/pkg-plist Modified: head/math/qhull/Makefile ============================================================================== --- head/math/qhull/Makefile Sat Nov 3 23:40:39 2012 (r306942) +++ head/math/qhull/Makefile Sat Nov 3 23:49:08 2012 (r306943) @@ -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 Modified: head/math/qhull/distinfo ============================================================================== --- head/math/qhull/distinfo Sat Nov 3 23:40:39 2012 (r306942) +++ head/math/qhull/distinfo Sat Nov 3 23:49:08 2012 (r306943) @@ -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 Modified: head/math/qhull/files/extra-patch-CMakeLists.txt ============================================================================== --- head/math/qhull/files/extra-patch-CMakeLists.txt Sat Nov 3 23:40:39 2012 (r306942) +++ head/math/qhull/files/extra-patch-CMakeLists.txt Sat Nov 3 23:49:08 2012 (r306943) @@ -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}) Modified: head/math/qhull/pkg-plist ============================================================================== --- head/math/qhull/pkg-plist Sat Nov 3 23:40:39 2012 (r306942) +++ head/math/qhull/pkg-plist Sat Nov 3 23:49:08 2012 (r306943) @@ -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