ports/78829: Update math/vtk to interim version 4.4

Mon Mar 14 17:20:08 UTC 2005

>Number:         78829
>Category:       ports
>Synopsis:       Update math/vtk to interim version 4.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 14 17:20:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Pedro F. Giffuni
>Release:        5.3-Release
>Organization:
>Environment:
FreeBSD giffuni.etb.net.co 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov  5 04:19:18 UTC 2004     root at harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
      I have some interest in porting ParaView, and this uses VTK. The current maintainer has done a great job but we are using a version he made from CVS. This version is more recent and doesn't need patches to build. I hope the maintainer has time to review it, the port is very complex. I did the following changes:
- Updated the tarball and the Master sites.
- Removed USE_GMAKE (this uses cmake)
- Removed RESTRICTED, this is open source. JIC I added a NO_PACKAGE line to respect the maintainer's wishes
- Enabled building on non i386, as it's the only way to know if it builds on other platforms (it should).
>How-To-Repeat:
      The maintainer never answered my request to update this. I will CC the PR to the maintainer anyways.
>Fix:
      patch follows:
diff -ruN vtk.orig/Makefile vtk/Makefile

--- vtk.orig/Makefile	Sun Mar 13 12:53:02 2005
+++ vtk/Makefile	Mon Mar 14 12:02:53 2005
@@ -14,26 +14,25 @@
 #
 
 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
+MASTER_SITES=	http://www.vtk.org/files/release/4.4/	\
+		ftp://public.kitware.com/pub/vtk/vtk4.4/
+DISTNAME=	VTK-${PORTVERSION}-LatestRelease
 
 MAINTAINER=	ko at irfu.se
-COMMENT?=	The Visualization Toolkit shared libs
+COMMENT=	The Visualization Toolkit shared libs (interim release)
 
 USE_REINPLACE=	yes
 
 LIBVER=		1
-CVSDATE=	20031006
 VTKSRCDIR=	${WRKDIR}/VTK
 TESTINGDIR=	${EXAMPLESDIR}/Testing
 VTKDATAROOT=	${EXAMPLESDIR}/VTKData
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAME}
 PLIST=		${.CURDIR}/pkg-plist
 FILESDIR=	${.CURDIR}/files
-RESTRICTED=	yes
+NO_PACKAGE=	"Maintainer recommends building your own"
 
 VTK_KITS=	Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patented
 
@@ -58,8 +57,6 @@
 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
 
diff -ruN vtk.orig/distinfo vtk/distinfo
--- vtk.orig/distinfo	Sun Mar 13 12:53:02 2005
+++ vtk/distinfo	Sun Mar 13 12:58:05 2005
@@ -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 -ruN vtk.orig/files/patch-IO-vtkBMPReader.cxx vtk/files/patch-IO-vtkBMPReader.cxx
--- vtk.orig/files/patch-IO-vtkBMPReader.cxx	Sun Mar 13 12:53:02 2005
+++ vtk/files/patch-IO-vtkBMPReader.cxx	Thu Jan  1 00:00:00 1970
@@ -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 -ruN vtk.orig/files/patch-IO-vtkImageReader.cxx vtk/files/patch-IO-vtkImageReader.cxx
--- vtk.orig/files/patch-IO-vtkImageReader.cxx	Sun Mar 13 12:53:02 2005
+++ vtk/files/patch-IO-vtkImageReader.cxx	Thu Jan  1 00:00:00 1970
@@ -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];
-     }

>Release-Note:
>Audit-Trail:
>Unformatted:

