Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5048
Modified Files:
gdal.info
Log Message:
cleanup before updating to gdal 1.10.0. Thanks to dmacks for many of these
fixes.
https://gist.github.com/schwehr/5794715
Break ConfigureParams into multi-line form to make tracking diffs easier
Add dependencies: lib{xml2,pcre1,lzma5,curl4}, expat1, xerces,
Update to libjpeg9, libpng16, libtiff5
Revert to the default compilescript and cleanup the install phase
Cleanup commented out sections and general text
Remove --with-perl
Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gdal.info 30 May 2013 11:53:44 -0000 1.14
+++ gdal.info 19 Jun 2013 03:48:11 -0000 1.15
@@ -2,19 +2,17 @@
# FIX: bring back mysql when packaged
# FIX: add libkml support... package libkml
-# FIX: Can we add any of these? LIBLZMA, xerces-c, GEORASTER, EPSILON,
PCRaster, NAS, DODS, DWG, Poppler, OpenCL
+# FIX: Can we add any of these? GEORASTER, EPSILON, PCRaster, NAS, DODS, DWG,
Poppler, OpenCL
Package: gdal%type_pkg[pgsql]
#Package: gdal%type_pkg[pgsql]%type_pkg[mysql]
Type: pgsql (. -pgsql)
#Type: pgsql (. -pgsql), mysql (. -mysql)
Version: 1.9.2
-Revision: 2
+Revision: 3
+
+Depends: %n-shlibs (= %v-%r)
-# Dependencies.
-Depends: <<
- %n-shlibs (= %v-%r)
-<<
Suggests: gdal-py27
Conflicts: gdal, gdal-pgsql
Replaces: gdal, gdal-pgsql
@@ -23,19 +21,27 @@
#Replaces: gdal, gdal-pgsql, gdal-mysql, gdal-pgsql-mysql
BuildDepends: <<
- libjpeg8, libjasper.1, libpng15, libtiff,
+ libjpeg9, libjasper.1, libpng16, libtiff5,
giflib,
- szip, libiconv-dev, cfitsio,
+ szip,
+ libiconv-dev,
+ cfitsio,
netcdf-c7, netcdf-bin,
libdap11,
proj,
libogdi3,
hdf5.8,
libgeos3.3.6,
+ libcurl4,
+ expat1,
+ libxml2,
+ libpcre1,
+ liblzma5,
+ xerces-c31-dev,
sqlite3-dev,
libspatialite1 (>= 2.3.1-4),
unixodbc2 | unixodbc2-nox,
- (%type_raw[pgsql] = -pgsql) postgresql90-dev (>= 1:0-0),
+ (%type_raw[pgsql] = -pgsql) postgresql92-dev (>= 1:0-0),
<<
# FIX: add these back in when available
@@ -44,51 +50,69 @@
Source: http://download.osgeo.org/gdal/gdal-%v.tar.gz
Source-MD5: 3f39db89f4710269b3a8bf94178e07aa
-SetCPPFLAGS: -Os -I%p/include
-#SetCPPFLAGS: -Os -I%b/port -I%b/gcore -I%b/alg -I%b/ogr -I%b/ogr/ogrsf_frmts
-I%b/ogr/ogrsf_frmts/gtiff -I%p/include
-SetLDFLAGS:
-
-# WARNING: Watch out for the geos dependency!
-
-ConfigureParams: --mandir='${prefix}/share/man' --with-local=%p --with-libz=%p
--with-grass=no --with-cfitsio=%p --with-pcraster=no --with-netcdf=%p
--with-png=%p --with-libtiff=%p --with-geotiff=internal --with-jpeg=%p
--with-ogdi=%p --with-fme=no --with-jasper=yes --with-ecw=no --with-kakadu=no
--with-mrsid=no --with-bsb --with-ogr --with-xerces=yes
--with-xerces-inc=%p/include --with-xerces-lib='-L%p/lib -lxerces-c -lpthread'
--with-hdf5=%p --with-hdf4=no --with-oci=no --with-dods-root=no
--with-geos=%p/opt/libgeos3.3.6/bin/geos-config --with-static-proj4=%p
(%type_raw[pgsql] = .) --without-pg (%type_raw[pgsql] = -pgsql)
--with-pg=%p/bin/pg_config --with-perl --without-php --without-ruby
--without-python --libdir=%p/lib --includedir=%p/include/gdal1 --without-perl
--with-sqlite3=%p --with-spatialite=%p --with-gif=%p --with-odbc=%p
-
+ConfigureParams: <<
+ --mandir='${prefix}/share/man' \
+ --with-local=%p \
+ --with-libz=%p \
+ --with-liblzma=yes \
+ --with-cfitsio=%p \
+ --with-netcdf=%p \
+ --with-png=%p \
+ --with-libtiff=%p \
+ --with-geotiff=internal \
+ --with-jpeg=%p \
+ --with-gif=%p \
+ --with-ogdi=%p \
+ --with-jasper=yes \
+ --with-bsb \
+ --with-ogr \
+ --with-xerces=yes --with-xerces-inc=%p/include --with-xerces-lib='-L%p/lib
-lxerces-c -lpthread' \
+ --with-hdf5=%p \
+ --with-geos=%p/opt/libgeos3.3.6/bin/geos-config \
+ --with-static-proj4=%p \
+ (%type_raw[pgsql] = .) --without-pg (%type_raw[pgsql] = -pgsql)
--with-pg=%p/bin/pg_config \
+ --libdir=%p/lib --includedir=%p/include/gdal1 \
+ --with-sqlite3=%p \
+ --with-spatialite=%p \
+ --with-odbc=%p \
+ --with-grass=no \
+ --with-pcraster=no \
+ --with-hdf4=no \
+ --with-oci=no \
+ --with-fme=no \
+ --with-ecw=no \
+ --with-kakadu=no \
+ --with-mrsid=no \
+ --with-dods-root=no \
+ --without-php --without-python --without-perl --without-ruby
+<<
# FIX: add these back when ready
# (%type_raw[mysql] = .) --with-mysql=no (%type_raw[mysql] = -mysql)
--with-mysql=yes
# --with-dods=%p
-
-CompileScript: <<
-#!/bin/sh -xe
- ./configure %c
- # (cd apps && perl -pi -e 's|gdaldem|gdalflattenmask\$\(EXE\)
gdaldem|' GNUmakefile)
- make -j 5
-<<
-
-# Why was this in the make line above?
-#PYTHON_INCLUDES=%p/include \
-# PYTHON_LIBS='-L%p/lib/python2.6' \
-# PYTHON=%p/bin/python2.6
-
-# Install Phase.
InstallScript: <<
- make install prefix=%i INST_LIB=%i/lib INST_INCLUDE=%i/include/gdal1
- make install-man prefix=%i
- install_name_tool -id "%p/lib/libgdal.1.dylib" %i/lib/libgdal.1.dylib
+ # make install prefix=%i INST_LIB=%i/lib INST_INCLUDE=%i/include/gdal1
+ # make install-man prefix=%i
+ # install_name_tool -id "%p/lib/libgdal.1.dylib" %i/lib/libgdal.1.dylib
+
+ make install DESTDIR=%d
+ make install-man DESTDIR=%d INST_MAN=%p/share/man
# The license file will be brought to %i/share/doc/%n by DocFiles
rm -f %i/share/gdal/LICENSE.TXT
<<
DocFiles: LICENSE.TXT
-
SplitOff: <<
Package: %N-shlibs
Description: GDAL/OGR shared libraries
- Conflicts: gdal-shlibs, gdal-pgsql-shlibs, gdal-mysql-shlibs,
gdal-pgsql-mysql-shlibs
- Replaces: gdal-shlibs, gdal-pgsql-shlibs, gdal-mysql-shlibs,
gdal-pgsql-mysql-shlibs
+ Conflicts: gdal-shlibs, gdal-pgsql-shlibs
+ #, gdal-mysql-shlibs, gdal-pgsql-mysql-shlibs
+ Replaces: gdal-shlibs, gdal-pgsql-shlibs
+ #, gdal-mysql-shlibs, gdal-pgsql-mysql-shlibs
Depends: <<
- libjpeg8-shlibs, libjasper.1-shlibs, libpng15-shlibs, libtiff-shlibs (>=
3.6.0),
+ libjpeg9-shlibs, libjasper.1-shlibs, libpng16-shlibs, libtiff5-shlibs,
giflib-shlibs,
szip-shlibs, libiconv,
netcdf-c7-shlibs,
@@ -98,15 +122,19 @@
libogdi3-shlibs,
libgeos3.3.6-shlibs,
sqlite3-shlibs,
+ libpcre1-shlibs,
+ libcurl4-shlibs,
+ expat1-shlibs,
+ libxml2-shlibs,
+ liblzma5-shlibs,
+ xerces-c31-shlibs,
libspatialite1-shlibs (>= 2.3.1-4),
unixodbc2-shlibs | unixodbc2-nox-shlibs,
- (%type_raw[pgsql] = -pgsql) postgis90,
- (%type_raw[pgsql] = -pgsql) postgresql90-shlibs,
+ (%type_raw[pgsql] = -pgsql) postgis91,
+ (%type_raw[pgsql] = -pgsql) postgresql92-shlibs,
<<
# FIX: add back when ready
-# giflib,
-# unixodbc2-shlibs | unixodbc2-nox-shlibs,
# (%type_raw[mysql] = -mysql) mysql-unified,
# (%type_raw[mysql] = -mysql) mysql-unified-shlibs,
@@ -115,10 +143,6 @@
DocFiles: LICENSE.TXT
<<
-# Unnecessary, right?
-# python26-shlibs
-
-
SplitOff2: <<
Package: %N-dev
Description: GDAL/OGR development headers
@@ -130,7 +154,6 @@
DocFiles: LICENSE.TXT
<<
-
DescPackaging: <<
Previous versions of this package were maintained by Matt Stephenson
<catt...@users.sourceforge.net>, Blair Zajac <bl...@orcaware.com>
@@ -138,9 +161,6 @@
See http://wiki.finkproject.org/index.php?title=Fink:Packaging:GIS
<<
-DescPort: <<
-<<
-
Description: Raster/Vector Geospatial Format Translator
License: BSD
Homepage: http://www.gdal.org
@@ -156,15 +176,14 @@
Geosoft GXF (read), Arc/Info Binary Grid (read), FITS (read/write),
netCDF (limited read/write), and GIF (read/write).
-The current version of GDAL come with the related OGR library (which lives
-within the GDAL source tree) provides a similar capability for simple features
-vector data.
-
-The OGR Simple Features Library is a C++ open source library (and commandline
-tools) providing read (and sometimes write) access to a variety of vector file
-formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, and
-Mapinfo mid/mif and TAB formats.
+GDAL come with the related OGR library (which lives within the GDAL
+source tree) provides a similar capability for simple features vector
+data. The OGR Simple Features Library is a C++ open source library
+(and commandline tools) providing read (and sometimes write) access to
+a variety of vector file formats including ESRI Shapefiles, S-57,
+SDTS, PostGIS, Oracle Spatial, and Mapinfo mid/mif and TAB formats.
<<
+
DescUsage: <<
Packages that need GDAL/OGR libraries should builddepend on gdal-dev and
depend on gdal-shlibs. Make sure that configure finds the gdal-config
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
