Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30979
Modified Files:
gdal.info grass60.info qgis.info gdal.patch
Added Files:
gdal-grass.info gdal-grass.patch
Log Message:
gdal and grass tested on 10.4
Index: gdal.patch
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/gdal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gdal.patch 14 May 2005 08:32:29 -0000 1.1
+++ gdal.patch 17 Oct 2005 15:07:39 -0000 1.2
@@ -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,3 +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.
+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/gdal13"' >> 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="[EMAIL PROTECTED]@/include/gdal13"' >>
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)
+
--- 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]>
DescDetail: <<
GDAL is a translator library for raster geospatial data formats. As a library,
it presents a single abstract data model to the calling application for all
supported formats.
Current translators include GeoTIFF (read/write), Erdas Imagine (read),
ESRI .BIL (read/write), .aux labelled raw (read/write), DTED (read),
SDTS DEM (read), CEOS (read), JPEG (read/write), PNG (read/write),
Geosoft GXF (read), Arc/Info Binary Grid (read), FITS (read/write),
netCDF (limited read/write), and GIF (read/write).
The current version of GDAL come with the related OGR library (which lives
within the GDAL source tree) provides a similar capability for simple features
vector data.
The OGR Simple Features Library is a C++ open source library (and commandline
tools) providing read (and sometimes write) access to a variety of vector file
formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, and
Mapinfo mid/mif and TAB formats.
<<
# Dependencies.
Depends: gdal-shlibs (= %v-%r), grass60-shlibs (>= 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.tar.gz
Source-MD5: 717c7ef6406ed911daab136d2a63720e
CustomMirror: <<
nam-US: http://www.gdal.org/dl
nam-US: ftp://ftp.remotesensing.org/gdal
nam-US: http://gdal.maptools.org/dl
<<
# Patch Phase.
#Patch: %n.patch
# Compile Phase.
GCC: 3.3
SetCPPFLAGS: -Os -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 LIBS='-L%p/lib/grass-6.0/lib -lgrass_I -lgrass_vask -lgrass_gmath
-lgrass_gis -lgrass_datetime -lgrass_gproj -L%p/lib -lgdal -lgrass_vect
-lgrass_dbmiclient -lgrass_dbmidriver -lgrass_dbmibase -compatibility_version
11.0.0 -current_version 11.0.0'
<<
# Install Phase.
InstallScript: <<
mkdir -p %i/share/gdal/grass
make install prefix=%i AUTOLOAD_DIR=%i/lib/gdal
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
<<
Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/gdal.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdal.info 4 Jun 2005 06:34:05 -0000 1.6
+++ gdal.info 17 Oct 2005 15:07:39 -0000 1.7
@@ -1,8 +1,7 @@
Info2: <<
-Package: gdal%type_pkg[-nopgsql]
-Type: -nopgsql (boolean)
-Version: 1.2.6
-Revision: 4
+Package: gdal
+Version: 1.3.1
+Revision: 1
Description: Raster/Vector Geospatial Format Translator
License: BSD
Homepage: http://www.gdal.org
@@ -30,111 +29,110 @@
# Dependencies.
Depends: <<
- gdal%type_pkg[-nopgsql]-shlibs (= %v-%r),
- giflib | libungif, libjpeg, libpng3, libtiff (>= 3.6.0), netcdf,
- proj, libgeos2-shlibs,
- unixodbc2 | unixodbc2-nox,
- (%type_raw[-nopgsql] = .) postgresql80 (>= 8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl (>= 8.0.2-13),
- python23, python23-shlibs, numeric-py23
+ %n-shlibs (= %v-%r),
+ postgresql80 (>= 8.0.2-13) | postgresql80-ssl (>= 8.0.2-13)
<<
+Suggests: gdal-python-py23, gdal-grass
BuildDepends: <<
libiconv-dev, cfitsio,
+ libogdi3,
+ hdf5,
+ xerces-c-dev,
+ sqlite3-dev,
libgeos2,
- (%type_raw[-nopgsql] = .) postgresql80-dev (>= 8.0.2-13) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-dev (>= 8.0.2-13),
+ postgresql80-dev (>= 8.0.2-13) | postgresql80-ssl-dev (>= 8.0.2-13)
<<
-Conflicts: gdal%type_pkg[-nopgsql]
-Replaces: gdal%type_pkg[-nopgsql]
+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-CA: http://gdal.maptools.org/dl
+ nam-US: http://gdal.maptools.org/dl
<<
# Patch Phase.
-Patch: gdal.patch
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/gdal.patch | patch -p1
# 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
--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
+
+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 --with-hdf4=no --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-ngpython --without-python
+
CompileScript: <<
#!/bin/sh -xe
-
- #if ["%type_raw[python]" == "-pysystem"]; then
- # perl -pi.bak -e 's,PYTHON_INCLUDES = [EMAIL PROTECTED]@,PYTHON_INCLUDES =
-I/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3,'
GDALmake.opt.in
- # perl -pi.bak -e 's,PYTHON_LIBS = [EMAIL PROTECTED]@,PYTHON_LIBS =
-framework Python,' GDALmake.opt.in
- # perl -pi.bak -e 's,^PYTHON_CFLAGS = [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@,PYTHON_CFLAGS = ,' GDALmake.opt.in
- # perl -pi.bak -e 's,^PYTHON = [EMAIL PROTECTED]@,PYTHON =
/usr/bin/python,' GDALmake.opt.in
- # perl -pi.bak -e 's,^PY_LD_SHARED = [EMAIL PROTECTED]@,PY_LD_SHARED = ,'
GDALmake.opt.in
- # perl -pi.bak -e 's,^INST_PYMOD = [EMAIL PROTECTED]@,INST_PYMOD
= %i/lib/python,' GDALmake.opt.in
- #elseif ["%type_raw[python]" == "-py2.3"]; then
- perl -pi.bak -e 's,^PYTHON_INCLUDES = [EMAIL PROTECTED]@,PYTHON_INCLUDES =
-I%p/include/python2.3 -I%p/include/python2.3/Numeric,' GDALmake.opt.in
- perl -pi.bak -e 's,^PYTHON_LIBS = [EMAIL PROTECTED]@,PYTHON_LIBS =
-L/sw/lib/python2.3/config -lpython2.3,' GDALmake.opt.in
- perl -pi.bak -e 's,^PYTHON_CFLAGS = [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@,PYTHON_CFLAGS = -I%p/include/python2.3
-I%p/include/python2.3/Numeric,' GDALmake.opt.in
- perl -pi.bak -e 's,^PYTHON = [EMAIL PROTECTED]@,PYTHON =
%p/bin/python2.3,' GDALmake.opt.in
- perl -pi.bak -e 's,^PY_LD_SHARED = [EMAIL PROTECTED]@,PY_LD_SHARED = ,'
GDALmake.opt.in
- perl -pi.bak -e 's,^INST_PYMOD = [EMAIL PROTECTED]@,INST_PYMOD
= %i/lib/python2.3/site-packages,' GDALmake.opt.in
- #fi
-
./configure %c
-
- make
-
+ make OGDI_INCLUDE=''
<<
# Install Phase.
InstallScript: <<
-#!/bin/sh -xe
- make install prefix=%i
+ make install prefix=%i INST_INCLUDE=%i/include/gdal13
<<
DocFiles: ChangeLog LICENSE NEWS
SplitOff: <<
Package: %N-shlibs
- Replaces: %N (<< 1.2.1-11), gdal%type_pkg[-nopgsql]-shlibs
- Conflicts: %N (<< 1.2.1-11), gdal%type_pkg[-nopgsql]-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),
+ 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
- Replaces: %N (<< 1.2.1-11), gdal%type_pkg[-nopgsql]-dev
- Conflicts: %N (<< 1.2.1-11), gdal%type_pkg[-nopgsql]-dev
- Depends: %N-shlibs (= %v-%r) | %N-grass-shlibs
+ 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)
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/gdal13 lib/*.a lib/*.la lib/libgdal.dylib
share/man/man1/gdal-config.1
DocFiles: ChangeLog LICENSE NEWS
<<
DescPackaging: <<
+Patch file does the following:
+ 1. add LICENSE.
+ 2. install header files in %p/include/gdal13.
+ 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: <<
+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.
-Python support added since 1.2.6-4. The python is not Fink version of python.
-
+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 their own
-subdirectory and gdal-conf has been patched to have the correct
-include file path. - Now successfully builds without this patch, though.
+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.
Index: qgis.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qgis.info 9 Oct 2005 02:38:10 -0000 1.6
+++ qgis.info 17 Oct 2005 15:07:39 -0000 1.7
@@ -14,15 +14,15 @@
QGIS is licensed under the GNU Public License.
Some of the major features include:
- 1 Support for spatially enabled PostGIS tables
- 2 Support for shapefiles, ArcInfo coverages, Mapinfo,
+ 1 Support for spatially enabled PostGIS tables
+ 2 Support for shapefiles, ArcInfo coverages, Mapinfo,
and other formats supported by OGR
- 3 Raster support for a large number of formats
- 4 Identify features
- 5 Display attribute tables
- 6 Select features
- 7 GRASS Digitizing
- 8 Feature labeling
+ 3 Raster support for a large number of formats
+ 4 Identify features
+ 5 Display attribute tables
+ 6 Select features
+ 7 GRASS Digitizing
+ 8 Feature labeling
<<
DescUsage: Just type 'qgis' at the command prompt inside an X environment.
@@ -48,7 +48,7 @@
# Patch Phase.
# Patch for PostGIS-1.0 Support
-PatchScript: patch -p0 < %a/qgis.patch
+#PatchScript: patch -p0 < %a/qgis.patch
# Compile Phase.
GCC: 3.3
@@ -64,10 +64,10 @@
# Install Phase.
InstallScript: make install DESTDIR=%d
-DocFiles: AUTHORS ChangeLog COPYING README TODO doc/*.html doc/*.css doc/*.pdf
doc/*/*.html doc/*/*.css doc/*/*.png doc/*/*/*.html doc/*/*/*.png doc/*/*/*.pdf
+DocFiles: AUTHORS ChangeLog COPYING README TODO
DescPort: <<
- DYLD_LIBRARY_PATH is used in libtool to include %p/lib/grass-6.0
+ DYLD_LIBRARY_PATH is used in libtool to include %p/lib/grass
<<
# End of Info2
--- 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: grass60.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass60.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- grass60.info 9 Oct 2005 02:38:09 -0000 1.6
+++ grass60.info 17 Oct 2005 15:07:39 -0000 1.7
@@ -1,6 +1,6 @@
Info2: <<
-Package: grass60%type_pkg[-nopgsql]%type_pkg[-nogdal]
-Type: -nopgsql (boolean), -nogdal (boolean)
+Package: grass60%type_pkg[-nopgsql]
+Type: -nopgsql (boolean)
Version: 6.0.1
Revision: 1
Description: Powerful GIS software
@@ -18,19 +18,14 @@
# Dependencies.
# Dependencies.
Depends: <<
- %N-shlibs (>=%v-%r),
- fftw-shlibs | fftw-mpi-shlibs | fftw-absoft-shlibs,
- (%type_raw[-nogdal] = .) gdal-shlibs | (%type_raw[-nogdal] = .)
gdal-ssl-shlibs | (%type_raw[-nogdal] = .) gdal-grass-shlibs |
(%type_raw[-nogdal] = .) gdal-nopgsql-shlibs | (%type_raw[-nogdal] = .)
gdal-nopgsql-grass-shlibs,
- proj, gettext, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
lesstif-shlibs,
- unixodbc2-nox-shlibs | unixodbc2-shlibs,
- (%type_raw[-nopgsql] = .) postgresql80 (>=8.0.2-12) |
(%type_raw[-nopgsql] = .) postgresql80-ssl (>=8.0.2-12),
+ %n-shlibs (=%v-%r),
tcltk (>= 8.4.1-1),
x11-shlibs
<<
BuildDepends: <<
libiconv-dev, readline (>= 4.3-5) | readline5,
fftw | fftw-mpi | fftw-absoft,
- (%type_raw[-nogdal] = .) gdal-dev | (%type_raw[-nogdal] = .)
gdal-ssl-dev,
+ gdal-dev,
libjpeg, libpng3, libtiff, lesstif,
(%type_raw[-nopgsql] = .) postgresql80-dev (>=8.0.2-12) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-dev (>=8.0.2-12),
tcltk-dev (>= 8.4.1-1),
@@ -62,10 +57,10 @@
# Compile Phase.
SetCPPFLAGS: -I%p/include/grass60
SetLDFLAGS: -L%p/lib/grass60
-ConfigureParams: --with-includes='%p/include /usr/X11R6/include' --with-cxx
--with-readline --with-dbm --with-odbc (%type_raw[-nopgsql] = -nopgsql)
--without-postgres (%type_raw[-nopgsql] = .) --with-postgres
(%type_raw[-nopgsql] = .) --with-postgres-includes=%p/include/postgresql
--with-glw --with-freetype
--with-freetype-includes=/usr/X11R6/include/freetype2
--with-freetype-libs=/usr/X11R6/lib --with-motif
--with-glw-includes=/usr/X11R6/include --with-nls --with-proj
--with-proj-includes=%p/include --with-proj-libs=%p/lib (%type_raw[-nogdal] =
.) --with-gdal=%p/bin/gdal-config (%type_raw[-nogdal] = -nogdal) --without-gdal
+ConfigureParams: --with-includes='%p/include /usr/X11R6/include' --with-cxx
--with-readline --with-dbm --with-odbc (%type_raw[-nopgsql] = -nopgsql)
--without-postgres (%type_raw[-nopgsql] = .) --with-postgres
(%type_raw[-nopgsql] = .) --with-postgres-includes=%p/include/postgresql
--with-glw --with-freetype
--with-freetype-includes=/usr/X11R6/include/freetype2
--with-freetype-libs=/usr/X11R6/lib --with-motif
--with-glw-includes=/usr/X11R6/include --with-nls --with-proj
--with-proj-includes=%p/include --with-proj-libs=%p/lib
--with-gdal=%p/bin/gdal-config
CompileScript: <<
./configure %c
- make INST_DIR=%i/lib/grass-6.0
+ make INST_DIR=%p/lib/grass-6.0
<<
# Install Phase.
@@ -75,9 +70,14 @@
# Installing grass60
make install INST_DIR=%i/lib/grass-6.0 BINDIR=%i/bin
+ # make symlink
+ pushd %i/lib
+ ln -s grass-6.0 grass
+ popd
+
# Fixing GISBASE path
pushd %i/bin
- perl -pi.bak -e 's,%i,%p,g' grass60
+ perl -pi.bak -e 's,GISBASE=,GISBASE=%p/lib/grass-6.0 #,g' grass60
popd
# man
@@ -96,7 +96,7 @@
SplitOff: <<
Package: %N-dev
Description: GRASS Development Headers
- Depends: %N (>= %v-%r)
+ Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Conflicts: grass60-dev, grass60-nopgsql-dev, grass60-nogdal-dev,
grass60-nopgsql-nogdal-dev
Replaces: grass60-dev, grass60-nopgsql-dev, grass60-nogdal-dev,
grass60-nopgsql-nogdal-dev
@@ -108,7 +108,7 @@
Description: GRASS Shared Libraries
Depends: <<
fftw-shlibs | fftw-mpi-shlibs | fftw-absoft-shlibs,
- (%type_raw[-nogdal] = .) gdal-shlibs | (%type_raw[-nogdal] = .)
gdal-ssl-shlibs | (%type_raw[-nogdal] = .) gdal-grass-shlibs |
(%type_raw[-nogdal] = .) gdal-nopgsql-shlibs | (%type_raw[-nogdal] = .)
gdal-nopgsql-grass-shlibs,
+ gdal-shlibs | gdal-ssl-shlibs | gdal-grass-shlibs | gdal-nopgsql-shlibs
| gdal-nopgsql-grass-shlibs,
proj, gettext, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
lesstif-shlibs,
(%type_raw[-nopgsql] = .) postgresql80-shlibs (>=8.0.2-12) |
(%type_raw[-nopgsql] = .) postgresql80-ssl-shlibs (>=8.0.2-12),
unixodbc2-nox-shlibs | unixodbc2-shlibs,
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
