[37938] trunk/dports/science/gdal

[landonf at macports.org]

Revision: 37938
          http://trac.macosforge.org/projects/macports/changeset/37938
Author:   landonf at macports.org
Date:     2008-06-29 18:53:32 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
Update to 1.5.1 and fix Python support

Modified Paths:
--------------
    trunk/dports/science/gdal/Portfile

Added Paths:
-----------
    trunk/dports/science/gdal/files/
    trunk/dports/science/gdal/files/patch-swig_python_GNUmakefile

Modified: trunk/dports/science/gdal/Portfile
===================================================================
--- trunk/dports/science/gdal/Portfile	2008-06-30 01:37:43 UTC (rev 37937)
+++ trunk/dports/science/gdal/Portfile	2008-06-30 01:53:32 UTC (rev 37938)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		gdal
-version		1.5.0
+version		1.5.1
 maintainers	seanasy at 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 {

Added: trunk/dports/science/gdal/files/patch-swig_python_GNUmakefile
===================================================================
--- trunk/dports/science/gdal/files/patch-swig_python_GNUmakefile	                        (rev 0)
+++ trunk/dports/science/gdal/files/patch-swig_python_GNUmakefile	2008-06-30 01:53:32 UTC (rev 37938)
@@ -0,0 +1,16 @@
+--- swig/python/GNUmakefile.orig	2008-06-29 17:42:00.000000000 -0700
++++ swig/python/GNUmakefile	2008-06-29 17:42:18.000000000 -0700
+@@ -53,12 +53,7 @@
+ 	$(PYTHON) setup.py bdist_egg 
+ 	
+ install:
+-
+-ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
+-else
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+-endif
++	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
+ 
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
+ 	
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080629/2b11df8b/attachment.html