Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26156
Modified Files:
gdal.info
Log Message:
user feedback from foss4g tokyo
Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gdal.info 16 Apr 2009 12:38:01 -0000 1.7
+++ gdal.info 13 Nov 2010 02:10:08 -0000 1.8
@@ -1,8 +1,8 @@
-Info2: <<
-Package: gdal
-Version: 1.4.2
-Revision: 1001
-Distribution: 10.4
+Info3: <<
+Package: gdal%type_pkg[pgsql]%type_pkg[mysql]
+Type: pgsql (. -pgsql), mysql (. -mysql)
+Version: 1.7.2
+Revision: 4
Description: Raster/Vector Geospatial Format Translator
License: BSD
Homepage: http://www.gdal.org
@@ -36,162 +36,124 @@
# Dependencies.
Depends: <<
- %n-shlibs (= %v-%r),
- postgresql82,
- postgis82,
- libdap3-shlibs
+ %n-shlibs (= %v-%r)
<<
-
-Suggests: gdal-python-py23, gdal-grass
-
+Suggests: gdal-py26, gdal-grass
+Conflicts: gdal, gdal-pgsql, gdal-mysql, gdal-pgsql-mysql
+Replaces: gdal, gdal-pgsql, gdal-mysql, gdal-pgsql-mysql
BuildDepends: <<
- fink (>= 0.24.12),
- libjpeg,
- giflib,
- lesstiff | libtiff,
- libpng3,
+ libjpeg8, libjasper.1, giflib | libungif, libpng14, libtiff,
+ szip, libiconv-dev, cfitsio,
netcdf, netcdf-bin,
unixodbc2 | unixodbc2-nox,
- libiconv-dev, cfitsio,
+ libdap9,
+ proj,
libogdi3,
hdf5,
- xerces-c-dev,
- sqlite3-dev,
- libgeos2,
- postgresql82-dev,
- postgis82,
- proj, szip,
- libdap3
+ libgeos3.2.2 (>= 3.2.2-1),
+ sqlite3-dev,
+ libspatialite1 (>= 2.3.1-4),
+ (%type_raw[mysql] = -mysql) mysql-unified-dev,
+ (%type_raw[pgsql] = -pgsql) postgresql84-dev,
<<
+BuildConflicts: hdf
+# python26 - Why was python in here?
+# xerces-c is broken for x86_64
+# xerces-c-dev,
-#Conflicts: gdal, gdal-nopgsql, gdal-dev
-Conflicts: gdal-nopgsql
-#Replaces: gdal, gdal-nopgsql
-Replaces: gdal-nopgsql
-BuildConflicts: gdal-dev (<< %v)
# Unpack Phase.
-Source: mirror:custom:%n-%v.tar.gz
-Source-MD5: dedf5ff6a766e85b9a2b5c54c1c59221
-CustomMirror: <<
- nam-US: http://www.gdal.org/dl
- nam-US: ftp://ftp.remotesensing.org/gdal
-<<
+Source: http://download.osgeo.org/gdal/gdal-%v.tar.gz
+Source-MD5: 05351f8cb61761ae579667e24a297fe6
-# Patch Phase.
-PatchFile: gdal.patch
-PatchFile-MD5: 1102f0047efb287941dfdc2927f0b9a3
-PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+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:
-# Compile Phase.
-#GCC: 3.3
+# WARNING: Watch out for the geos dependency!
-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-xerces=yes
--with-xerces-inc=%p/include --with-xerces-lib='-L%p/lib -lxerces-c -lpthread'
--with-hdf5=%p --with-hdf4=no --with-odbc=%p --with-oci=no --with-dods-root=no
--with-geos=%p/opt/libgeos3.2.2/bin/geos-config --with-static-proj4=%p
(%type_raw[pgsql] = .) --without-pg (%type_raw[pgsql] = -pgsql)
--with-pg=%p/bin/pg_config (%type_raw[mysql] = .) --with-mysql=no
(%type_raw[mysql] = -mysql) --with-mysql=yes --with-perl --without-php
--without-ruby --without-python --libdir=%p/lib --includedir=%p/include/gdal1
--without-perl --with-sqlite3=%p --with-spatialite=%p
+
+# --with-dods=%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-gif=%p --with-ogdi=%p --with-fme=no --without-hdf4 --with-hdf5=%p
--with-jasper=no --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
CompileScript: <<
#!/bin/sh -xe
-
- touch missing
- ./configure %c
- rm missing
-
- make OGDI_INCLUDE=''
+ ./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_INCLUDE=%i/include/gdal1
+ 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
+
+ # The license file will be brought to %i/share/doc/%n by DocFiles
+ rm -f %i/share/gdal/LICENSE.TXT
<<
+DocFiles: LICENSE.TXT
+
-DocFiles: LICENSE NEWS
SplitOff: <<
Package: %N-shlibs
Description: GDAL/OGR shared libraries
- #Replaces: %N (<< %v-%r), gdal-shlibs, gdal-nopgsql-shlibs
- #Conflicts: %N (<< %v-%r), gdal-shlibs, gdal-nopgsql-shlibs
- Replaces: %N (<< %v-%r), gdal-nopgsql-shlibs
- Conflicts: %N (<< %v-%r), gdal-nopgsql-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: <<
- giflib-shlibs, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs (>= 3.6.0),
netcdf-shlibs,
- proj-shlibs, libgeos2-shlibs,
+ libjpeg8-shlibs, libjasper.1-shlibs, giflib-shlibs | libungif-shlibs,
libpng14-shlibs, libtiff-shlibs (>= 3.6.0),
+ szip-shlibs, libiconv,
+ netcdf-shlibs,
+ hdf5-shlibs,
unixodbc2-shlibs | unixodbc2-nox-shlibs,
- postgresql82-shlibs (>=8.0.2-12),
- postgis82,
- szip-shlibs, libiconv, xerces-c-shlibs, hdf5-shlibs,
- libogdi3-shlibs, sqlite3-shlibs
+ libdap9-shlibs,
+ proj-shlibs,
+ libogdi3-shlibs,
+ libgeos3.2.2-shlibs (>= 3.2.2-1),
+ sqlite3-shlibs,
+ libspatialite1-shlibs (>= 2.3.1-4),
+ (%type_raw[mysql] = -mysql) mysql-unified,
+ (%type_raw[mysql] = -mysql) mysql-unified-shlibs,
+ (%type_raw[pgsql] = -pgsql) postgis84,
+ (%type_raw[pgsql] = -pgsql) postgresql84-shlibs,
<<
Files: lib/libgdal.*.dylib
- Shlibs: %p/lib/libgdal.1.dylib 13.0.0 %n (>= 1.4.0-1000)
- DocFiles: LICENSE NEWS
+ Shlibs: %p/lib/libgdal.1.dylib 16.0.0 %n (>= 1.7.0-1)
+ DocFiles: LICENSE.TXT
<<
+
+# Unnecessary, right?
+# python26-shlibs
+
+
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
+ Conflicts: gdal-dev, gdal-pgsql-dev, gdal-mysql-dev, gdal-pgsql-mysql-dev
+ Replaces: gdal-dev, gdal-pgsql-dev, gdal-mysql-dev, gdal-pgsql-mysql-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: LICENSE NEWS
+ Files: bin/gdal-config include/gdal1 lib/*.a lib/*.la lib/libgdal.dylib
+ DocFiles: LICENSE.TXT
<<
-DescPackaging: <<
-Patch file does the following:
- 1. add LICENSE.
- 2. install header files in %p/include/gdal1.
- 3. change the order of include directories not to read header files of
- older GDAL package.
+DescPackaging: <<
Previous versions of this package were maintained by Matt Stephenson
<[email protected]>, Blair Zajac <[email protected]>
and BABA Yoshihiko <[email protected]>.
+See http://wiki.finkproject.org/index.php?title=Fink:Packaging:GIS
<<
DescPort: <<
-1.3 conflicts with the gdal headers of older versions. gdal.patch
-solves this problem by changing the include orders. For future
-versions, gdal13 headers will be in %p/include/gdal13 and so on. (This
-has not happened. Still include/gdal1. -kurt 12/2006)
-
-1.3 adds HDF-5 support.
-
-1.2.6-5 fixes gdal-config and adds Xerces and SQLite supports.
-1.2.6-4 for Python support (see gdal-python-py23)
---with-geos is enabled since 1.2.6-1.
-
-The large number of gdal include files are moved into %p/include
-subdirectory and gdal-config has been patched to have the correct
-include file path.
-
-Uses -Os, otherwise it compiles with no optimization.
-
-Uses --with-local=%p in ConfigureParams to have -I%p/include and
--L%p/lib be used in compiling this package. But even with this set,
-not all files are compiled with -I%p/include and so this is put in
-SetCFLAGS and SetCXXFLAGS.
-
-Uses --with-static-proj4=%p in ConfigureParams, but libproj still ends
-up linking dynamically.
-
-Uses --with-hdf4=no in ConfigureParams to avoid a compile error in
-EHapi.c.
-
-Franks Warmerdam says using the "internal" settings should not be
-necessary, as the libs are tested to see if they are compatible.
-
-As of 1.3.2, removing the Conflict with itself since that -dev was
-only able to be installed at the same time as gdal{,-shlibs}
-
-TODO:
-
-There are lots of other formats/libs that could be enabled, but have
-not yet been tried.
<<
-# End of Info2
+# End of Info3
<<
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
