diff options
author | lawrance <lawrance@FreeBSD.org> | 2005-04-23 22:12:36 +0800 |
---|---|---|
committer | lawrance <lawrance@FreeBSD.org> | 2005-04-23 22:12:36 +0800 |
commit | 95cc8c43688579a64f8dc582cfee30fc53bfbc76 (patch) | |
tree | 830d53a077474cc43a4564913c2dbafe4875c0cb /math/vtk43 | |
parent | 91c57662b58ff51c57c227de212e98ac921af232 (diff) | |
download | freebsd-ports-gnome-95cc8c43688579a64f8dc582cfee30fc53bfbc76.tar.gz freebsd-ports-gnome-95cc8c43688579a64f8dc582cfee30fc53bfbc76.tar.zst freebsd-ports-gnome-95cc8c43688579a64f8dc582cfee30fc53bfbc76.zip |
Update math/vtk-* to version 4.4
PR: ports/77038
Submitted by: Mykola Khotyaintsev <ko@irfu.se> (maintainer)
Approved by: clement (mentor)
Diffstat (limited to 'math/vtk43')
-rw-r--r-- | math/vtk43/Makefile | 27 | ||||
-rw-r--r-- | math/vtk43/distinfo | 4 | ||||
-rw-r--r-- | math/vtk43/files/patch-IO-vtkBMPReader.cxx | 16 | ||||
-rw-r--r-- | math/vtk43/files/patch-IO-vtkImageReader.cxx | 30 |
4 files changed, 6 insertions, 71 deletions
diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile index fa2768748f59..122912f1cc0d 100644 --- a/math/vtk43/Makefile +++ b/math/vtk43/Makefile @@ -14,11 +14,10 @@ # PORTNAME= vtk -PORTVERSION= 4.3.0 -PORTREVISION= 3 +PORTVERSION= 4.4 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ -DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz +DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz MAINTAINER= ko@irfu.se COMMENT?= The Visualization Toolkit shared libs @@ -26,14 +25,12 @@ COMMENT?= The Visualization Toolkit shared libs USE_REINPLACE= yes LIBVER= 1 -CVSDATE= 20031006 VTKSRCDIR= ${WRKDIR}/VTK TESTINGDIR= ${EXAMPLESDIR}/Testing VTKDATAROOT= ${EXAMPLESDIR}/VTKData -DOCSDIR= ${PREFIX}/share/doc/${PKGNAME} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files -RESTRICTED= yes VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented @@ -58,33 +55,17 @@ RUN_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data .endif -ONLY_FOR_ARCHS= i386 # was not tested on other ARCHS USE_GMAKE= yes USE_GL= yes INSTALLS_SHLIB= yes -# if optimization flag -O2 or -O3 is present - use g++33 -# There is a problem compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 -# with -02 -march=pentium3 -.if defined(CXXFLAGS) -TTT= "${CXXFLAGS}" # this quotes are VERY important! -OPTFLAGPRESENT= ${TTT:C/^.*-O[23].*$/yes/} -.if ${OPTFLAGPRESENT} == "yes" -USE_GCC= 3.3 -.endif -.endif - -.if ${OSVERSION} < 500016 -ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} -.endif - CMAKE?= ${LOCALBASE}/bin/cmake CXXFLAGS+= -Wno-deprecated CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${PTHREAD_LIBS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ diff --git a/math/vtk43/distinfo b/math/vtk43/distinfo index fb18f97f093d..e10d1193a779 100644 --- a/math/vtk43/distinfo +++ b/math/vtk43/distinfo @@ -1,2 +1,2 @@ -MD5 (VTK-4.3.0-cvs20031006.tar.gz) = 6c574972eb41c9d287fb540811d85e3a -SIZE (VTK-4.3.0-cvs20031006.tar.gz) = 6367112 +MD5 (VTK-4.4-LatestRelease.tar.gz) = 17a5006c4d7acca3e74d32e0e27f4739 +SIZE (VTK-4.4-LatestRelease.tar.gz) = 6323955 diff --git a/math/vtk43/files/patch-IO-vtkBMPReader.cxx b/math/vtk43/files/patch-IO-vtkBMPReader.cxx deleted file mode 100644 index f82deeb825e5..000000000000 --- a/math/vtk43/files/patch-IO-vtkBMPReader.cxx +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r1.44 -r1.45 ---- IO/vtkBMPReader.cxx 2003/09/10 19:41:56 1.44 -+++ IO/vtkBMPReader.cxx 2003/10/19 14:38:03 1.45 -@@ -504,11 +504,11 @@ - outPtr0 += outIncr[0]; - } - // move to the next row in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg); - outPtr2 += outIncr[2]; - } diff --git a/math/vtk43/files/patch-IO-vtkImageReader.cxx b/math/vtk43/files/patch-IO-vtkImageReader.cxx deleted file mode 100644 index 3e302e72af59..000000000000 --- a/math/vtk43/files/patch-IO-vtkImageReader.cxx +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r1.109 -r1.110 ---- IO/vtkImageReader.cxx 2002/12/26 18:18:50 1.109 -+++ IO/vtkImageReader.cxx 2003/10/19 14:38:03 1.110 -@@ -166,7 +166,7 @@ - streamStart += this->GetHeaderSize(idx); - - // error checking -- this->File->seekg((long)streamStart, ios::beg); -+ this->File->seekg(static_cast<long>(streamStart), ios::beg); - if (this->File->fail()) - { - vtkErrorMacro(<< "File operation failed: " << streamStart << ", ext: " -@@ -366,7 +366,7 @@ - // if that happens, store the value in correction and apply later - if (filePos + streamSkip0 >= 0) - { -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); - correction = 0; - } - else -@@ -376,7 +376,7 @@ - outPtr1 += outIncr[1]; - } - // move to the next image in the file and data -- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, -+ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction, - ios::beg); - outPtr2 += outIncr[2]; - } |