From owner-svn-ports-head@FreeBSD.ORG Thu Dec 19 09:58:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED7DC7BC; Thu, 19 Dec 2013 09:58:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D93EE1FD7; Thu, 19 Dec 2013 09:58:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJ9w3n3054863; Thu, 19 Dec 2013 09:58:03 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJ9w2ND054856; Thu, 19 Dec 2013 09:58:02 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312190958.rBJ9w2ND054856@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 19 Dec 2013 09:58:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336885 - in head/science/InsightToolkit: . 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.17 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: Thu, 19 Dec 2013 09:58:04 -0000 Author: amdmi3 Date: Thu Dec 19 09:58:02 2013 New Revision: 336885 URL: http://svnweb.freebsd.org/changeset/ports/336885 Log: - Support staging - Fix build on 10.x Added: head/science/InsightToolkit/files/patch-Code-Common-itkArray.h (contents, props changed) head/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h (contents, props changed) head/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h (contents, props changed) head/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx (contents, props changed) head/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h (contents, props changed) Modified: head/science/InsightToolkit/Makefile Modified: head/science/InsightToolkit/Makefile ============================================================================== --- head/science/InsightToolkit/Makefile Thu Dec 19 09:20:01 2013 (r336884) +++ head/science/InsightToolkit/Makefile Thu Dec 19 09:58:02 2013 (r336885) @@ -10,35 +10,24 @@ MASTER_SITES= SF/itk/itk/2.8 MAINTAINER= amdmi3@FreeBSD.org COMMENT= Insight Toolkit -OPTIONS_DEFINE= EXAMPLES TESTING -EXAMPLES_DESC= Build examples (very time consuming) -TESTING_DESC= Build testing programs (very time consuming) - -USE_LDCONFIG= ${PREFIX}/lib/InsightToolkit NO_PACKAGE= License does not allow redistribution of binaries USES= cmake CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON +USE_LDCONFIG= ${PREFIX}/lib/InsightToolkit SUB_FILES= pkg-message -NO_STAGE= yes -.include +OPTIONS_DEFINE= EXAMPLES TESTING +EXAMPLES_DESC= Build examples (very time consuming) +TESTING_DESC= Build testing programs (very time consuming) -.if ! ${PORT_OPTIONS:MEXAMPLES} -CMAKE_ARGS+= "-DBUILD_EXAMPLES:BOOL=OFF" -.endif - -.if ! ${PORT_OPTIONS:MTESTING} -CMAKE_ARGS+= "-DBUILD_TESTING:BOOL=OFF" -.endif +EXAMPLES_CMAKE_OFF= -DBUILD_EXAMPLES:BOOL=OFF +TESTING_CMAKE_OFF= -DBUILD_TESTING:BOOL=OFF post-install: - @for lib in ${PREFIX}/lib/InsightToolkit/*.so ; do \ + @cd ${STAGEDIR}${PREFIX}/lib/InsightToolkit && for lib in *.so; do \ ${LN} -s $$lib.2.8.0 $$lib.2 ; \ done - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} -.include +.include Added: head/science/InsightToolkit/files/patch-Code-Common-itkArray.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/InsightToolkit/files/patch-Code-Common-itkArray.h Thu Dec 19 09:58:02 2013 (r336885) @@ -0,0 +1,11 @@ +--- Code/Common/itkArray.h.orig 2006-03-16 14:43:26.000000000 +0300 ++++ Code/Common/itkArray.h 2013-12-18 22:35:26.050168890 +0400 +@@ -78,7 +78,7 @@ + + + /** Set the all the elements of the array to the specified value */ +- void Fill (TValueType const& v) { fill(v); } ++ void Fill (TValueType const& v) { this->fill(v); } + + /** Copy opertor */ + const Self & operator=( const Self &rhs ); Added: head/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h Thu Dec 19 09:58:02 2013 (r336885) @@ -0,0 +1,11 @@ +--- Code/Common/itkArray2D.h.orig 2003-12-15 17:13:19.000000000 +0300 ++++ Code/Common/itkArray2D.h 2013-12-18 22:35:49.297942916 +0400 +@@ -60,7 +60,7 @@ + const Self & operator=( const Self & array ); + const Self & operator=( const VnlMatrixType & matrix ); + +- void Fill (TValueType const& v) { fill(v); } ++ void Fill (TValueType const& v) { this->fill(v); } + + /** Destructively set the size to that given. Will lose data. */ + void SetSize(unsigned int m, unsigned int n); Added: head/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h Thu Dec 19 09:58:02 2013 (r336885) @@ -0,0 +1,33 @@ +--- Code/Common/itkKLMSegmentationBorder.h.orig 2006-02-07 01:01:56.000000000 +0300 ++++ Code/Common/itkKLMSegmentationBorder.h 2013-12-17 17:28:09.961367612 +0400 +@@ -80,11 +80,11 @@ + + bool operator> (const KLMDynamicBorderArray* rhs) const + { +- if( m_Pointer->GetLambda() == rhs.m_Pointer->GetLambda() ) ++ if( m_Pointer->GetLambda() == rhs->m_Pointer->GetLambda() ) + { + if( m_Pointer->GetLambda() < 0 ) + { +- return ( m_Pointer > rhs.m_Pointer ); ++ return ( m_Pointer > rhs->m_Pointer ); + } + else + { +@@ -99,13 +99,13 @@ + m_Pointer->GetRegion2()->GetRegionBorderSize() ); + + unsigned int v2 = vnl_math_max( +- rhs.m_Pointer->GetRegion1()->GetRegionBorderSize(), +- rhs.m_Pointer->GetRegion2()->GetRegionBorderSize() ); ++ rhs->m_Pointer->GetRegion1()->GetRegionBorderSize(), ++ rhs->m_Pointer->GetRegion2()->GetRegionBorderSize() ); + + return ( v1 > v2 ); + } + } +- return(m_Pointer->GetLambda() > rhs.m_Pointer->GetLambda() ); ++ return(m_Pointer->GetLambda() > rhs->m_Pointer->GetLambda() ); + } + + TBorder *m_Pointer; Added: head/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx Thu Dec 19 09:58:02 2013 (r336885) @@ -0,0 +1,20 @@ +--- Code/Common/itkParametricPath.txx.orig 2004-12-04 16:22:44.000000000 +0300 ++++ Code/Common/itkParametricPath.txx 2013-12-18 22:34:31.538947309 +0400 +@@ -43,7 +43,7 @@ + ContinuousIndexType continuousIndex; + IndexType index; + +- continuousIndex = Evaluate( input ); ++ continuousIndex = this->Evaluate( input ); + + // Round each coordinate to the nearest integer value + for( unsigned int i=0; iEndOfInput() - input; + } + +- return ( Evaluate(input + inputStepSize) - Evaluate(input) ) / inputStepSize; ++ return ( this->Evaluate(input + inputStepSize) - this->Evaluate(input) ) / inputStepSize; + } + + template Added: head/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h Thu Dec 19 09:58:02 2013 (r336885) @@ -0,0 +1,11 @@ +--- Utilities/vxl/core/vnl/vnl_matrix_fixed_ref.h.orig 2006-03-22 01:25:06.000000000 +0300 ++++ Utilities/vxl/core/vnl/vnl_matrix_fixed_ref.h 2013-12-17 17:21:57.529194289 +0400 +@@ -653,7 +653,7 @@ + //: Return true if *this == rhs + bool operator_eq (vnl_matrix_fixed_ref_const const & rhs) const + { +- return equal( this->data_block(), rhs.data_block() ); ++ return this->equal( this->data_block(), rhs.data_block() ); + } + + //: Equality operator