Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19338

Modified Files:
        gdal.info 
Log Message:
should support both hdf4 and hdf5 at the same time now


Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gdal.info   23 Mar 2008 22:06:49 -0000      1.16
+++ gdal.info   27 Mar 2008 11:12:58 -0000      1.17
@@ -1,7 +1,7 @@
 Info2: <<
 Package: gdal
 Version: 1.5.1
-Revision: 1001
+Revision: 1002
 Distribution: 10.4, 10.5
 Description: Raster/Vector Geospatial Format Translator
 License: BSD
@@ -41,9 +41,10 @@
        libdap6-shlibs
        ,libjasper.1-shlibs
        ,hdf5-shlibs
+       ,hdf
 <<
 
-#      ,hdf
+#      
 #      postgresql83,
 
 
@@ -67,9 +68,9 @@
        proj, szip,
        libdap6
        ,libjasper.1
+       ,hdf
 <<
 
-#      ,hdf
 
 
 Conflicts: gdal-nopgsql
@@ -80,8 +81,7 @@
 Source: mirror:custom:%n-%v.tar.gz
 Source-MD5: 76b53917142c5e9ad2d0ac20fb99890b
 
-# FIX: remove when released
-#SourceDirectory: gdal-1.5.1
+PatchScript: perl -pi -e 's;-no-undefined;$& -Wl,-m;' GNUmakefile
 
 CustomMirror: <<
   nam-US: http://www.gdal.org/dl
@@ -90,9 +90,8 @@
 
 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
 
-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-gif=%p --with-ogdi=%p --with-fme=no  --with-jasper=yes --with-ecw=no 
--with-kakadu=no --with-mrsid=no --with-bsb --with-ogr 
--with-pg=%p/bin/pg_config --with-mysql=no --with-xerces 
--with-xerces-inc=%p/include --with-xerces-lib='-L%p/lib -lxerces-c -lpthread' 
--with-odbc=%p --with-oci=no --with-dods-root=no --with-sqlite=%p 
--with-geos=%p/bin/geos-config --with-static-proj4=%p --without-perl 
--without-php --without-ruby --without-python --with-dods=%p  --with-hdf5=%p 
--includedir=%p/include/gdal1
+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-gif=%p --with-ogdi=%p --with-fme=no  --with-jasper=yes --with-ecw=no 
--with-kakadu=no --with-mrsid=no --with-bsb --with-ogr 
--with-pg=%p/bin/pg_config --with-mysql=no --with-xerces 
--with-xerces-inc=%p/include --with-xerces-lib='-L%p/lib -lxerces-c -lpthread' 
--with-odbc=%p --with-oci=no --with-dods-root=no --with-sqlite=%p 
--with-geos=%p/bin/geos-config --with-static-proj4=%p --without-perl 
--without-php --without-ruby --without-python --with-dods=%p  --with-hdf5=%p 
--includedir=%p/include/gdal1 --with-hdf4=%p 
 
-# cause trouble: --with-hdf4=%p 
 
 CompileScript: <<
 #!/bin/sh -xe
@@ -130,20 +129,17 @@
     libogdi3-shlibs, sqlite3-shlibs
   <<
   Files: lib/libgdal.*.dylib
-  Shlibs: %p/lib/libgdal.1.dylib 14.0.0 %n (>= 1.4.0-1000)
+  Shlibs: %p/lib/libgdal.1.dylib 14.0.0 %n (>= 1.5.1-1002)
   DocFiles: NEWS
 <<
 SplitOff2: <<
   Package: %N-dev
   Description: GDAL/OGR development headers
-#  Replaces: %N (<< %v-%r), gdal-dev, gdal-nopgsql-dev
-#  Conflicts: %N (<< %v-%r), gdal-dev, gdal-nopgsql-dev
   Replaces: %N (<< %v-%r), gdal-nopgsql-dev
   Conflicts: %N (<< %v-%r), gdal-nopgsql-dev
   Depends: %N-shlibs (= %v-%r)
   BuildDependsOnly: true
   Files: bin/gdal-config include/gdal1 lib/*.a lib/*.la lib/libgdal.dylib 
-#share/man/man1/gdal-config.1
   DocFiles: NEWS
 <<
 
@@ -151,6 +147,8 @@
 
 As of 1.5.0, the patch is no longer needed
 
+Jean-Francois Mertens submitted a patch to allow hdf4 and hdf5
+
 Previous versions of this package were maintained by Matt Stephenson
 <[EMAIL PROTECTED]>, Blair Zajac <[EMAIL PROTECTED]>
 and BABA Yoshihiko <[EMAIL PROTECTED]>.


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to