Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2298
Modified Files:
grass64.info grass64.patch
Log Message:
brings back dkacm's changes; still python errors
Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass64.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- grass64.info 30 Dec 2012 03:03:30 -0000 1.16
+++ grass64.info 3 Jan 2013 00:14:52 -0000 1.17
@@ -1,9 +1,9 @@
Info2: <<
Package: grass64%type_pkg[gui]
Type: gui (-mac -x11)
-Distribution: (%type_raw[gui] = -mac) 10.7, (%type_raw[gui] = -mac) 10.6
+Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5,
(%type_raw[gui] = -x11) 10.6, (%type_raw[gui] = -mac) 10.6, (%type_raw[gui] =
-x11) 10.7, (%type_raw[gui] = -mac) 10.7, (%type_raw[gui] = -x11) 10.8,
(%type_raw[gui] = -mac) 10.8
Version: 6.4.2
-Revision: 2
+Revision: 1.1
Conflicts: grass64, grass64-mac, grass64-x11
Replaces: grass64, grass64-mac, grass64-x11
@@ -27,48 +27,63 @@
Just type double click GRASS-6.4.app in %p/Applications.
<<
+DescPackaging: <<
+ dmacks added fix for building with make-3.82. See:
+ http://lists.osgeo.org/pipermail/grass-dev/2012-May/058634.html
+<<
+
# Dependencies.
Depends: <<
- %n-shlibs (=%v-%r)
+ %n-shlibs (=%v-%r)
<<
BuildDepends: <<
- fink (>= 0.28),
- libncurses5-dev,
- libiconv-dev, readline5, libgettext8-dev, gettext-tools,
- fftw3,
- unixodbc2 | unixodbc2-nox,
- gdal-dev,
- libjpeg8, libpng14, libtiff,
- szip, xerces-c31-dev, libogdi3,
- postgresql90-dev,
- python27,
- sqlite3-dev
+ fink (>= 0.28),
+ freetype219,
+ libncurses5-dev,
+ libiconv-dev, readline5, libgettext8-dev, gettext-tools,
+ fftw3,
+ gdal-dev,
+ libjpeg8, libpng14, libtiff,
+ unixodbc2 | unixodbc2-nox,
+ szip, xerces-c31-dev, libogdi3,
+ postgresql90-dev,
+ proj, proj-bin,
+ python27,
+ sqlite3-dev,
+ (%type_pkg[gui] = -x11) tcltk-dev
+<<
+# hdf5-18-bin | hdf5-bin,
+# (%type_raw[gui] = -mac) wxmac28
+
+# avoid seeing older pg*-dev exposed in %p (newer desired ones buried
+# in %p/opt/)
+BuildConflicts: <<
+ postgresql80-dev, postgresql80-ssl-dev, postgresql81-dev, postgresql82-dev,
postgresql83-dev
<<
-# hdf5-18-bin | hdf5-bin,
-# (%type_raw[gui] = -mac) wxmac28,
Source: http://grass.osgeo.org/grass64/source/grass-%v.tar.gz
Source-MD5: d3398d6b1e3a2ef19cfb6e39a5ae9919
# Patch Phase.
PatchFile: grass64.patch
-PatchFile-MD5: a6699ed4c208d0cb6737d157d2908b72
+PatchFile-MD5: ed318c92e82880b96cbe934832f2071e
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
# Compile Phase.
SetCFLAGS: -I%p/include
SetLDFLAGS: -L%p/lib -lcurses
-ConfigureParams: --with-curses --with-freetype
--with-freetype-includes=%p/lib/freetype219/include/freetype2
--with-freetype-libs=%p/lib/freetype219/lib --with-gdal=%p/bin/gdal-config
--with-proj --with-proj-includes=%p/include --with-proj-libs=%p/lib
--with-proj-share=%p/share/proj --with-jpeg-includes=%p/include
--with-jpeg-libs=%p/lib --with-png-includes=%p/include --with-png-libs=%p/lib
--with-tiff-includes=%p/include --with-tiff-libs=%p/lib --without-mysql
--without-odbc --with-sqlite --with-sqlite-libs=%p/lib
--with-sqlite-includes=%p/include --with-fftw-includes=%p/include
--with-fftw-libs=%p/lib --with-cxx --without-motif --without-glw
--without-readline --with-python=%p/bin/python2.7-config
--prefix=%p/Applications --enable-macosx-app --with-odbc
+ConfigureParams: --with-curses --with-freetype
--with-freetype-includes=%p/lib/freetype219/include/freetype2
--with-freetype-libs=%p/lib/freetype219/lib --with-gdal=%p/bin/gdal-config
--with-proj --with-proj-includes=%p/include --with-proj-libs=%p/lib
--with-proj-share=%p/share/proj --with-jpeg-includes=%p/include
--with-jpeg-libs=%p/lib --with-png-includes=%p/include --with-png-libs=%p/lib
--with-tiff-includes=%p/include --with-tiff-libs=%p/lib --without-mysql
--with-odbc --with-sqlite --with-sqlite-libs=%p/lib
--with-sqlite-includes=%p/include --with-fftw-includes=%p/include
--with-fftw-libs=%p/lib --with-cxx --without-motif --without-glw
--without-readline --with-python=%p/bin/python2.7-config
--prefix=%p/Applications --enable-macosx-app
+
CompileScript: <<
#!/bin/bash -xe
-
+
PGSQLPARAM=" --with-postgres
--with-postgres-includes=%p/opt/postgresql-9.0/include
--with-postgres-libs=%p/opt/postgresql-9.0/lib "
if [ "%type_raw[gui]" == "-mac" ]; then
- ./configure %c $PGSQLPARAM --without-x --without-wxwidgets
--with-opengl=aqua
'--with-opengl-includes=/System/Library/Frameworks/OpenGL.framework/Headers
/System/Library/Frameworks/GLUT.framework/Headers
/System/Library/Frameworks/AGL.framework/Headers'
+ ./configure %c $PGSQLPARAM --without-x
'--with-tcltk-includes=/System/Library/Frameworks/Tcl.framework/Headers
/System/Library/Frameworks/Tk.framework/Headers
/System/Library/Frameworks/Tk.framework/PrivateHeaders'
--with-tcltk-libs=/usr/lib --with-opengl=aqua
'--with-opengl-includes=/System/Library/Frameworks/OpenGL.framework/Headers
/System/Library/Frameworks/GLUT.framework/Headers
/System/Library/Frameworks/AGL.framework/Headers'
# --with-wxwidgets=%p/lib/wx/config/mac-ansi-release-2.8
perl -pi -e "s|^TCLINCDIR|TCLINCDIR =
-I/System/Library/Frameworks/Tcl.framework/Headers
-I/System/Library/Frameworks/Tk.framework/Headers
-I/System/Library/Frameworks/Tk.framework/PrivateHeaders #|"
include/Make/Platform.make
perl -pi -e "s|^TKINCDIR|TKINCDIR =
-I/System/Library/Frameworks/Tcl.framework/Headers
-I/System/Library/Frameworks/Tk.framework/Headers
-I/System/Library/Frameworks/Tk.framework/PrivateHeaders #|"
include/Make/Platform.make
@@ -85,44 +100,41 @@
if [ "%type_raw[gui]" == "-mac" ]; then
perl -pi -e "s|MACORX11|/usr|g"
%b/Applications/GRASS-6.4.app/Contents/MacOS/grass.sh
- # Recompile python scripts to fix path
- %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/
- %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/
-
- %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/
- %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/
-
else
perl -pi -e "s|MACORX11|%p|g"
%b/Applications/GRASS-6.4.app/Contents/MacOS/grass.sh
fi
+
+ # Recompile python scripts to fix path (because 'make install' is
+ # called with path to staging directory that masks runtime location)
+ %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/
+ %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/
+ %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/
+ %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/
+ %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/script
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/script/
+ %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/script
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/script/
+ %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/lib
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/lib/
+ %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/lib
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/lib/
+
<<
+
+
# Install Phase.
InstallScript: <<
-#!/bin/sh -xe
- # rm -f Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/*.pyc
- rm -f Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/lib/*.py?
- # rm -f
Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/script/*.pyc
-
- # Fix install names in libs and modules
- pushd Applications/GRASS-6.4.app/Contents/MacOS/lib/
- LIBS="arraystats bitmap btree cdhc cluster datetime dbmibase dbmiclient
dbmidriver dbstubs
- dgl dig2 display driver dspf edit form g3d gis gmath gpde gproj
interpdata interpfl
- lidar linkm lrs neta nviz ogsf pngdriver psdriver qtree raster rli
- rowio rtree segment shape sim sites sqlp stats symb trans vask vect
- vedit I Iortho arraystats"
- for LIB in $LIBS;
- do
- if [ -e libgrass_$LIB.dylib ]; then
- install_name_tool -id
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_$LIB.dylib
libgrass_$LIB.dylib
- fi
- done
- popd
+#!/bin/sh -xe
+ echo "Nothing "
<<
AppBundles: Applications/GRASS-6.4.app
DocFiles:
+
+
+
+
+
+
+
# Additional Phase.
SplitOff: <<
Package: %N-dev
@@ -135,23 +147,31 @@
DocFiles:
<<
+
+
+
+
+
SplitOff2: <<
Package: %N-shlibs
Description: GRASS Shared Libraries
Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Depends: <<
+ freetype219-shlibs,
libncurses5-shlibs,
+ libiconv,
fftw3-shlibs,
- unixodbc2-shlibs | unixodbc2-nox-shlibs,
gdal-shlibs,
libgettext8-shlibs, libjpeg8-shlibs, libpng14-shlibs, libtiff-shlibs,
- proj-shlibs,
+ xerces-c31-shlibs,
postgresql90-shlibs,
python27-shlibs,
- sqlite3-shlibs
+ sqlite3-shlibs,
+ unixodbc2-shlibs | unixodbc2-nox-shlibs,
+ (%type_pkg[gui] = -x11) tcltk-shlibs
<<
-# (%type_raw[gui] = -mac) wxmac28-shlibs,
+ # (%type_raw[gui] = -mac) wxmac28-shlibs
Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.dylib
Shlibs: <<
@@ -184,7 +204,6 @@
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.%v.dylib
- !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_neta.%v.dylib
(%type_raw[gui] = -mac)
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.%v.dylib
(%type_raw[gui] = -mac)
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.%v.dylib
@@ -205,7 +224,7 @@
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.%v.dylib
- %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib 6.4.0 %n
(>= 6.4.0-1) 32
+ %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib 6.4.0 %n
(>= 6.4.0-1)
(%type_raw[gui] = -x11)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_Iortho.dylib 6.4.0 %n
(>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.dylib
6.4.0 %n (>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.dylib
6.4.0 %n (>= 6.4.0-1)
@@ -234,7 +253,6 @@
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib libgrass_bitmap.dylib
6.4.0 %n (>= 6.4.0-1) 1) .0 %n (>= 6.4.0-1) ib
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/python/grass/lib/ ipt/ ateHeaders
#|" include/Make/Platform.make ib --with-opengl=aqua
'--with-opengl-includes=/System/Library/Frameworks/OpenGL.framework/Headers
/System/Library/Frameworks/GLUT.framework/Headers
/System/Library/Frameworks/AGL.framework/Headers' =%p/lib --without-mysql
--with-odbc --with-sqlite --with-sqlite-libs=%p/lib
--with-sqlite-includes=%p/include --with-fftw-includes=%p/include
--with-fftw-libs=%p/lib --with-cxx --without-motif --without-glw
--without-readline --with-python=%p/bin/python2.7-config
--prefix=%p/Applications --enable-macosx-app p
--with-odbc J K M N O P zXÆÿ pzXÆÿ Hu¡ÑÃ* àrXÆÿ "ÎÐÃ* @ÎÐÃ* zXÆÿ 0ïNÒÃ* u*ÎÐÃ* ëÑÃ*
©~ÑÃ* àNÒÃ* ØäNÒÃ* ¨éNÒÃ* JÏÐÃ* Hu¡ÑÃ* àrXÆÿ
qXÆÿ k@ÎÐÃ* 8u¡ÑÃ* àrXÆÿ PqXÆÿ k@ÎÐÃ* (u¡ÑÃ* àrXÆÿ qXÆÿ k@ÎÐÃ* u¡ÑÃ* àrXÆÿ °qXÆÿ k@ÎÐÃ*
¨îNÒÃ* u*ÎÐÃ* ¨éNÒÃ* 0lXÆÿ ø~ÑÃ* e)ÎÐÃ* ØäNÒÃ* PrXÆÿ yø~ÑÃ* e)ÎÐÃ* àNÒÃ* rXÆÿ Zø~ÑÃ* e)ÎÐÃ* ؤ~ÑÃ* ëÑÃ*
©~ÑÃ* àNÒÃ* ØëÑÃ* ØäNÒÃ* ¨éNÒÃ* JÏÐÃ* 8KïÐÃ* mJÑÃ* pzXÆÿ p;~ÑÃ* 0tXÆÿ sXÆÿ k@ÎÐÃ* 5 6 7 8 : < = > ? @ B D zXÆÿ pzXÆÿ
qGÑÃ* pzXÆÿ u*ÎÐÃ* EïÐÃ* °rXÆÿ mJÑÃ* e)ÎÐÃ* EïÐÃ* Õ_@f ÆS
Qöl±í ìÑÃ* pzXÆÿ
qGÑÃ* @uXÆÿ tXÆÿ k@ÎÐÃ* u]ÞÓ 4Q
÷U^Qʧ ¶uª¹ñìò*Äv zXÆÿ pzXÆÿ H¾ÑÃ* PwXÆÿ "ÎÐÃ* @ÎÐÃ* zXÆÿ `"ÎÐÃ* ?zXÆÿ 0zXÆÿ (zXÆÿ ëÑÃ* u*ÎÐÃ* ØëÑÃ*
ëÑÃ* JÏÐÃ* PwXÆÿ uXÆÿ k@ÎÐÃ* 8¾ÑÃ* PwXÆÿ 0uXÆÿ k@/libgrass_lidar.dylib
6.4.0 %n (>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.dylib
6.4.0 %n (>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.dylib 6.4.0
%n (>= 6.4.0-1)
- %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_neta.dylib 6.4.0
%n (>= 6.4.0-1)
(%type_raw[gui] = -mac)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.dylib 6.4.0 %n
(>= 6.4.0-1)
(%type_raw[gui] = -mac)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.dylib 6.4.0 %n
(>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.dylib
6.4.0 %n (>= 6.4.0-1)
@@ -260,4 +278,4 @@
<<
# End of Info2
-<<
+<<
\ No newline at end of file
Index: grass64.patch
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass64.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- grass64.patch 30 Dec 2012 03:03:30 -0000 1.8
+++ grass64.patch 3 Jan 2013 00:14:52 -0000 1.9
@@ -1,8 +1,6 @@
-Binary files grass-6.4.2-orig/.DS_Store and grass-6.4.2/.DS_Store differ
-Binary files grass-6.4.2-orig/include/iostream/.DS_Store and
grass-6.4.2/include/iostream/.DS_Store differ
diff -ruN grass-6.4.2-orig/include/iostream/ami_stream.h
grass-6.4.2/include/iostream/ami_stream.h
--- grass-6.4.2-orig/include/iostream/ami_stream.h 2012-12-30
11:19:00.000000000 +0900
-+++ grass-6.4.2/include/iostream/ami_stream.h 2012-12-30 11:22:53.000000000
+0900
++++ grass-6.4.2/include/iostream/ami_stream.h 2013-01-03 08:37:30.000000000
+0900
@@ -140,7 +140,7 @@
AMI_STREAM();
@@ -17,7 +15,7 @@
AMI_err read_item(T **elt);
AMI_err write_item(const T &elt);
- AMI_err read_array(T *data, off_t len, off_t *lenp);
-+ AMI_err read_array(T *data, off_t len, off_t *lenp=NULL);
++ AMI_err read_array(T *data, off_t len, off_t *lenp = NULL);
AMI_err write_array(const T *data, off_t len);
// Return the number of items in the stream.
@@ -59,17 +57,18 @@
diff -ruN grass-6.4.2-orig/include/iostream/embuffer.h
grass-6.4.2/include/iostream/embuffer.h
--- grass-6.4.2-orig/include/iostream/embuffer.h 2012-12-30
11:19:00.000000000 +0900
-+++ grass-6.4.2/include/iostream/embuffer.h 2012-12-30 11:22:53.000000000
+0900
-@@ -364,7 +364,7 @@
++++ grass-6.4.2/include/iostream/embuffer.h 2013-01-03 08:38:38.000000000
+0900
+@@ -363,8 +363,7 @@
+
// return the number of items actually inserted
long insert(AMI_STREAM<T>* str,
- //long bos=0);
+- //long bos=0);
- long bos);
+ long bos=0);
//print range of elements in buffer
void print_range();
-@@ -1120,7 +1120,7 @@
+@@ -1120,7 +1119,7 @@
return the number of items actually inserted */
template<class T, class Key>
@@ -80,27 +79,41 @@
diff -ruN grass-6.4.2-orig/include/iostream/empq_impl.h
grass-6.4.2/include/iostream/empq_impl.h
--- grass-6.4.2-orig/include/iostream/empq_impl.h 2012-12-30
11:19:00.000000000 +0900
-+++ grass-6.4.2/include/iostream/empq_impl.h 2012-12-30 11:31:39.000000000
+0900
-@@ -21,6 +21,7 @@
++++ grass-6.4.2/include/iostream/empq_impl.h 2013-01-03 08:52:44.000000000
+0900
+@@ -21,6 +21,8 @@
#define __EMPQ_IMPL_H
#include <ostream>
-+#include <vector>
++#include <vector>
++
using namespace std;
#include "empq.h"
-@@ -1357,7 +1358,7 @@
+@@ -1357,7 +1359,7 @@
assert(arity> 1);
//Pointers to current leading elements of streams
- ExtendedEltMergeType<T,Key> in_objects[arity];
-+ std::vector<ExtendedEltMergeType<T,Key> > in_objects(arity);
++ std::vector<ExtendedEltMergeType<T,Key> > in_objects(arity);
AMI_err ami_err;
//unsigned int i;
+diff -ruN grass-6.4.2-orig/include/iostream/imbuffer.h
grass-6.4.2/include/iostream/imbuffer.h
+--- grass-6.4.2-orig/include/iostream/imbuffer.h 2012-12-30
11:19:00.000000000 +0900
++++ grass-6.4.2/include/iostream/imbuffer.h 2013-01-03 08:55:48.000000000
+0900
+@@ -22,6 +22,9 @@
+
+
+ #include <stdio.h>
++
++#include <vector>
++
+ #include <assert.h>
+ #include <stdlib.h>
+
diff -ruN grass-6.4.2-orig/include/iostream/minmaxheap.h
grass-6.4.2/include/iostream/minmaxheap.h
--- grass-6.4.2-orig/include/iostream/minmaxheap.h 2012-12-30
11:19:00.000000000 +0900
-+++ grass-6.4.2/include/iostream/minmaxheap.h 2012-12-30 11:58:29.000000000
+0900
++++ grass-6.4.2/include/iostream/minmaxheap.h 2013-01-03 08:41:09.000000000
+0900
@@ -491,7 +491,7 @@
T a, b;
min(a);
@@ -137,7 +150,7 @@
}
diff -ruN grass-6.4.2-orig/lib/init/init.sh grass-6.4.2/lib/init/init.sh
--- grass-6.4.2-orig/lib/init/init.sh 2012-12-30 11:19:00.000000000 +0900
-+++ grass-6.4.2/lib/init/init.sh 2012-12-30 11:22:53.000000000 +0900
++++ grass-6.4.2/lib/init/init.sh 2013-01-03 08:30:22.000000000 +0900
@@ -25,7 +25,8 @@
trap "echo 'User break!' ; exit" 2 3 15
@@ -214,7 +227,7 @@
"$ETC/clean_temp" > /dev/null
diff -ruN grass-6.4.2-orig/lib/init/init.sh.orig
grass-6.4.2/lib/init/init.sh.orig
--- grass-6.4.2-orig/lib/init/init.sh.orig 1970-01-01 09:00:00.000000000
+0900
-+++ grass-6.4.2/lib/init/init.sh.orig 2012-12-30 11:22:53.000000000 +0900
++++ grass-6.4.2/lib/init/init.sh.orig 2013-01-03 08:28:09.000000000 +0900
@@ -0,0 +1,1066 @@
+#!/bin/sh
+#############################################################################
@@ -1284,7 +1297,7 @@
+
diff -ruN grass-6.4.2-orig/macosx/Makefile grass-6.4.2/macosx/Makefile
--- grass-6.4.2-orig/macosx/Makefile 2012-12-30 11:19:00.000000000 +0900
-+++ grass-6.4.2/macosx/Makefile 2012-12-30 11:22:53.000000000 +0900
++++ grass-6.4.2/macosx/Makefile 2013-01-03 08:30:22.000000000 +0900
@@ -4,8 +4,8 @@
MACOSX_APP_NAME = GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
@@ -1336,7 +1349,7 @@
${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}
diff -ruN grass-6.4.2-orig/macosx/Makefile.orig
grass-6.4.2/macosx/Makefile.orig
--- grass-6.4.2-orig/macosx/Makefile.orig 1970-01-01 09:00:00.000000000
+0900
-+++ grass-6.4.2/macosx/Makefile.orig 2012-12-30 11:22:53.000000000 +0900
++++ grass-6.4.2/macosx/Makefile.orig 2013-01-03 08:28:10.000000000 +0900
@@ -0,0 +1,117 @@
+MODULE_TOPDIR = ..
+
@@ -1457,7 +1470,7 @@
+ -rm -rf ${ARCH_DISTDIR}/modbuild/ 2>/dev/null
diff -ruN grass-6.4.2-orig/macosx/app/build_gui_user_menu.sh
grass-6.4.2/macosx/app/build_gui_user_menu.sh
--- grass-6.4.2-orig/macosx/app/build_gui_user_menu.sh 2012-12-30
11:19:00.000000000 +0900
-+++ grass-6.4.2/macosx/app/build_gui_user_menu.sh 2012-12-30
11:22:53.000000000 +0900
++++ grass-6.4.2/macosx/app/build_gui_user_menu.sh 2013-01-03
08:30:22.000000000 +0900
@@ -13,7 +13,7 @@
GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
@@ -1469,7 +1482,7 @@
echo "Rebuilding Addon menu..."
diff -ruN grass-6.4.2-orig/macosx/app/build_html_user_index.sh
grass-6.4.2/macosx/app/build_html_user_index.sh
--- grass-6.4.2-orig/macosx/app/build_html_user_index.sh 2012-12-30
11:19:00.000000000 +0900
-+++ grass-6.4.2/macosx/app/build_html_user_index.sh 2012-12-30
11:22:53.000000000 +0900
++++ grass-6.4.2/macosx/app/build_html_user_index.sh 2013-01-03
08:30:22.000000000 +0900
@@ -19,13 +19,13 @@
GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
GRASSVERSION=`cat "$GISBASE/etc/VERSIONNUMBER"`
@@ -1486,9 +1499,217 @@
fi
write_html_header()
+diff -ruN grass-6.4.2-orig/macosx/app/build_html_user_index.sh.orig
grass-6.4.2/macosx/app/build_html_user_index.sh.orig
+--- grass-6.4.2-orig/macosx/app/build_html_user_index.sh.orig 1970-01-01
09:00:00.000000000 +0900
++++ grass-6.4.2/macosx/app/build_html_user_index.sh.orig 2013-01-03
08:28:10.000000000 +0900
+@@ -0,0 +1,188 @@
++#!/bin/sh
++
++#generates user addon HTML man pages docs/html/index.html
++# Markus Neteler, 2003, 2004, 2005, 2006
++
++# William Kyngesburye:
++# This one builds the addon index, from both the global
++# /Library/GRASS/$GRASS_MMVER/Modules and the user's
++# $HOME/Library/$GRASS_MMVER/GRASS/Modules
++# Each is in their own section, in the same index file.
++#
++# global help pages are symlinked to the user dir, so user doesn't need
perms
++# to write there for redirects.
++# main and section indexes from GRASS.app are redirected from user dir, not
++# symlinked, so relative paths stay valid.
++
++############# nothing to configure below ############
++
++GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
++GRASSVERSION=`cat "$GISBASE/etc/VERSIONNUMBER"`
++HTMLDIR="$HOME/Library/GRASS/$GRASS_MMVER/Modules/docs/html"
++HTMLDIRG="/Library/GRASS/$GRASS_MMVER/Modules/docs/html"
++
++# $1 is current path to GRASS.app/Contents/MacOS, defaults to /Applications
++if [ "$1" != "" ] ; then
++ GISBASE=$1
++else
++ GISBASE="/Applications/GRASS-$GRASS_MMVER.app/Contents/MacOS"
++fi
++
++write_html_header()
++{
++# $1: filename
++# $2: page title
++# $3: is it main index
++
++echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">
++<html>
++<head>
++ <title>$2</title>
++ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">
++ <meta name=\"Author\" content=\"GRASS Development Team\">" > $1
++if [ "$3" ] ; then
++ echo " <meta name=\"AppleTitle\" content=\"$2\">
++ <meta name=\"AppleIcon\" content=\"GRASS-$GRASS_MMVER/grass_icon.png\">
++ <meta name=\"robots\" content=\"anchors\">" >> $1
++fi
++echo " <link rel=\"stylesheet\" href=\"grassdocs.css\" type=\"text/css\">
++</head>
++<body bgcolor=\"#FFFFFF\">
++
++<img src=\"grass_logo.png\" alt=\"GRASS logo\"><hr align=center size=6
noshade>
++
++<h2>GRASS GIS $GRASSVERSION Reference Manual</h2>
++
++<p>Geographic Resources Analysis Support System, commonly referred to as
++<a href=\"http://grass.osgeo.org\";>GRASS</a>,
++is a Geographic Information System (GIS) used for geospatial data management
++and analysis, image processing, graphics/maps production, spatial modeling,
++and visualization. GRASS is currently used in academic and commercial settings
++around the world, as well as by many governmental agencies and environmental
++consulting companies.</p>
++
++<p>This reference manual details the use of modules distributed with
++Geographic Resources Analysis Support System (GRASS), an open source (GNU
++GPL'ed), image processing and geographic information system (GIS).</p>
++
++" >> $1
++}
++
++write_html_footer()
++{
++# $1: filename
++echo "<hr>" >> $1
++echo "<p><a href=\"$GISBASE/docs/html/index.html\">Help Index</a> | <a
href=\"$GISBASE/docs/html/full_index.html\">Full Index</a> | <a
href=\"$HTMLDIR/addon_index.html\">Addon Index</a><br>" >> $1
++echo "© 2003-2008 <a href=\"http://grass.osgeo.org\";>GRASS Development
Team</a></p>" >> $1
++echo "</body>" >> $1
++echo "</html>" >> $1
++}
++
++FULLINDEX=addon_index.html
++
++################
++echo "Rebuilding Addon HTML manual pages index..."
++
++#copy over CSS:
++cp -f "$GISBASE/docs/html/grassdocs.css" "$HTMLDIR/"
++#copy over GRASS logo:
++cp -f "$GISBASE/docs/html/grass_logo.png" "$HTMLDIR/"
++cp -f "$GISBASE/docs/html/grass_icon.png" "$HTMLDIR/"
++
++#process all global HTML pages:
++if [ -d "$HTMLDIRG" ] ; then
++cd "$HTMLDIRG"
++
++#get list of available GRASS modules:
++CMDLISTG=`ls -1 *.*.html 2> /dev/null | grep -v index.html | cut -d'.' -f1 |
sort -u`
++else
++CMDLISTG=""
++fi
++
++#process all user HTML pages:
++cd "$HTMLDIR"
++
++# don't really need to delete these, as removed global modules won't get
indexed,
++# though old symlinks will accumulate. I'm just worried about wildcard
deletes.
++#rm -f global_*.html
++
++#get list of available GRASS modules:
++CMDLIST=`ls -1 *.*.html 2> /dev/null | grep -v index.html | cut -d'.' -f1 |
sort -u`
++
++#write main index:
++#echo "Generating HTML manual pages index (help system)..."
++write_html_header $FULLINDEX "GRASS GIS $GRASSVERSION Addon Reference Manual"
1
++echo "<p>Command guide:</p>" >> $FULLINDEX
++echo "<table border=0>" >> $FULLINDEX
++echo "<tr><td> d.* </td><td>display
commands</td><td> ps.* </td><td>postscript commands</td></tr>" >>
$FULLINDEX
++echo "<tr><td> db.* </td><td>database
commands</td><td> r.* </td><td>raster commands</td></tr>" >>
$FULLINDEX
++echo "<tr><td> g.* </td><td>general
commands</td><td> r3.* </td><td>raster3D commands</td></tr>" >>
$FULLINDEX
++echo "<tr><td> i.* </td><td>imagery
commands</td><td> v.* </td><td>vector commands</td></tr>" >>
$FULLINDEX
++echo "<tr><td> m.* </td><td>miscellaneous commands</td></tr>" >>
$FULLINDEX
++echo "</table>" >> $FULLINDEX
++
++# global commands:
++echo "<h3>Global addon command index:</h3>" >> $FULLINDEX
++echo "<table>" >> $FULLINDEX
++if [ "$CMDLISTG" = "" ] ; then
++ echo "<tr><td valign=\"top\"><td>[There are no global addon help
pages.]</td></tr>" >> $FULLINDEX
++else
++ for i in $CMDLISTG
++ do
++ cd "$HTMLDIRG"
++ CMDLISTI="`ls -1 $i.*.html`"
++ cd "$HTMLDIR"
++ for i in $CMDLISTI
++ do
++ BASENAME=`basename $i .html`
++ SHORTDESC="`cat "$HTMLDIRG/$i" | awk '/NAME/,/SYNOPSIS/' | grep '<em>'
| cut -d'-' -f2- | sed 's+^ ++g' | grep -vi 'SYNOPSIS' | head -n 1`"
++# echo "<tr><td valign=\"top\"><a
href=\"$HTMLDIRG/$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX
++ # make them local to user to simplify page links
++ echo "<tr><td valign=\"top\"><a href=\"global_$i\">$BASENAME</a></td>
<td>$SHORTDESC</td></tr>" >> $FULLINDEX
++ ln -sf "$HTMLDIRG/$i" global_$i
++ done
++ done
++fi
++echo "</table>" >> $FULLINDEX
++
++# user commands:
++echo "<h3>User addon command index:</h3>" >> $FULLINDEX
++echo "<table>" >> $FULLINDEX
++if [ "$CMDLIST" = "" ] ; then
++ echo "<tr><td valign=\"top\"><td>[There are no user addon help
pages.]</td></tr>" >> $FULLINDEX
++else
++ for i in $CMDLIST
++ do
++ for i in `ls -1 $i.*.html`
++ do
++ BASENAME=`basename $i .html`
++ SHORTDESC="`cat $i | awk '/NAME/,/SYNOPSIS/' | grep '<em>' | cut -d'-'
-f2- | sed 's+^ ++g' | grep -vi 'SYNOPSIS' | head -n 1`"
++ echo "<tr><td valign="top"><a href=\"$i\">$BASENAME</a></td>
<td>$SHORTDESC</td></tr>" >> $FULLINDEX
++ done
++ done
++fi
++echo "</table>" >> $FULLINDEX
++
++write_html_footer $FULLINDEX
++# done full index
++
++# user redirects to app dir for main index files
++
++for i in index full_index display database general imagery misc postscript
raster raster3D vector
++do
++echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">
++<html>
++<head>
++ <title></title>
++ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">
++ <meta http-equiv=\"Refresh\" content=\"0; $GISBASE/docs/html/$i.html\">
++</head>
++<body>
++</body>
++</html>" > $i.html
++done
++
++# add Help Viewer link in user docs folder
++
++mkdir -p $HOME/Library/Documentation/Help/
++ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html
$HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
+diff -ruN grass-6.4.2-orig/macosx/app/build_html_user_index.sh.rej
grass-6.4.2/macosx/app/build_html_user_index.sh.rej
+--- grass-6.4.2-orig/macosx/app/build_html_user_index.sh.rej 1970-01-01
09:00:00.000000000 +0900
++++ grass-6.4.2/macosx/app/build_html_user_index.sh.rej 2013-01-03
08:30:22.000000000 +0900
+@@ -0,0 +1,12 @@
++***************
++*** 184,187 ****
++
++ # add Help Viewer link in user docs folder
++
++ ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html
$HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
++--- 184,188 ----
++
++ # add Help Viewer link in user docs folder
++
+++ mkdir -p $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
++ ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html
$HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
diff -ruN grass-6.4.2-orig/macosx/app/grass.sh.in
grass-6.4.2/macosx/app/grass.sh.in
--- grass-6.4.2-orig/macosx/app/grass.sh.in 2012-12-30 11:19:00.000000000
+0900
-+++ grass-6.4.2/macosx/app/grass.sh.in 2012-12-30 11:22:53.000000000 +0900
++++ grass-6.4.2/macosx/app/grass.sh.in 2013-01-03 08:30:22.000000000 +0900
@@ -32,7 +32,7 @@
grass_ver=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
@@ -1633,7 +1854,7 @@
if [ "$GRASS_GUI" = "text" ] && [ "$x11" = "tig" ] ; then
diff -ruN grass-6.4.2-orig/macosx/app/python_wrapper
grass-6.4.2/macosx/app/python_wrapper
--- grass-6.4.2-orig/macosx/app/python_wrapper 2012-12-30 11:19:00.000000000
+0900
-+++ grass-6.4.2/macosx/app/python_wrapper 2012-12-30 11:22:53.000000000
+0900
++++ grass-6.4.2/macosx/app/python_wrapper 2013-01-03 08:30:22.000000000
+0900
@@ -29,9 +29,7 @@
SYSARCH=`uname -p`
SYSVER=`uname -r | cut -d . -f 1`
@@ -1647,7 +1868,7 @@
case $SYSARCH in
diff -ruN grass-6.4.2-orig/macosx/modbuild/Makefile
grass-6.4.2/macosx/modbuild/Makefile
--- grass-6.4.2-orig/macosx/modbuild/Makefile 2012-12-30 11:19:00.000000000
+0900
-+++ grass-6.4.2/macosx/modbuild/Makefile 2012-12-30 11:22:53.000000000
+0900
++++ grass-6.4.2/macosx/modbuild/Makefile 2013-01-03 08:30:22.000000000
+0900
@@ -9,7 +9,7 @@
MACOSX_APP_NAME =
GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
endif
@@ -1666,9 +1887,20 @@
mkdir -p $(ARCH_DISTDIR)/modbuild/module
mkdir -p $(ARCH_DISTDIR)/modbuild/include/Make
-cp $(MODULE_TOPDIR)/include/Make/Dir.make
$(ARCH_DISTDIR)/modbuild/include/Make/
-@@ -44,7 +44,7 @@
- @#GISBASE = $(INST_DIR_MACOSX)\
- @#endif#g'
+@@ -38,13 +38,13 @@
+ $(MODULE_TOPDIR)/include/Make/Grass.make.in >
$(ARCH_DISTDIR)/modbuild/include/Make/Grass.make
+ @# until I figure out how to get sed to replace with multiple lines in a
+ @# makefile, GRASS_APP required for modbuild, ie no default to
/Applications
+- @#-e 's#^GISBASE.*#ifdef GRASS_APP\
+- @#GISBASE = $$(GRASS_APP)/Contents/MacOS\
+- @#else\
+- @#GISBASE = $(INST_DIR_MACOSX)\
+- @#endif#g'
++# -e 's#^GISBASE.*#ifdef GRASS_APP\
++# GISBASE = $$(GRASS_APP)/Contents/MacOS\
++# else\
++# GISBASE = $(INST_DIR_MACOSX)\
++# endif#g'
@# html.make needs a little change
- sed -e
's,GISRC=$$(RUN_GISBASE),GISRC=/Library/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$$(ARCH),g'
$(MODULE_TOPDIR)/include/Make/Html.make >
$(ARCH_DISTDIR)/modbuild/include/Make/Html.make
+ sed -e
's,GISRC=$$(RUN_GISBASE),GISRC=@PREFIX@/lib/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$$(ARCH),g'
$(MODULE_TOPDIR)/include/Make/Html.make >
$(ARCH_DISTDIR)/modbuild/include/Make/Html.make
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
