Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21591/10.3/unstable/main/finkinfo/libs
Modified Files:
gdal-python-py.info gdal.info gdal.patch
Added Files:
gdal-grass.info gdal-grass.patch
Log Message:
new upstream version
Index: gdal.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gdal.patch 29 Jun 2004 08:43:40 -0000 1.2
+++ gdal.patch 21 Dec 2005 03:31:33 -0000 1.3
@@ -1,6 +1,6 @@
-diff -ruN gdal-1.2.1-orig/LICENSE gdal-1.2.1/LICENSE
---- gdal-1.2.1-orig/LICENSE Wed Dec 31 16:00:00 1969
-+++ gdal-1.2.1/LICENSE Sat Jan 4 00:59:00 2003
+diff -ruN gdal-1.3.1/LICENSE gdal-1.3.1-new/LICENSE
+--- gdal-1.3.1/LICENSE 1970-01-01 09:00:00.000000000 +0900
++++ gdal-1.3.1-new/LICENSE 2005-10-10 14:05:13.000000000 +0900
@@ -0,0 +1,19 @@
+Copyright (c) 2000, Frank Warmerdam
+
@@ -21,14 +21,36 @@
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
---- gdal-1.2.1/apps/GNUmakefile.orig 2004-04-02 09:33:27.000000000 -0800
-+++ gdal-1.2.1/apps/GNUmakefile 2004-06-25 09:59:25.000000000 -0700
-@@ -76,7 +76,7 @@
+diff -ruN gdal-1.3.1/apps/GNUmakefile gdal-1.3.1-new/apps/GNUmakefile
+--- gdal-1.3.1/apps/GNUmakefile 2005-05-12 16:10:00.000000000 +0900
++++ gdal-1.3.1-new/apps/GNUmakefile 2005-10-10 14:07:16.000000000 +0900
+@@ -67,7 +67,7 @@
+ echo 'CONFIG_LIBS="$(CONFIG_LIBS)"' >> gdal-config
+ echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> gdal-config
+ echo 'CONFIG_PREFIX="$(GDAL_ROOT)"' >> gdal-config
+- echo 'CONFIG_CFLAGS="-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore
-I$(GDAL_ROOT)/alg -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts"' >>
gdal-config
++ echo 'CONFIG_CFLAGS="[EMAIL PROTECTED]@/include/gdal1"' >> gdal-config
+ echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config
+ echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config
+ echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config
+@@ -80,7 +80,7 @@
echo 'CONFIG_LIBS="$(CONFIG_LIBS_INS)"' >> gdal-config-inst
echo 'CONFIG_DEP_LIBS="$(LIBS)"' >> gdal-config-inst
echo 'CONFIG_PREFIX="$(INST_PREFIX)"' >> gdal-config-inst
- echo 'CONFIG_CFLAGS="-I$(INST_INCLUDE)"' >> gdal-config-inst
-+ echo 'CONFIG_CFLAGS="-I$(INST_INCLUDE)/gdal1"' >> gdal-config-inst
++ echo 'CONFIG_CFLAGS="[EMAIL PROTECTED]@/include/gdal1"' >>
gdal-config-inst
echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config-inst
echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config-inst
echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config-inst
+diff -ruN gdal-1.3.1/frmts/ogdi/GNUmakefile
gdal-1.3.1-new/frmts/ogdi/GNUmakefile
+--- gdal-1.3.1/frmts/ogdi/GNUmakefile 2003-12-16 20:18:56.000000000 +0900
++++ gdal-1.3.1-new/frmts/ogdi/GNUmakefile 2005-10-10 14:08:49.000000000
+0900
+@@ -4,7 +4,7 @@
+
+ OBJ = ogdidataset.o
+
+-CPPFLAGS := $(GDAL_INCLUDE) $(OGDI_INCLUDE) $(CPPFLAGS)
++CPPFLAGS := $(CPPFLAGS) $(GDAL_INCLUDE) $(OGDI_INCLUDE)
+
+ default: $(OBJ)
+
Index: gdal-python-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal-python-py.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdal-python-py.info 15 Nov 2005 22:48:27 -0000 1.5
+++ gdal-python-py.info 21 Dec 2005 03:31:32 -0000 1.6
@@ -1,19 +1,16 @@
Info2: <<
Package: gdal-python-py%type_pkg[python]
Type: python(2.4 2.3)
-Version: 1.2.6
-Revision: 6
+Version: 1.3.1
+Revision: 1
Description: GDAL Python Module
License: BSD
Homepage: http://www.gdal.org
Maintainer: BABA Yoshihiko <[EMAIL PROTECTED]>
-DescDetail: <<
-
-<<
# Dependencies.
Depends: <<
- gdal-shlibs (>=1.2.6-5) | gdal-nopgsql-shlibs (>=1.2.6-5) ,
+ gdal-shlibs (=%v-%r),
postgresql80 (>= 8.0.2-13) | postgresql80-ssl (>= 8.0.2-13),
(%type_raw[python] = 2.4) python%type_pkg[python],
python%type_pkg[python]-shlibs, numeric-py%type_pkg[python]
<<
@@ -30,11 +27,11 @@
# Unpack Phase.
Source: mirror:custom:gdal-%v.tar.gz
-Source-MD5: 410e581874ce2b94bfa00deb9f2087f6
+Source-MD5: 7ff1ceff745ee011793e1f860c02c172
CustomMirror: <<
nam-US: http://www.gdal.org/dl
nam-US: ftp://ftp.remotesensing.org/gdal
- nam-CA: http://gdal.maptools.org/dl
+ nam-CA: http://dl.maptools.org/gdal/dl
<<
# Patch Phase.
@@ -42,10 +39,12 @@
# Compile Phase.
GCC: 3.3
-SetCFLAGS: -Os -I%p/include
-SetCXXFLAGS: -Os -I%p/include
-SetCPPFLAGS: -Os -I%p/include
-ConfigureParams: --mandir='${prefix}/share/man' --with-local=%p
--with-grass=no --with-python --with-geotiff=internal --with-hdf4=no
--with-ogdi --with-pg=%p/bin/pg_config --without-mysql --with-geos
--with-static-proj4=%p
+
+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-grass=no --with-python --with-geotiff=internal --with-hdf4=no
--with-ogdi --with-pg=%p/bin/pg_config --without-mysql --with-geos
--with-static-proj4=%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 --with-python
+
CompileScript: <<
#!/bin/sh -xe
--- NEW FILE: gdal-grass.patch ---
diff -ruN gdal-grass-1.3.1/ogrgrass.h gdal-grass-1.3.1-new/ogrgrass.h
--- gdal-grass-1.3.1/ogrgrass.h 2005-10-01 06:11:26.000000000 +0900
+++ gdal-grass-1.3.1-new/ogrgrass.h 2005-10-10 15:01:01.000000000 +0900
@@ -40,10 +40,10 @@
#include "ogrsf_frmts.h"
extern "C" {
- #include <grass/gprojects.h>
- #include <grass/gis.h>
- #include <grass/dbmi.h>
- #include <grass/Vect.h>
+ #include <gprojects.h>
+ #include <gis.h>
+ #include <dbmi.h>
+ #include <Vect.h>
}
/************************************************************************/
Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gdal.info 14 Aug 2005 11:29:58 -0000 1.8
+++ gdal.info 21 Dec 2005 03:31:32 -0000 1.9
@@ -1,8 +1,7 @@
Info2: <<
-Package: gdal%type_pkg[-nopgsql]
-Type: -nopgsql (boolean), -grass (boolean)
-Version: 1.2.6
-Revision: 5
+Package: gdal
+Version: 1.3.1
+Revision: 1
Description: Raster/Vector Geospatial Format Translator
License: BSD
Homepage: http://www.gdal.org
@@ -27,97 +26,129 @@
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
+script in %p/bin, which tells that the headers are
+in %p/include/gdal1/ and the libraries are in %p/lib/.
+<<
# Dependencies.
Depends: <<
- gdal-shlibs (= %v-%r) | gdal-nopgsql-shlibs (= %v-%r),
- giflib | libungif, libjpeg, libpng3, libtiff (>= 3.6.0), netcdf,
- proj, libgeos2-shlibs,
- libogdi3-shlibs,
- unixodbc2 | unixodbc2-nox,
- (%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
+ %n-shlibs (= %v-%r),
+ postgresql80 (>= 8.0.2-13) | postgresql80-ssl (>= 8.0.2-13)
<<
+Suggests: gdal-python-py23, gdal-grass
BuildDepends: <<
+ libjpeg,
+ giflib | libungif,
+ lesstiff | libtiff,
+ libpng3,
+ netcdf, netcdf-bin,
+ unixodbc2 | unixodbc2-nox,
libiconv-dev, cfitsio,
+ libogdi3,
+ hdf5,
+ xerces-c-dev,
+ sqlite3-dev,
libgeos2,
- libogdi3,
- (%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
+ postgresql80-dev (>= 8.0.2-13) | postgresql80-ssl-dev (>= 8.0.2-13)
<<
-Conflicts: gdal, gdal-nopgsql, gdal-ssl
-Replaces: gdal, gdal-nopgsql, gdal-ssl
+Conflicts: gdal, gdal-nopgsql, gdal-ssl, gdal-grass
+Replaces: gdal, gdal-nopgsql, gdal-ssl, gdal-grass
+#BuildConflicts: gdal-dev (<< %v)
# Unpack Phase.
Source: mirror:custom:gdal-%v.tar.gz
-Source-MD5: 410e581874ce2b94bfa00deb9f2087f6
+Source-MD5: 7ff1ceff745ee011793e1f860c02c172
CustomMirror: <<
nam-US: http://www.gdal.org/dl
nam-US: ftp://ftp.remotesensing.org/gdal
- nam-US: http://gdal.maptools.org/dl
+ nam-US: http://dl.maptools.org/gdal/dl
<<
# Patch Phase.
-Patch: gdal.patch
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/gdal.patch | patch -p1
# Compile Phase.
-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 --with-ogdi=%p
(%type_raw[-nopgsql] = -nopgsql) --without-pg (%type_raw[-nopgsql] = .)
--with-pg=%p/bin/pg_config --without-mysql --with-geos --with-static-proj4=%p
+GCC: 3.3
+
+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: -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 --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
+
CompileScript: <<
#!/bin/sh -xe
+
+ touch missing
./configure %c
- make
+ rm missing
+
+ make OGDI_INCLUDE=''
<<
# Install Phase.
-InstallScript: make install prefix=%i
+InstallScript: <<
+ make install prefix=%i INST_INCLUDE=%i/include/gdal1
+<<
DocFiles: ChangeLog LICENSE NEWS
SplitOff: <<
Package: %N-shlibs
+ Description: GDAL/OGR shared libraries
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 (>=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
+ postgresql80-shlibs (>=8.0.2-12) | postgresql80-ssl-shlibs (>=8.0.2-12)
<<
Files: lib/libgdal.*.dylib
- Shlibs: %p/lib/libgdal.1.dylib 9.0.0 %n (>= 1.2.6-2)
+ Shlibs: %p/lib/libgdal.1.dylib 11.0.0 %n (>= 1.2.6-2)
DocFiles: ChangeLog LICENSE NEWS
<<
SplitOff2: <<
Package: %N-dev
+ Description: GDAL/OGR development headers
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
+ Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
- Files: bin/gdal-config include lib/*.a lib/*.la lib/libgdal.dylib
share/man/man1/gdal-config.1
+ Files: bin/gdal-config include/gdal1 lib/*.a lib/*.la lib/libgdal.dylib
share/man/man1/gdal-config.1
DocFiles: ChangeLog LICENSE NEWS
<<
DescPackaging: <<
---with-ogdi is enabled since 1.2.6-5.
-Python support is added since 1.2.6-4 as another package.
---with-geos is enabled since 1.2.6-1.
+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.
Previous versions of this package were maintained by Matt Stephenson
<[EMAIL PROTECTED]> and Blair Zajac <[EMAIL PROTECTED]>.
<<
DescPort: <<
-The large number of gdal include files are moved into their own
-subdirectory and gdal-conf has been patched to have the correct
-include file path. - Now successfully builds without this patch, though.
+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.
+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.
--- NEW FILE: gdal-grass.info ---
Info2: <<
Package: gdal-grass
Version: 1.3.1
Revision: 1
Description: GRASS plug-in for GDAL/OGR
License: BSD
Homepage: http://www.gdal.org
Maintainer: BABA Yoshihiko <[EMAIL PROTECTED]>
# Dependencies.
Depends: gdal-shlibs (= %v-%r), grass60 (>= 6.0)
BuildDepends: <<
gdal-dev (= %v-%r),
grass60-dev (>= 6.0),
libiconv-dev, cfitsio,
libogdi3,
xerces-c-dev,
sqlite3-dev,
libgeos2,
postgresql80-dev (>= 8.0.2-13) | postgresql80-ssl-dev (>= 8.0.2-13)
<<
Conflicts:
Replaces:
# Unpack Phase.
Source: mirror:custom:gdal-grass-%v.1.tar.gz
SourceDirectory: gdal-grass-%v
Source-MD5: dd62c70000fd10f9b014c7c9b1197269
CustomMirror: <<
nam-US: http://www.gdal.org/dl
nam-US: ftp://ftp.remotesensing.org/gdal
# nam-US: http://dl.maptools.org/gdal/dl
<<
# Patch Phase.
#Patch: %n.patch
# Compile Phase.
GCC: 3.3
SetCPPFLAGS: -Os -bind_at_load -I%p/lib/grass-6.0/include -I%p
SetLDFLAGS: -L%p/lib/grass-6.0
#-lgrass_vect -lgrass_dbmiclient
SetLIBRARY_PATH: %p/lib/grass-6.0
SetDYLD_LIBRARY_PATH: %p/lib/grass-6.0
ConfigureParams: --with-gdal=%p/bin/gdal-config --with-grass=%p/lib/grass-6.0
CompileScript: <<
#!/bin/sh -xe
./configure %c
make LD_SHARED=/usr/bin/g++ LIBS='-bind_at_load -L/usr/lib -lSystem
-L%p/lib/grass-6.0/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis
-lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_rtree -lgrass_dbmiclient
-lgrass_dbmidriver -lgrass_dbmibase %p/lib/libintl.dylib -L%p/lib -lintl
-L%p/lib -lgdal'
<<
# Install Phase.
InstallScript: <<
mkdir -p %i/share/gdal/grass
make install prefix=%i AUTOLOAD_DIR=%i/lib/gdal1
GRASSTABLES_DIR=%i/share/gdal/grass
<<
#Shlibs: <<
# %p/lib/gdal_GRASS.so 11.0.0 %n (>= 1.3.1-1)
# %p/lib/ogr_GRASS.so 11.0.0 %n (>= 1.3.1-1)
#<<
DocFiles: README
DescPackaging: <<
<<
DescPort: <<
The upstream development separated gdal-grass as a plug-in to solve the
cyclic dependency issue since 1.2.3.
<<
# End of Info2
<<
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
