Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1028

Modified Files:
        gdal.info 
Log Message:
hdf5.8 update from Remko.  switch libgoes from 3.3.3 to 3.3.6
cleaned up formatting weirdness with ^I characters


Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gdal.info   26 Jan 2013 21:33:48 -0000      1.13
+++ gdal.info   30 May 2013 11:53:44 -0000      1.14
@@ -9,7 +9,7 @@
 Type: pgsql (. -pgsql)
 #Type: pgsql (. -pgsql), mysql (. -mysql)
 Version: 1.9.2
-Revision: 1
+Revision: 2
 
 # Dependencies.
 Depends: <<
@@ -23,23 +23,23 @@
 #Replaces: gdal, gdal-pgsql, gdal-mysql, gdal-pgsql-mysql
 
 BuildDepends: <<
-       libjpeg8, libjasper.1, libpng15, libtiff,
-        giflib,
-       szip, libiconv-dev, cfitsio, 
-       netcdf-c7, netcdf-bin,
-       libdap11,
-       proj,
-       libogdi3,
-       hdf5.7, 
-       libgeos3.3.3,
-        sqlite3-dev,
-        libspatialite1 (>= 2.3.1-4),
-       unixodbc2 | unixodbc2-nox,
-       (%type_raw[pgsql] = -pgsql) postgresql90-dev (>= 1:0-0),
+  libjpeg8, libjasper.1, libpng15, libtiff,
+  giflib,
+  szip, libiconv-dev, cfitsio, 
+  netcdf-c7, netcdf-bin,
+  libdap11,
+  proj,
+  libogdi3,
+  hdf5.8, 
+  libgeos3.3.6,
+  sqlite3-dev,
+  libspatialite1 (>= 2.3.1-4),
+  unixodbc2 | unixodbc2-nox,
+  (%type_raw[pgsql] = -pgsql) postgresql90-dev (>= 1:0-0),
 <<
 
 # FIX: add these back in when available
-       # (%type_raw[mysql] = -mysql) mysql-unified-dev,
+# (%type_raw[mysql] = -mysql) mysql-unified-dev,
 
 Source: http://download.osgeo.org/gdal/gdal-%v.tar.gz
 Source-MD5: 3f39db89f4710269b3a8bf94178e07aa
@@ -50,7 +50,8 @@
 
 # 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.3/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-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 
+
 
 # FIX: add these back when ready
 # (%type_raw[mysql] = .) --with-mysql=no (%type_raw[mysql] = -mysql) 
--with-mysql=yes
@@ -59,15 +60,15 @@
 
 CompileScript: <<
 #!/bin/sh -xe
-       ./configure %c
+  ./configure %c
         # (cd apps && perl -pi -e 's|gdaldem|gdalflattenmask\$\(EXE\) 
gdaldem|' GNUmakefile)
-       make -j 5
+  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
+#    PYTHON_LIBS='-L%p/lib/python2.6' \
+#    PYTHON=%p/bin/python2.6
 
 # Install Phase.
 InstallScript: <<
@@ -91,11 +92,11 @@
     giflib-shlibs,
     szip-shlibs, libiconv,
     netcdf-c7-shlibs, 
-    hdf5.7-shlibs, 
+    hdf5.8-shlibs, 
     libdap11-shlibs,
     proj-shlibs, 
     libogdi3-shlibs,
-    libgeos3.3.3-shlibs,
+    libgeos3.3.6-shlibs,
     sqlite3-shlibs,
     libspatialite1-shlibs (>= 2.3.1-4),
     unixodbc2-shlibs | unixodbc2-nox-shlibs,


------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to