most recent changes, diff for gdal

Index: science/gdal/Portfile
--- science/gdal/Portfile (revision 37937)
+++ science/gdal/Portfile (revision 37938)
@@ -2,7 +2,7 @@

PortSystem 1.0
name gdal
-version 1.5.0
+version 1.5.1
maintainers seanasy@gmail.com
platforms darwin
description GDAL - Geospatial Data Abstraction Library
@@ -16,7 +16,7 @@
homepage http://www.gdal.org/
master_sites http://www.gdal.org/dl/
categories science
-checksums md5 ffbb024db521a002018cb5666bd6e60d
+checksums md5 76b53917142c5e9ad2d0ac20fb99890b

depends_lib port:zlib port:libpng port:tiff port:libgeotiff port:jpeg \
port:giflib port:proj
@@ -26,23 +26,24 @@
--with-gif=${prefix} --without-pg --without-mysql --without-sqlite \
--mandir=${prefix}/share/man --with-static-proj4=${prefix} --without-macosx-framework

+# Patch to ensure that the python installation respects DESTDIR
+patchfiles patch-swig_python_GNUmakefile
+
# Set target to none
build.target

variant python24 {
- depends_lib-append port:python24
- configure.args-append --with-ngpython PYTHON=${prefix}/bin/python2.4 \
- PYTHON_LIBS="-L${prefix}/lib/python2.4/config -lpython2.4" \
- PYTHON_INCLUDES="-I${prefix}/include/python2.4" \
- --with-pymoddir="${prefix}/lib/python2.4/site-packages"
+ depends_lib-append port:python24 \
+ port:py-numpy
+ configure.args-append --with-python
+ build.args-append PYTHON=python2.4
}

variant python25 {
- depends_lib-append port:python25
- configure.args-append --with-ngpython PYTHON=${prefix}/bin/python2.5 \
- PYTHON_LIBS="-L${prefix}/lib/python2.5/config -lpython2.5" \
- PYTHON_INCLUDES="-I${prefix}/include/python2.5" \
- --with-pymoddir="${prefix}/lib/python2.5/site-packages"
+ depends_lib-append port:python25 \
+ port:py25-numpy
+ configure.args-append --with-python
+ build.args-append PYTHON=python2.5
}

variant geos {