--- Portfile.orig	2008-01-02 20:36:15.000000000 -0500
+++ Portfile	2008-01-05 13:44:03.000000000 -0500
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		gdal
-version		1.4.1
+version		1.5.0
 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 688cf651c6f6efc2851b12f2e9c2e0d1
+checksums		md5 ffbb024db521a002018cb5666bd6e60d
 
 depends_lib	port:zlib port:libpng port:tiff port:libgeotiff port:jpeg \
 			port:giflib port:proj
@@ -24,17 +24,24 @@
 configure.args	--without-python --with-libz=${prefix} --with-png=${prefix} \
 	--with-libtiff=${prefix} --with-geotiff=${prefix} --with-jpeg=${prefix} \
 	--with-gif=${prefix} --without-pg --without-mysql --without-sqlite \
-	--mandir=${prefix}/share/man --with-static-proj4=${prefix}
+	--mandir=${prefix}/share/man --with-static-proj4=${prefix} --without-macosx-framework
 
 
-# Python bindings have issues and aren't working in this port yet
-#variant python {
-#	depends_lib-append		port:python24
-#	configure.args-delete	--without-python
-#	configure.args-append	--with-ngpython PYTHON=${prefix}/bin/python
-#											PYTHON_LIBS="-L${prefix}/lib/python2.4/config -lpython2.4" \
-#											PYTHON_INCLUDES="-I${prefix}/include/python2.4"
-#}
+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"
+}
+
+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"
+}
 
 variant geos {
 	depends_lib-append		port:geos
@@ -52,12 +59,22 @@
 	configure.args-append	--with-pg=${prefix}/lib/postgresql81/bin/pg_config
 }
 
+variant postgresql82 {
+	depends_lib-append		port:postgresql82
+	configure.args-delete	--without-pg
+	configure.args-append	--with-pg=${prefix}/lib/postgresql82/bin/pg_config
+}
+
 variant sqlite3 {
 	depends_lib-append		port:sqlite3
 	configure.args-delete	--without-sqlite
 	configure.args-append	--with-sqlite=${prefix}
 }
 
+variant framework {
+	configure.args-append	--with-macosx-framework
+}
+
 platform darwin 8 {
 	configure.compiler	gcc-4.0
 }