On Dec 4, 2010, at 12:16, [email protected] wrote: > Revision: 74077 > http://trac.macports.org/changeset/74077 > Author: [email protected] > Date: 2010-12-04 10:16:01 -0800 (Sat, 04 Dec 2010) > Log Message: > ----------- > Update to version 3.7
Please do not make whitespace changes at the same time that you make functional changes to the port. Make whitespace changes separately, in their own commit. Otherwise, the output of "svn diff" and "svn blame" become much less useful. > Modified Paths: > -------------- > trunk/dports/gis/gdal/Portfile > trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile > trunk/dports/gis/gdal/files/patch_cpl_config_h > > Modified: trunk/dports/gis/gdal/Portfile > =================================================================== > --- trunk/dports/gis/gdal/Portfile 2010-12-04 18:08:58 UTC (rev 74076) > +++ trunk/dports/gis/gdal/Portfile 2010-12-04 18:16:01 UTC (rev 74077) > @@ -1,50 +1,52 @@ > # $Id$ > > -PortSystem 1.0 > -name gdal > -version 1.6.2 > -revision 3 > -maintainers gmail.com:seanasy > -platforms darwin > -description GDAL - Geospatial Data Abstraction Library > +PortSystem 1.0 > +name gdal > +version 1.7.2 > +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 f2dcd6aa7222d021202984523adf3b55 \ > - rmd160 e445680953f25047a280f36cedba0597094e0562 > \ > - sha1 1d9e1d8f01f06bca99e7335d7e86dff784eee819 > + 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 > > -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 --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 > --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 \ > - --without-xerces \ > - --mandir=${prefix}/share/man --with-pthreads \ > +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 > > > # Patch to ensure that the python installation respects DESTDIR > @@ -53,7 +55,9 @@ > # Patches for universal build > > post-configure { > - reinplace -E "s|XXX|${PYINST}|" > ${worksrcpath}/swig/python/GNUmakefile > + reinplace -E "s|INST_PYMOD.*|INST_PYMOD = ${PYINST}|" \ > + ${worksrcpath}/GDALmake.opt > + > if {[variant_isset universal]} { > system "cd ${worksrcpath} && patch -p0 < > ${portpath}/files/patch_cpl_config_h" > } > @@ -74,29 +78,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} > @@ -117,30 +121,29 @@ > # 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 > + configure.args-append --with-python > + set PYINST > ${frameworks_dir}/Python.framework/Versions/2.6 > build.args-append PYTHON=python2.6 > - set PYINST > ${frameworks_dir}/Python.framework/Versions/2.6 > use_parallel_build no > } > > @@ -177,10 +180,16 @@ > > variant sqlite3 description {Enable SQLite3 support} { > depends_lib-append port:sqlite3 > - configure.args-delete --without-sqlite > - configure.args-append --with-sqlite=${prefix} > + configure.args-delete --without-sqlite3 > + configure.args-append --with-sqlite3=${prefix} > } > > +variant spatialite description {Uses spatialite database} { > + depends_lib-append port:spatialite > + configure.args-delete --without-spatialite > + configure.args-append --with-spatialite=${prefix} > +} > + > variant odbc description {Enable ODBC support} { > depends_lib-append port:unixODBC > configure.args-delete --without-odbc > @@ -195,7 +204,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 _______________________________________________ macports-dev mailing list [email protected] http://lists.macosforge.org/mailman/listinfo.cgi/macports-dev
