Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7765
Modified Files:
grass60.info qgis.info qgis.patch
Added Files:
grass60.patch
Log Message:
fix grass60 startup problem
--- NEW FILE: grass60.patch ---
--- grass-6.0.0/Makefile 2005-03-09 23:08:59.000000000 +0900
+++ grass-6.0.0-patched/Makefile 2005-06-23 04:36:12.000000000 +0900
@@ -219,7 +219,7 @@
test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
@##### test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
- -sed -e "s#^GISBASE.*#GISBASE=${INST_DIR}#"
${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} >
${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
+ -sed -e "[EMAIL PROTECTED]@#"
${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} >
${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - )
2>/dev/null
-cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR} ; tar xBf - )
2>/dev/null
Index: qgis.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/qgis.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qgis.info 13 Jun 2005 01:56:30 -0000 1.1
+++ qgis.info 23 Jun 2005 22:29:22 -0000 1.2
@@ -2,7 +2,7 @@
Package: qgis%type_pkg[-nopgsql]%type_pkg[-nograss]
Type: -nopgsql (boolean), -nograss (boolean)
Version: 0.6.0
-Revision: 2
+Revision: 3
Description: Qt/X11-based GIS
License: GPL
Homepage: http://www.qgis.org
@@ -51,15 +51,13 @@
PatchScript: patch -p0 < %a/qgis.patch
# Compile Phase.
-SetCPPFLAGS: -I%p/include/grass-6.0
-SetLDFLAGS: -L%p/lib/grass-6.0
-SetDYLD_LIBRARY_PATH: -L%p/lib/grass-6.0
-ConfigureParams: --with-x --with-x-includes=/usr/X11/include
--with-x-libraries=/usr/X11/lib --with-qtdir=%p --with-gdal=%p/bin/gdal-config
--with-geos=%p/bin/geos-config (%type_raw[-nopgsql] = -nopgsql)
--without-postgresql (%type_raw[-nopgsql] = .) --with-postgresql=%p/bin
(%type_raw[-nograss] = -nograss) --without-grass (%type_raw[-nograss] = .)
--with-grass=%p
+SetCPPFLAGS: -I%p/lib/grass/include
+SetLDFLAGS: -L%p/lib/grass/lib
+SetDYLD_LIBRARY_PATH: -L%p/lib/grass/lib
+ConfigureParams: --with-x --with-x-includes=/usr/X11/include
--with-x-libraries=/usr/X11/lib --with-qtdir=%p --with-gdal=%p/bin/gdal-config
--with-geos=%p/bin/geos-config (%type_raw[-nopgsql] = -nopgsql)
--without-postgresql (%type_raw[-nopgsql] = .) --with-postgresql=%p/bin
(%type_raw[-nograss] = -nograss) --without-grass (%type_raw[-nograss] = .)
--with-grass=%p/lib/grass
CompileScript: <<
#!/bin/sh -xe
- perl -pi.bak -e "s|grass/lib|grass/lib/grass-6.0|g" configure && \
- perl -pi.bak -e "s|grass/include|grass/include/grass-6.0|g" configure
&& \
- ./configure %c || exit 3
+ ./configure %c
make
<<
Index: grass60.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/grass60.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grass60.info 13 Jun 2005 01:56:30 -0000 1.1
+++ grass60.info 23 Jun 2005 22:29:21 -0000 1.2
@@ -2,7 +2,7 @@
Package: grass60%type_pkg[-nopgsql]%type_pkg[-nogdal]
Type: -nopgsql (boolean), -nogdal (boolean)
Version: 6.0.0
-Revision: 3
+Revision: 4
Description: Powerful GIS software
License: GPL
Homepage: http://grass.itc.it
@@ -10,7 +10,7 @@
DescDetail: <<
Very Powerful Geographical Information System with CLI and GUI.
<<
-DescUsage: Just type 'grass60' at the command prompt inside an X environment.
+DescUsage: Just type 'grass60 -text' or 'grass60 -gui' at the command prompt
inside an X environment.
# Dependencies.
# Dependencies.
@@ -54,15 +54,15 @@
Source-MD5: acfa05ada219cd15c9db1a5d5320e008
# Patch Phase.
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
# Compile Phase.
SetCPPFLAGS: -I%p/include/grass60
SetLDFLAGS: -L%p/lib/grass60
-ConfigureParams: --bindir=%p/grass/bin --bindir=%i/bin
--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 (%type_raw[-nogdal] =
.) --with-gdal=%p/bin/gdal-config (%type_raw[-nogdal] = -nogdal) --without-gdal
CompileScript: <<
- ./configure %c
- make
- echo "Compile Skipped"
+ ./configure %c
+ make INST_DIR=%i/lib/grass
<<
# Install Phase.
@@ -70,31 +70,22 @@
#!/bin/sh -xe
# Installing grass60
- make install prefix=%i/share
- mv %i/share/grass-%v/bin grass-6.0
- mv grass-6.0 %i/bin
-
- # Moving Shared Libraries
- mv %i/share/grass-%v/lib grass-6.0
- mkdir -p %i/lib
- mv grass-6.0 %i/lib
+ make install INST_DIR=%i/lib/grass BINDIR=%i/bin
- # Moving Headers
- mv %i/share/grass-%v/include grass-6.0
- mkdir -p %i/include
- mv grass-6.0 %i/include
+ # Fixing GISBASE path
+ pushd %i/bin
+ perl -pi.bak -e 's,%i,%p,g' grass60
+ popd
- # Moving conf files
- mv %i/share/grass-%v/etc grass-6.0
- mkdir -p %i/etc
- mv grass-6.0 %i/etc
+ # man
+ mkdir -p %i/share
+ #mv %i/lib/grass/man %i/share
- # Moving HTML docs
- mkdir %i/share/doc
- mv %i/share/grass-%v/docs %i/share/doc/grass-6.0
+ #docs
+ #mkdir -p %i/share/doc/grass60
+ #mv %i/lib/grass/docs/html %i/share/doc/grass60
+ #mv %i/lib/grass/docs/nviz %i/share/doc/grass60
- # Stripping the last digit
- mv %i/share/grass-%v %i/share/grass-6.0
<<
DocFiles: AUTHORS CHANGES COPYING GPL.TXT INSTALL README REQUIREMENTS.html
SUBMITTING TODO
@@ -106,49 +97,7 @@
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
- Files: <<
- include/grass-6.0
- lib/grass-6.0/libgrass_D.dylib
- lib/grass-6.0/libgrass_I.dylib
- lib/grass-6.0/libgrass_Iortho.dylib
- lib/grass-6.0/libgrass_bitmap.dylib
- lib/grass-6.0/libgrass_btree.dylib
- lib/grass-6.0/libgrass_cdhc.dylib
- lib/grass-6.0/libgrass_datetime.dylib
- lib/grass-6.0/libgrass_dbmibase.dylib
- lib/grass-6.0/libgrass_dbmiclient.dylib
- lib/grass-6.0/libgrass_dbmidriver.dylib
- lib/grass-6.0/libgrass_dbstubs.dylib
- lib/grass-6.0/libgrass_dgl.dylib
- lib/grass-6.0/libgrass_dig2.dylib
- lib/grass-6.0/libgrass_display.dylib
- lib/grass-6.0/libgrass_dspf.dylib
- lib/grass-6.0/libgrass_edit.dylib
- lib/grass-6.0/libgrass_form.dylib
- lib/grass-6.0/libgrass_g3d.dylib
- lib/grass-6.0/libgrass_gis.dylib
- lib/grass-6.0/libgrass_gmath.dylib
- lib/grass-6.0/libgrass_gproj.dylib
- lib/grass-6.0/libgrass_image.dylib
- lib/grass-6.0/libgrass_interpdata.dylib
- lib/grass-6.0/libgrass_interpfl.dylib
- lib/grass-6.0/libgrass_ismap.a
- lib/grass-6.0/libgrass_linkm.dylib
- lib/grass-6.0/libgrass_manage.a
- lib/grass-6.0/libgrass_ogsf.dylib
- lib/grass-6.0/libgrass_qtree.dylib
- lib/grass-6.0/libgrass_raster.dylib
- lib/grass-6.0/libgrass_rowio.dylib
- lib/grass-6.0/libgrass_rtree.dylib
- lib/grass-6.0/libgrass_segment.dylib
- lib/grass-6.0/libgrass_shape.dylib
- lib/grass-6.0/libgrass_sites.dylib
- lib/grass-6.0/libgrass_sqlp.dylib
- lib/grass-6.0/libgrass_symb.dylib
- lib/grass-6.0/libgrass_trans.dylib
- lib/grass-6.0/libgrass_vask.dylib
- lib/grass-6.0/libgrass_vect.dylib
- <<
+ Files: lib/grass/include
DocFiles: COPYING GPL.TXT
<<
SplitOff2: <<
@@ -164,50 +113,52 @@
<<
Conflicts: grass60-shlibs, grass60-nopgsql-shlibs, grass60-nogdal-shlibs,
grass60-nopgsql-nogdal-shlibs
Replaces: grass60-shlibs, grass60-nopgsql-shlibs, grass60-nogdal-shlibs,
grass60-nopgsql-nogdal-shlibs
- Files: lib/grass-6.0/libgrass_*.6.0.0.dylib
+ Files: lib/grass/lib
Shlibs: <<
- %p/lib/grass60/libgrass_D.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_I.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_bitmap.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_btree.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_cdhc.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_datetime.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dbmibase.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dbmiclient.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dbmidriver.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dbstubs.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dgl.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dig2.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_display.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_dspf.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_edit.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_form.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_g3d.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_gis.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_gmath.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_gproj.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_image.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_interpdata.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_interpfl.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_linkm.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_ogsf.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_qtree.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_raster.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_rowio.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_rtree.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_segment.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_shape.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_sites.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_sqlp.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_symb.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_trans.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_vask.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
- %p/lib/grass60/libgrass_vect.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_D.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_I.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_bitmap.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_btree.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_cdhc.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_datetime.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dbmibase.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dbmiclient.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dbmidriver.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dbstubs.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dgl.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dig2.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_display.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_dspf.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_edit.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_form.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_g3d.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_gis.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_gmath.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_gproj.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_image.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_interpdata.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_interpfl.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_linkm.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_ogsf.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_qtree.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_raster.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_rowio.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_rtree.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_segment.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_shape.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_sites.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_sqlp.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_symb.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_trans.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_vask.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
+ %p/lib/grass/lib/libgrass_vect.6.0.0.dylib 0.0.0 grass60
(>=6.0.0-1)
<<
DocFiles: COPYING GPL.TXT
<<
DescPort: <<
+Based on Debian packages of grass, libgrass and libgrass-dev.
+
LAPACK and BLAS supports are disabled because no module uses them in version
6.0.0.
If we want them, replace all '-lblas' with '-framework vecLib' and replace all
'-llapack' with '-framework vecLib' to use MacOSX's native LAPACK/BLAS.
Index: qgis.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/qgis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qgis.patch 13 Jun 2005 01:56:30 -0000 1.1
+++ qgis.patch 23 Jun 2005 22:29:22 -0000 1.2
@@ -21,3 +21,14 @@
declare += ")'::box3d,";
declare += srid;
declare += ")";
+--- providers/ogr/qgsshapefileprovider.cpp 19 Dec 2004 22:01:57 -0000
1.53.2.5
++++ providers/ogr/qgsshapefileprovider.cpp 21 Apr 2005 12:34:01 -0000
+@@ -501,7 +501,7 @@
+ }
+ // reset the extent for the ogr filter
+ //
+- wktExtent = QString("POLYGON ((%1))").arg(rect->stringRep());
++ wktExtent = QString("POLYGON ((%1))").arg(rect->asPolygon());
+ wktText = (const char *)wktExtent;
+
+ OGRErr result = ((OGRPolygon *) filter)->importFromWkt((char **)&wktText);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
