Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18337/libs
Modified Files:
gdal.info
Log Message:
Dependency revised
Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdal.info 23 May 2005 23:03:36 -0000 1.6
+++ gdal.info 28 May 2005 13:47:56 -0000 1.7
@@ -1,8 +1,8 @@
Info2: <<
Package: gdal%type_pkg[-nopgsql]
-Type: -nopgsql (boolean)
+Type: -nopgsql (boolean), -grass (boolean)
Version: 1.2.6
-Revision: 2
+Revision: 3
Description: Raster/Vector Geospatial Format Translator
License: BSD
Homepage: http://www.gdal.org
@@ -30,21 +30,23 @@
# Dependencies.
Depends: <<
- %N-shlibs (= %v-%r),
+ gdal-shlibs (= %v-%r) | gdal-nopgsql-shlibs (= %v-%r),
giflib | libungif, libjpeg, libpng3, libtiff (>= 3.6.0), netcdf,
proj, libgeos2-shlibs,
unixodbc2 | unixodbc2-nox,
- (%type_raw[-nopgsql] = .) postgresql80-shlibs (>= 8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-shlibs (>= 8.0.2-13)
+ (%type_raw[-nopgsql] = .) postgresql80 (>= 8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl (>= 8.0.2-13),
+ (%type_raw[-grass] = -grass) grass60 | (%type_raw[-grass] = -grass)
grass60-nopgsql | (%type_raw[-grass] = -grass) grass60-nogdal |
(%type_raw[-grass] = -grass) grass60-nopgsql-nogdal
<<
BuildDepends: <<
libiconv-dev, cfitsio,
libgeos2,
- (%type_raw[-nopgsql] = .) postgresql80-dev (>= 8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-dev (>= 8.0.2-13)
+ (%type_raw[-nopgsql] = .) postgresql80-dev (>= 8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-dev (>= 8.0.2-13),
+ (%type_raw[-grass] = -grass) grass60-dev | (%type_raw[-grass] = -grass)
grass60-nopgsql-dev | (%type_raw[-grass] = -grass) grass60-nogdal-dev |
(%type_raw[-grass] = -grass) grass60-nopgsql-nogdal-dev
<<
-Conflicts: gdal, gdal-nopgsql, gdal-grass, gdal-nopgsql-grass, gdal-ssl
-Replaces: gdal, gdal-nopgsql, gdal-grass, gdal-nopgsql-grass, gdal-ssl
+Conflicts: gdal, gdal-nopgsql, gdal-ssl
+Replaces: gdal, gdal-nopgsql, gdal-ssl
# Unpack Phase.
Source: mirror:custom:gdal-%v.tar.gz
@@ -60,14 +62,15 @@
# Compile Phase.
GCC: 3.3
-SetCFLAGS: -Os -I%p/include -I%p/include/grass60
-SetCXXFLAGS: -Os -I%p/include -I%p/include/grass60
-SetCPPFLAGS: -Os -I%p/include -I%p/include/grass60
-SetLDFLAGS: -L%p/lib/grass60
-ConfigureParams: --mandir='${prefix}/share/man' --with-local=%p
--with-grass=no --without-python --with-geotiff=internal --with-hdf4=no
--without-ogdi (%type_raw[-nopgsql] = -nopgsql) --without-pg
(%type_raw[-nopgsql] = .) --with-pg=%p/bin/pg_config --without-mysql
--with-geos --with-static-proj4=%p
+SetCFLAGS: -Os -I%p/include -I%p/include/grass-6.0
+SetCXXFLAGS: -Os -I%p/include -I%p/include/grass-6.0
+SetCPPFLAGS: -Os -I%p/include -I%p/include/grass-6.0
+SetLDFLAGS: -L%p/lib/grass-6.0
+SetLIBRARY_PATH: %p/lib/grass-6.0
+SetDYLD_LIBRARY_PATH: %p/lib/grass-6.0
+ConfigureParams: --mandir='${prefix}/share/man' --with-local=%p
(%type_raw[-grass] = -grass) --with-grass=%p (%type_raw[-grass] = -grass)
--with-libgrass=%p/lib/grass-6.0 (%type_raw[-grass] = .) --with-grass=no
--without-python --with-geotiff=internal --with-hdf4=no --without-ogdi
(%type_raw[-nopgsql] = -nopgsql) --without-pg (%type_raw[-nopgsql] = .)
--with-pg=%p/bin/pg_config --without-mysql --with-geos --with-static-proj4=%p
CompileScript: <<
#!/bin/sh -xe
-
./configure %c
make
<<
@@ -78,13 +81,14 @@
DocFiles: ChangeLog LICENSE NEWS
SplitOff: <<
Package: %N-shlibs
- Replaces: %N (<< 1.2.1-11), gdal-shlibs, gdal-nopgsql-shlibs, gdal-ssl-shlibs
- Conflicts: %N (<< 1.2.1-11), gdal-shlibs, gdal-nopgsql-shlibs,
gdal-ssl-shlibs
+ Replaces: %N (<< 1.2.1-11), gdal-shlibs, gdal-nopgsql-shlibs
+ Conflicts: %N (<< 1.2.1-11), gdal-shlibs, gdal-nopgsql-shlibs
Depends: <<
giflib-shlibs | libungif-shlibs, libjpeg-shlibs, libpng3-shlibs,
libtiff-shlibs (>= 3.6.0), netcdf-shlibs,
proj-shlibs, libgeos2-shlibs,
unixodbc2-shlibs | unixodbc2-nox-shlibs,
- (%type_raw[-nopgsql] = .) postgresql80-shlibs (>=8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-shlibs (>=8.0.2-13)
+ (%type_raw[-nopgsql] = .) postgresql80 (>=8.0.2-12) | (%type_raw[-nopgsql]
= .) postgresql80-ssl (>=8.0.2-12),
+ (%type_raw[-grass] = -grass) grass60 | (%type_raw[-grass] = -grass)
grass60-nopgsql | (%type_raw[-grass] = -grass) grass60-nogdal |
(%type_raw[-grass] = -grass) grass60-nopgsql-nogdal
<<
Files: lib/libgdal.*.dylib
Shlibs: %p/lib/libgdal.1.dylib 9.0.0 %n (>= 1.2.6-2)
@@ -92,9 +96,9 @@
<<
SplitOff2: <<
Package: %N-dev
- Replaces: %N (<< 1.2.1-11), gdal-dev, gdal-nopgsql-dev, gdal-ssl-dev
- Conflicts: %N (<< 1.2.1-11), gdal-dev, gdal-nopgsql-dev, gdal-ssl-dev
- Depends: %N-shlibs (= %v-%r)
+ Replaces: %N (<< 1.2.1-11), gdal-dev, gdal-nopgsql-dev
+ Conflicts: %N (<< 1.2.1-11), gdal-dev, gdal-nopgsql-dev
+ Depends: %N-shlibs (= %v-%r) | %N-grass-shlibs
BuildDependsOnly: true
Files: bin/gdal-config include lib/*.a lib/*.la lib/libgdal.dylib
share/man/man1/gdal-config.1
DocFiles: ChangeLog LICENSE NEWS
@@ -107,11 +111,6 @@
DescPort: <<
---with-grass is planned to be conditional in the next revision. gdal-grass
-will have this option enabled. If you want grass support, of course you will
-need grass, but grass can also depend on gdal. To build gdal-grass, first
-build gdal and grass with gdal support, then build gdal-grass.
-
--with-geos is enabled since 1.2.6-1.
The large number of gdal include files are moved into their own
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
