[61243] trunk/dports

[macsforever2000 at macports.org]

Revision: 61243
          http://trac.macports.org/changeset/61243
Author:   macsforever2000 at macports.org
Date:     2009-12-06 10:29:17 -0800 (Sun, 06 Dec 2009)
Log Message:
-----------
Move to gis category. Fix python scripts to use the framework directory. (#21907)

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

Added Paths:
-----------
    trunk/dports/gis/gdal/
    trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile.patch

Removed Paths:
-------------
    trunk/dports/science/gdal/

Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/science/gdal/Portfile	2009-12-06 16:54:15 UTC (rev 61242)
+++ trunk/dports/gis/gdal/Portfile	2009-12-06 18:29:17 UTC (rev 61243)
@@ -16,13 +16,15 @@
 homepage	http://www.gdal.org/
 master_sites	http://www.gdal.org/dl/ \
 				http://download.osgeo.org/gdal/
-categories		science
+categories		gis
 checksums		md5 f2dcd6aa7222d021202984523adf3b55 \
 				rmd160 e445680953f25047a280f36cedba0597094e0562 \
 				sha1 1d9e1d8f01f06bca99e7335d7e86dff784eee819
 
 depends_lib	port:zlib port:libpng port:tiff port:libgeotiff port:jpeg \
 			path:include/gif_lib.h:giflib port:proj
+			
+set			PYINST	""
 
 configure.args	--with-local=${prefix} --with-libz=${prefix} \
 				--with-png=${prefix} \
@@ -49,7 +51,8 @@
 
 # Patches for universal build
 
-pre-build {
+post-configure {
+		reinplace -E "s|XXX|${PYINST}|" ${worksrcpath}/swig/python/GNUmakefile
 	if {[variant_isset universal]} {
 		system "cd ${worksrcpath} && patch -p0 < ${portpath}/files/patch_cpl_config_h"
 	}
@@ -87,7 +90,7 @@
 }
 
 variant hdf5 description {Enable HDF5 file format} {
-	depends_lib-append		port:hdf5
+	depends_lib-append		port:hdf5-18
 	configure.args-delete	--without-hdf5
 	configure.args-append	--with-hdf5=${prefix}
 }
@@ -116,6 +119,7 @@
 					port:py-numpy
 	configure.args-delete	--without-python
 	configure.args-append		--with-python
+	set	PYINST				 ${frameworks_dir}/Python.framework/Versions/2.4
 	build.args-append		PYTHON=python2.4
 }
 
@@ -124,6 +128,7 @@
 					port:py25-numpy
 	configure.args-delete	--without-python
 	configure.args-append		--with-python
+	set	PYINST				 ${frameworks_dir}/Python.framework/Versions/2.5
 	build.args-append		PYTHON=python2.5
 }
 
@@ -132,7 +137,10 @@
 					port:py26-numpy
 	configure.args-delete	--without-python
 	configure.args-append		--with-python
+	configure.args-append
 	build.args-append		PYTHON=python2.6
+	set	PYINST				 ${frameworks_dir}/Python.framework/Versions/2.6
+	use_parallel_build		no
 }
 
 # Database variants

Added: trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile.patch
===================================================================
--- trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile.patch	                        (rev 0)
+++ trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile.patch	2009-12-06 18:29:17 UTC (rev 61243)
@@ -0,0 +1,11 @@
+--- patch-swig_python_GNUmakefile.orig	2009-10-08 13:45:07.000000000 +0200
++++ patch-swig_python_GNUmakefile	2009-10-08 11:59:40.000000000 +0200
+@@ -10,7 +10,7 @@
+ -else
+ -	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+ -endif
+-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
+++	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=XXX
+  
+  	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/20091206/b5437645/attachment-0001.html>