[74124] trunk/dports/gis/gdal

5 Dec 2010

Revision: 74124
          http://trac.macports.org/changeset/74124
Author:   vince@macports.org
Date:     2010-12-05 08:47:10 -0800 (Sun, 05 Dec 2010)
Log Message:
-----------
Bump to vesion 1.7.3

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

Modified: trunk/dports/gis/gdal/Portfile
===================================================================

--- trunk/dports/gis/gdal/Portfile	2010-12-05 12:49:47 UTC (rev 74123)
+++ trunk/dports/gis/gdal/Portfile	2010-12-05 16:47:10 UTC (rev 74124)
@@ -1,63 +1,62 @@
 # $Id$
 
-PortSystem			1.0
-name				gdal
-version				1.7.2
-revision			3
-maintainers			gmail.com:seanasy
-platforms			darwin
-description			GDAL - Geospatial Data Abstraction Library
+PortSystem	1.0
+name		gdal
+version		1.7.3
+revision	3
+maintainers	gmail.com:seanasy
+platforms	darwin
+description	GDAL - Geospatial Data Abstraction Library
 long_description	GDAL is a translator library for raster geospatial \
-					data formats that is released under an X/MIT style \
-					Open Source license. As a library, it presents a \
-					single abstract data model to the calling application \
-					for all supported formats. The related OGR library \
-					(which lives within the GDAL source tree) provides a \
-					similar capability for simple features vector data. 
-homepage			http://www.gdal.org/
-master_sites		http://www.gdal.org/dl/ \
-					http://download.osgeo.org/gdal/
-categories			gis
-checksums           md5     05351f8cb61761ae579667e24a297fe6 \
-                    sha1    a03127530708e3924aec7b505cc2ca4f8153f13c \
-                    rmd160  a3f7950798448d8179f899dc095a83e23dcc269b
+			data formats that is released under an X/MIT style \
+			Open Source license. As a library, it presents a \
+			single abstract data model to the calling application \
+			for all supported formats. The related OGR library \
+			(which lives within the GDAL source tree) provides a \
+			similar capability for simple features vector data. 
+homepage	http://www.gdal.org/
+master_sites	http://www.gdal.org/dl/ \
+				http://download.osgeo.org/gdal/
+categories		gis
+checksums		md5     c4673970bd2285032de9ae9bbd82754a \
+				rmd160  ce84a12d48c85a58c56a17381aee1c4f2ba08b57 \
+				sha1    58d4355fe792ad618bb74605dc1a084a0aeb7cb1
 
-depends_lib			port:zlib port:libpng port:tiff port:libgeotiff port:jpeg \
-					path:include/gif_lib.h:giflib port:proj
+depends_lib	port:zlib port:libpng port:tiff port:libgeotiff port:jpeg \
+			path:include/gif_lib.h:giflib port:proj
 			
-set					PYINST	""
+set			PYINST	""
 
-configure.args-append \
-					--with-local=${prefix} --with-libz=${prefix}\
-					--with-png=${prefix}\
-					--with-libtiff=${prefix} --with-geotiff=${prefix}\
-					--with-jpeg=${prefix} --with-gif=${prefix}\
-					--with-static-proj4=${prefix}\
-					--without-pg --without-grass --without-libgrass\
-					--without-cfitsio --without-pcraster --without-netcdf\
-					--without-ogdi --without-fme --without-hdf4 --without-hdf5\
-					--without-jasper --without-ecw --without-kakadu\
-					--without-mrsid --without-jp2mrsid --without-msg\
-					--without-bsb --without-oci --without-spatialite\
-					--without-grib --without-mysql --without-ingres\
-					--without-xerces --without-expat --without-odbc\
-					--with-dods-support=no --without-curl --without-sqlite3\
-					--without-dwgdirect --without-idb --without-sde\
-					--without-geos --without-pam --without-macosx-framework\
-					--without-perl --without-php --without-ruby\
-					--without-python --without-ogpython\
-					--mandir=${prefix}/share/man --with-threads=-lpthread
-
-				
+configure.args	--with-local=${prefix} --with-libz=${prefix} \
+				--with-png=${prefix} \
+				--with-libtiff=${prefix} --with-geotiff=${prefix} \
+				--with-jpeg=${prefix} --with-gif=${prefix} \
+				--with-static-proj4=${prefix} \
+				--without-pg --without-grass --without-libgrass \
+				--without-cfitsio --without-pcraster --without-netcdf \
+				--without-ogdi --without-fme --without-hdf4 --without-hdf5 \
+				--without-jasper --without-ecw --without-kakadu \
+				--without-mrsid \
+				--without-jp2mrsid --without-msg --without-bsb --without-oci \
+				--without-grib --without-mysql --without-ingres \
+				--without-xerces \
+				--without-expat --without-odbc \
+				--without-curl --without-sqlite3 --without-spatialite\
+				--without-dwgdirect --without-idb --without-sde \
+				--without-geos \
+				--without-pam --without-perl \
+				--without-php --without-ruby \
+				--without-python \
+				--without-xerces --without-expat \
+				--mandir=${prefix}/share/man
 # Patch to ensure that the python installation respects DESTDIR
 patchfiles	patch-swig_python_GNUmakefile
 
 # Patches for universal build
 
 post-configure {
-	reinplace -E "s|INST_PYMOD.*|INST_PYMOD = ${PYINST}|" \
-		${worksrcpath}/GDALmake.opt
-
+	reinplace -E "s|(INST_PYMOD).*|\\1\t=\t${PYINST}|" \
+				${worksrcpath}/GDALmake.opt
 	if {[variant_isset universal]} {
 		system "cd ${worksrcpath} && patch -p0 < ${portpath}/files/patch_cpl_config_h"
 	}
@@ -78,29 +77,29 @@
 	configure.args-append	--with-curl=${prefix}/bin/curl-config
 }
 
-variant mrsid description 	{Enable MrSID file format} {
+variant mrsid description {Enable MrSID file format} {
 	depends_lib-append		port:geoexpress-sdk
 	configure.args-delete	--without-mrsid
-	configure.args-append	--with-mrsid=${prefix}/share/Geo_DSDK
+	configure.args-append		--with-mrsid=${prefix}/share/Geo_DSDK
 
 	# Fixes for Geo_DSDK 7.x - http://trac.osgeo.org/gdal/ticket/2410
 	patchfiles-append		patch-frmts_mrsid_mrsiddataset.cpp \
-							patch-mrsid-configure
+					patch-mrsid-configure
 }
 
-variant hdf4 description 	{Enable HDF4 file format} {
+variant hdf4 description {Enable HDF4 file format} {
 	depends_lib-append		port:hdf4
 	configure.args-delete	--without-hdf4
 	configure.args-append	--with-hdf4=${prefix}
 }
 
-variant hdf5 description 	{Enable HDF5 file format} {
+variant hdf5 description {Enable HDF5 file format} {
 	depends_lib-append		port:hdf5-18
 	configure.args-delete	--without-hdf5
 	configure.args-append	--with-hdf5=${prefix}
 }
 
-variant netcdf description 	{Enable NetCDF file format} {
+variant netcdf description {Enable NetCDF file format} {
 	depends_lib-append		port:netcdf
 	configure.args-delete	--without-netcdf
 	configure.args-append	--with-netcdf=${prefix}
@@ -118,32 +117,39 @@
 	configure.args-append	--with-xerces=${prefix}
 }
 
+variant expat description {Enable expat XML support} {
+	depends_lib-append		port:expat
+	configure.args-delete	--without-expat
+	configure.args-append	--with-expat=${prefix}
+}
+
 # Python variants 
 variant python24 description {Enable Python 2.4 support} {
 	depends_lib-append		port:python24 \
-							port:py-numpy
+					port:py-numpy
 	configure.args-delete	--without-python
-	configure.args-append	--with-python
-	set	PYINST				${frameworks_dir}/Python.framework/Versions/2.4
+	configure.args-append		--with-python
+	set	PYINST				 ${frameworks_dir}/Python.framework/Versions/2.4
 	build.args-append		PYTHON=python2.4
 }
 
 variant python25 description {Enable Python 2.5 support} {
 	depends_lib-append		port:python25 \
-							port:py25-numpy
+					port:py25-numpy
 	configure.args-delete	--without-python
-	configure.args-append	--with-python
-	set	PYINST				${frameworks_dir}/Python.framework/Versions/2.5
+	configure.args-append		--with-python
+	set	PYINST				 ${frameworks_dir}/Python.framework/Versions/2.5
 	build.args-append		PYTHON=python2.5
 }
 
 variant python26 description {Enable Python 2.6 support} {
 	depends_lib-append		port:python26 \
-							port:py26-numpy
+					port:py26-numpy
 	configure.args-delete	--without-python
-	configure.args-append	--with-python
+	configure.args-append		--with-python
+	configure.args-append
+	build.args-append		PYTHON=python2.6
 	set	PYINST				 ${frameworks_dir}/Python.framework/Versions/2.6
-	build.args-append		PYTHON=python2.6
 	use_parallel_build		no
 }
 
@@ -172,6 +178,12 @@
 	configure.args-append	--with-pg=${prefix}/lib/postgresql84/bin/pg_config
 }
 
+variant postgresql90 description {Enable PostgreSQL 9.0 support} {
+	depends_lib-append		port:postgresql90
+	configure.args-delete	--without-pg
+	configure.args-append	--with-pg=${prefix}/lib/postgresql90/bin/pg_config
+}
+
 variant mysql5 description {Enable MySQL 5 support} {
 	depends_lib-append		path:bin/mysql_config5:mysql5
 	configure.args-delete	--without-mysql
@@ -184,7 +196,7 @@
 	configure.args-append	--with-sqlite3=${prefix}
 }
 
-variant spatialite description {Uses spatialite database} {
+variant spatialite description {Enable SpartiaLite support} {
 	depends_lib-append		port:spatialite
 	configure.args-delete	--without-spatialite
 	configure.args-append	--with-spatialite=${prefix}
@@ -204,7 +216,7 @@
 post-destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} HOWTO-RELEASE NEWS VERSION \
-						${destroot}${prefix}/share/doc/${name}
+		${destroot}${prefix}/share/doc/${name}
 }
 
 livecheck.type  regex

Modified: trunk/dports/gis/gdal/files/patch_cpl_config_h
===================================================================
--- trunk/dports/gis/gdal/files/patch_cpl_config_h	2010-12-05 12:49:47 UTC (rev 74123)
+++ trunk/dports/gis/gdal/files/patch_cpl_config_h	2010-12-05 16:47:10 UTC (rev 74124)
@@ -1,49 +1,32 @@
---- port/cpl_config.h.orig	2010-05-13 13:38:03.000000000 +0200
-+++ port/cpl_config.h	2010-05-13 13:39:18.000000000 +0200
-@@ -129,9 +129,6 @@
- /* Define to 1 if you have the `vsnprintf' function. */
- #define HAVE_VSNPRINTF 1
+--- port/cpl_config.h.orig	2008-12-20 15:12:09.000000000 +0100
++++ port/cpl_config.h	2008-12-20 15:16:54.000000000 +0100
+@@ -143,13 +143,26 @@
+ #define SIZEOF_INT 4
  
--/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
--#define HOST_FILLORDER FILLORDER_LSB2MSB
--
- /* Define to the sub-directory in which libtool stores uninstalled libraries.
-    */
- #define LT_OBJDIR ".libs/"
-@@ -145,12 +142,6 @@
  /* The size of `long', as computed by sizeof. */
- /* #undef SIZEOF_LONG */
+-/* #undef SIZEOF_LONG */
++#if defined (__LP64__)
++  #define SIZEOF_LONG 8
++#else
++  #define SIZEOF_LONG 4
++#endif
  
--/* The size of `unsigned long', as computed by sizeof. */
+ /* The size of `unsigned long', as computed by sizeof. */
 -#define SIZEOF_UNSIGNED_LONG 8
--
--/* The size of `void*', as computed by sizeof. */
--#define SIZEOF_VOIDP 8
--
- /* Define to 1 if you have the ANSI C header files. */
- #define STDC_HEADERS 1
- 
-@@ -193,20 +184,20 @@
- #ifdef __BIG_ENDIAN__
-   #define HOST_FILLORDER FILLORDER_LSB2MSB
- #else
--  #define HOST_FILLORDER FILLORDER_LSB2MSB
-+  #define HOST_FILLORDER FILLORDER_MSB2LSB
- #endif
- 
- 
- #ifdef __LP64__
-   #define SIZEOF_UNSIGNED_LONG 8
- #else
--  #define SIZEOF_UNSIGNED_LONG 8
++#if defined (__LP64__)
++  #define SIZEOF_UNSIGNED_LONG 8
++#else
 +  #define SIZEOF_UNSIGNED_LONG 4
- #endif
++#endif
++
  
- #ifdef __LP64__
-   #define SIZEOF_VOIDP 8
- #else
--  #define SIZEOF_VOIDP 8
+ /* The size of `void*', as computed by sizeof. */
+-#define SIZEOF_VOIDP 8
++#if defined (__LP64__)
++  #define SIZEOF_VOIDP 8
++#else
 +  #define SIZEOF_VOIDP 4
- #endif
++#endif
  
- #ifdef __BIG_ENDIAN__
+ /* Define to 1 if you have the ANSI C header files. */
+ #define STDC_HEADERS 1

    

[74124] trunk/dports/gis/gdal

vince＠macports.org