[58809] trunk/dports/graphics/vtk-devel/Portfile

[dweber at macports.org]

Revision: 58809
          http://trac.macports.org/changeset/58809
Author:   dweber at macports.org
Date:     2009-10-05 12:39:28 -0700 (Mon, 05 Oct 2009)
Log Message:
-----------
merged all changes from user branch back to the trunk after testing update to ver 5.4.2; main difference is the version update and pgsql84 replaces pgsql83 as a default in the database variant

Modified Paths:
--------------
    trunk/dports/graphics/vtk-devel/Portfile

Property Changed:
----------------
    trunk/dports/graphics/vtk-devel/Portfile

Modified: trunk/dports/graphics/vtk-devel/Portfile
===================================================================
--- trunk/dports/graphics/vtk-devel/Portfile	2009-10-05 18:54:56 UTC (rev 58808)
+++ trunk/dports/graphics/vtk-devel/Portfile	2009-10-05 19:39:28 UTC (rev 58809)
@@ -4,8 +4,8 @@
 PortSystem      1.0
 
 name            vtk-devel
-version         5.4.0
-revision        5
+version         5.4.2
+revision        0
 set branch      [join [lrange [split ${version} .] 0 1] .]
 
 categories      graphics math science devel
@@ -24,14 +24,14 @@
 distname        vtk-${branch}
 distfiles       vtk-${version}.tar.gz
 
+# Also update checksums in the data and doc variants below.
 checksums       vtk-${version}.tar.gz \
-                    md5  3e7c6d5c37602c935674d580a8dd43c0 \
-                    sha1 a227caf932315d944cf72008d75df90dd4c554e7 \
-                    rmd160 e2140fc35ed974f5fde6b418089554904e197c21
+                    md5 c2c797091d4b2128d9a1bd32c4b78227 \
+                    sha1 508106a15c32326aa9ac737c7f0e7212c150d55f \
+                    rmd160 607df8babe7413b92a5bd4d8c264fd69798df83f
 
 eval extract.only   vtk-${version}.tar.gz
 
-
 platforms       darwin
 
 depends_build   port:cmake  \
@@ -191,7 +191,7 @@
     description "provide java, py26, & tcl" {}
 
 variant database \
-    requires mysql5 pgsql83 odbc \
+    requires mysql5 pgsql84 odbc \
     description "provide all database variants" {}
 
 
@@ -305,9 +305,9 @@
 variant data description "provide example data in: ${vtkDataPath}" {
     distfiles-append    ${vtkDataFile}
     checksums-append    ${vtkDataFile} \
-                            md5  283d40f3e499b3a6102d86855d2ca20b \
-                            sha1 a710227e7f7f25f481a36d2fa14bda49756bd39d \
-                            rmd160 160129a0580bd7b70b40d3f7fa61bbd78b586ad8
+                        md5 3b05eadd4446bbf3f863e744b7bee14a \
+                        sha1 5030523c0a9e17c47bf94fe9005e5c91069a571a \
+                        rmd160 0cc24fc7a6a9bb80c619a0555eb288cc97554001
     configure.args-append \
         -DVTK_DATA_ROOT:PATH=${vtkDataPath}
     post-destroot {
@@ -320,9 +320,9 @@
 variant doc description "provide doxygen documentation in: ${vtkDocPath}" {
     distfiles-append    ${vtkDocFile}
     checksums-append    ${vtkDocFile} \
-                            md5 eb8fcaa5fa8bc8f463084f071b2b978b \
-                            sha1 1a8f8ff20b18bc7ac707846a8ba056b04c827392 \
-                            rmd160 c657f9ce0850eca1bb0a0d7537f0bcf631132f30
+                        md5 a12be55a8787a6346efa9e251bce3a10 \
+                        sha1 13da1373bb95f34b1f868b307f0e84fef6626020 \
+                        rmd160 d6372984b74ede33713501219fecd6768edcfad3
     post-destroot {
         xinstall -d -o root -g admin -m 0755 ${destroot}/${vtkDocPath}
         xinstall -d -o root -g admin -m 0755 ${destroot}/${prefix}/share/doc
@@ -694,7 +694,7 @@
 }
 
 
-variant pgsql83 description "build the PostgreSQL 8.3 driver for vtkSQLDatabase" {
+variant pgsql83 conflicts pgsql84 description "build the PostgreSQL 8.3 driver for vtkSQLDatabase" {
     depends_lib-append \
         path:lib/postgresql83/bin/pg_config:postgresql83
     pre-configure {
@@ -715,6 +715,27 @@
 }
 
 
+variant pgsql84 conflicts pgsql83 description "build the PostgreSQL 8.4 driver for vtkSQLDatabase" {
+    depends_lib-append \
+        path:lib/postgresql84/bin/pg_config:postgresql84
+    pre-configure {
+        set pgconf [exec ${prefix}/lib/postgresql84/bin/pg_config ]
+        set includeIdx [lsearch -regex ${pgconf} "^INCLUDEDIR"]
+        set includePath [lindex ${pgconf} [expr ${includeIdx} + 2]]
+        set libIdx [lsearch -regex $pgconf "^LIBDIR"]
+        set libPath [lindex $pgconf [expr $libIdx + 2]]
+        set libFile [exec find ${libPath} -name "libpq.dylib"]
+        configure.args-append \
+            -DVTK_USE_POSTGRES:BOOL=ON \
+            -DPOSTGRES_INCLUDE_DIRECTORIES:PATH=${includePath} \
+            -DPOSTGRES_LIBRARIES:FILEPATH=${libFile}
+            #// A URL for a PostgreSQL server of the form
+            #// psql://[[username[:password]@]hostname[:port]]/[dbname]
+            #VTK_PSQL_TEST_URL:STRING=
+    }
+}
+
+
 variant odbc description "build the ODBC database interface" {
     depends_lib-append \
         port:unixODBC


Property changes on: trunk/dports/graphics/vtk-devel/Portfile
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dweber/graphics/vtk-devel/Portfile:53188-53543
   + /users/dweber/graphics/vtk-devel/Portfile:53188-53543,58690-58808
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091005/9d71331a/attachment.html>