Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21602

Modified Files:
        grass64.info qgis-mac.info 
Added Files:
        grass64.patch 
Log Message:
fixed many issues; qgis+grass now works

Index: qgis-mac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qgis-mac.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qgis-mac.info       28 Jul 2010 05:00:45 -0000      1.5
+++ qgis-mac.info       26 Aug 2010 05:45:08 -0000      1.6
@@ -3,7 +3,7 @@
 Package: qgis-mac%type_pkg[pgsql]%type_pkg[grass]
 Type: pgsql (. -pgsql), grass (. -grass)
 Architecture: powerpc, i386, x86_64
-Distribution: (%type_raw[grass] = .) 10.4, (%type_raw[grass] = .) 10.5, 
(%type_raw[grass] = -grass) 10.5, (%type_raw[grass] = .) 10.6
+Distribution: (%type_raw[grass] = .) 10.4, (%type_raw[grass] = .) 10.5, 
(%type_raw[grass] = -grass) 10.5, (%type_raw[grass] = .) 10.6, 
(%type_raw[grass] = -grass) 10.6
 Conflicts: qgis-mac, qgis-mac-pgsql, qgis-mac-grass, qgis-mac-pgsql-grass
 Replaces: qgis-mac, qgis-mac-pgsql, qgis-mac-grass, qgis-mac-pgsql-grass
 
@@ -51,9 +51,9 @@
        libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002), 
libpng3, netcdf (>= 3.6.0-1002), cfitsio,
        libgeos3, libgeosc1,
        gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev, 
-       (type_pkg[64bit] = .) libspatialite1 | (type_pkg[64bit] = -64bit) 
libspatialite1-64bit,
+       libspatialite1 | libspatialite1-64bit,
        (%type_raw[pgsql] = -pgsql) postgresql83-dev, 
-       (%type_raw[grass] = -grass) grass64-dev | (%type_raw[grass] = -grass) 
grass64-pgsql-dev, 
+       (%type_raw[grass] = -grass) grass64-mac-dev | (%type_raw[grass] = 
-grass) grass64-x11-dev, 
        proj (>=4)
 <<
 
@@ -132,7 +132,7 @@
     
     touch ../src/mac/Contents/SVN_MARKER-NOTFOUND
     
-    make
+    make VERBOSE=1
     cd ..
 # End of CompileScript
 <<
@@ -149,6 +149,9 @@
         install_name_tool -id 
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib" 
libqgis_analysis.%v.dylib
         install_name_tool -id 
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_gui.%v.dylib" 
libqgis_gui.%v.dylib
         install_name_tool -id 
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgispython.%v.dylib" 
libqgispython.%v.dylib
+       if [ "%type_raw[grass]" == "-grass" ]; then
+        install_name_tool -id 
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib" 
libqgisgrass.%v.dylib
+       fi
        popd
        
        # Workaround to SJIS problem
@@ -196,9 +199,9 @@
        gsl-shlibs,
        libgeos3-shlibs, libgeosc1-shlibs,
        gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs| 
gdal-pgsql-mysql-shlibs, 
-        (type_pkg[64bit] = .) libspatialite1-shlibs | (type_pkg[64bit] = 
-64bit) libspatialite1-64bit-shlibs,
+        libspatialite1-shlibs | libspatialite1-64bit-shlibs,
        (%type_raw[pgsql] = -pgsql) postgresql83-shlibs, (%type_raw[pgsql] = 
-pgsql) postgis83,
-       (%type_raw[grass] = -grass) grass64-shlibs | (%type_raw[grass] = 
-grass) grass64-pgsql-shlibs, 
+       (%type_raw[grass] = -grass) grass64-mac-shlibs | (%type_raw[grass] = 
-grass) grass64-x11-shlibs, 
        proj-shlibs (>=4)
   <<
   Files: <<

Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/grass64.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- grass64.info        16 Aug 2010 18:00:32 -0000      1.5
+++ grass64.info        26 Aug 2010 05:45:08 -0000      1.6
@@ -1,62 +1,84 @@
 Info2: <<
-Package: grass64%type_pkg[pgsql]
-Type: pgsql (. -pgsql)
-Distribution: 10.5
+Package: grass64%type_pkg[gui]
+Type: gui (-mac -x11)
+Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5, 
(%type_raw[gui] = -mac) 10.6
 Version: 6.4.0
-Revision: 4
-
-Conflicts: grass64, grass64-pgsql
-Replaces: grass64, grass64-pgsql
+Revision: 5
+Conflicts: grass64, grass64-mac, grass64-x11
+Replaces: grass64, grass64-mac, grass64-x11
 
 Description: Powerful GIS software
 License: GPL
 Homepage: http://grass.itc.it
-Maintainer: None <fink-de...@lists.sourceforge.net>
+Maintainer: Kurt Schwehr <goat...@users.sourceforge.net>
 DescDetail: <<
-Very Powerful Geographical Information System with CLI and GUI.
+Very Powerful Geographical Information System with CLI and GUI. 
+
+PostgreSQL: 8.3
+Python: 2.6
+SQLite: 3
+
+Mac version (10.6 only) uses Mac's TclTk.
+
+X11 version uses Fink's TclTk and lacks OpenGL/NVIZ support.
 <<
+
 DescUsage: <<
-Double click GRASS.app in %p/Applications
+Just type '%n -text' or '%n -gui' at the command prompt 
+inside an X environment.
 <<
 
 # Dependencies.
 Depends: <<
-       %n-shlibs (=%v-%r), freetype219-shlibs
+       %n-shlibs (=%v-%r)
 <<
 BuildDepends: <<
-    fink (>= 0.28), xcode (>= 3.1),
+    fink (>= 0.28),
+        ncurses-dev,
        libiconv-dev, readline5, libgettext3-dev, gettext-tools,
-       fftw3, freetype219,
-       gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev, 
-       libjpeg, libpng3, libtiff, proj,
+       fftw3,
+       gdal-dev, 
+       libjpeg, libpng3, libtiff,
        unixodbc2 | unixodbc2-nox,
        szip, hdf5-18 | hdf5, xerces-c-dev, libogdi3,
-       (%type_raw[pgsql] = -pgsql) postgresql83-dev,
-       ncurses-dev
+       postgresql83-dev,
+       python26,
+       sqlite3-dev,
+       (%type_raw[gui] = -x11) wxgtk2.8-py26-dev
 <<
 
-Source: http://grass.itc.it/grass64/source/grass-%vRC5.tar.gz
-Source-MD5: 4689a50c5fd66c1e0493ec127081e142
+Source: http://grass.itc.it/grass64/source/grass-%vRC6.tar.gz
+Source-MD5: cbb98b579155f8e9864b4e98e4423568
 
+# Patch Phase.
+PatchFile: grass64.patch
+PatchFile-MD5: 20a639ed0078627ed6acd265a4026138
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 
 # Compile Phase.
 SetCFLAGS: -I%p/include
-SetLDFLAGS: -L%p/lib
+SetLDFLAGS: -L%p/lib -lcurses
 
-ConfigureParams: --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=/usr/lib 
--with-sqlite-includes=/usr/include --with-fftw-includes=%p/include 
--with-fftw-libs=%p/lib --with-cxx 
--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-opengl-libs="-framework OpenGL -framework OpenGLU -framework AGL" 
--without-x --without-motif --without-glw --without-readline 
--prefix=%p/Applications --enable-macosx-app
+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 --with-opengl-libs="-framework OpenGL 
-framework OpenGLU -framework AGL" --without-motif --without-glw 
--without-readline --with-python=%p/bin/python2.6-config 
--prefix=%p/Applications --enable-macosx-app
 
 
 
 CompileScript: <<
 #!/bin/bash -xe
-  if [ "%type_raw[pgsql]" == "." ]; then
-    ./configure %c --without-postgres
+  
+  PGSQLPARAM=" --with-postgres --with-postgres-includes=%p/include/postgresql "
+
+  if [ "%type_raw[gui]" == "-mac" ]; then
+    ./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"
+    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
+    perl -pi -e "s|^TCLTKLIBPATH|TCLTKLIBPATH        =  -framework Tcl 
-framework Tk #|" include/Make/Platform.make
+    perl -pi -e "s|^TCLTKLIBS|TCLTKLIBS           =  #|" 
include/Make/Platform.make
   else
-    ./configure %c --with-postgres  
--with-postgres-includes=%p/include/postgresql
+    ./configure %c $PGSQLPARAM --with-x --x-includes=/usr/X11R6/include 
--x-libraries=/usr/X11R6/lib --with-tcltk-includes=%p/include 
--with-tcltk-libs=%p/lib --with-wxwidgets=%p/bin/wx-config --with-opengl=no
   fi
-    
-  # Overwrites TCLTKLIBS (='-ltcl -ltk')
-  make TCLTKLIBPATH='-framework Tcl -framework Tk' TCLTKLIBS=''
+    # INST_DIR is set to set dylib install name
+    make INST_DIR='%p/Applications/GRASS-6.4.app/Contents/MacOS'
 <<
 
 
@@ -64,57 +86,12 @@
 # Install Phase.
 InstallScript: <<
 #!/bin/sh -xe
-  make install INST_DIR='%i/Applications/GRASS-6.4.app/Contents/MacOS'
-  
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.%vRC5.dylib"
 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.%vRC5.dylib"
 %i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.%vRC5.dylib"
 %i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.%vRC5.dylib"
 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.%vRC5.dylib"
 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.%vRC5.dylib"
 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.%vRC5.dylib"
 %i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.%vRC5.dylib"
 %i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.%vRC5.dylib"
 %i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.%vRC5.dylib
-  install_name_tool -id 
"%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.%vRC5.dylib" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.%vRC5.dylib
+  make install INST_DIR='%i' GISBASE_SYSTEM='%i/lib/GRASS/%v'
+  if [ "%type_raw[gui]" == "-mac" ]; then
+    perl -pi -e "s|MACOSX11|%p|g" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/grass.sh
+  else
+    perl -pi -e "s|MACOSX11|/usr/local|g" 
%i/Applications/GRASS-6.4.app/Contents/MacOS/grass.sh
+  fi
 <<
 DocFiles: 
 
@@ -130,112 +107,10 @@
   Package: %N-dev
   Description: GRASS Development Headers
   Depends: %N-shlibs (= %v-%r)
-  Conflicts: grass64-dev, grass64-pgsql-dev
-  Replaces: grass64-dev, grass64-pgsql-dev
+  Conflicts: grass64-dev, grass64-mac-dev, grass64-x11-dev
+  Replaces: grass64-dev, grass64-mac-dev, grass64-x11-dev
   BuildDependsOnly: true
-  Files: <<
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_iostream.a
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ismap.a
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_manage.a
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.dylib
-    Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.dylib
-  <<
-  Shlibs: <<
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.dylib
-    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.dylib
-  <<
+  Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.a
   DocFiles:
 <<
 
@@ -247,80 +122,125 @@
 SplitOff2: <<
   Package: %N-shlibs
   Description: GRASS Shared Libraries
-  Conflicts: grass64-shlibs, grass64-pgsql-shlibs
-  Replaces: grass64-shlibs, grass64-pgsql-shlibs
+  Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
+  Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
   Depends: <<
+       ncurses-shlibs,
        fftw3-shlibs, 
-       gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs| 
gdal-pgsql-mysql-shlibs, 
-       gettext, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs, proj-shlibs,
-       (%type_raw[pgsql] = -pgsql) postgresql83-shlibs,
-       unixodbc2-shlibs | unixodbc2-nox-shlibs
+       gdal-shlibs, 
+       gettext, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
+       postgresql83-shlibs,
+       python26-shlibs,
+       sqlite3-shlibs,
+       unixodbc2-shlibs | unixodbc2-nox-shlibs,
+       (%type_raw[gui] = -x11) wxgtk2.8-py26
 <<
-  Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.%v*.dylib
+  Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.dylib 
lib/GRASS
   Shlibs: <<
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.%vRC5.dylib
 6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.%vRC5.dylib
 6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.%vRC5.dylib
 6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.%vRC5.dylib
 6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
-    
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.%vRC5.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.%vRC6.dylib
+    (%type_raw[gui] = -x11) 
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_Iortho.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.%vRC6.dylib
+    (%type_raw[gui] = -mac) 
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.%vRC6.dylib
+    (%type_raw[gui] = -mac) 
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.%vRC6.dylib
+    !%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.%vRC6.dylib
+    
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.%vRC6.dylib
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib 6.4.0 %n 
(>= 6.4.0-1) 32
+    (%type_raw[gui] = -x11) 
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_Iortho.dylib 6.4.0 %n 
(>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_btree.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cdhc.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_cluster.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_datetime.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmibase.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmiclient.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbmidriver.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dbstubs.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dgl.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dig2.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_display.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_driver.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_dspf.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_edit.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_form.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_g3d.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gis.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gmath.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gpde.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_gproj.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpdata.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_interpfl.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lidar.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_linkm.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_lrs.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    (%type_raw[gui] = -mac) 
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_nviz.dylib 6.4.0 %n 
(>= 6.4.0-1) 32
+    (%type_raw[gui] = -mac) 
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_ogsf.dylib 6.4.0 %n 
(>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_pngdriver.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_psdriver.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_qtree.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_raster.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rli.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rowio.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_rtree.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_segment.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_shape.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sim.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sites.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_sqlp.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_stats.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_symb.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_trans.dylib 
6.4.0 %n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.dylib 6.4.0 
%n (>= 6.4.0-1) 32
+    %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.dylib 
6.4.0 %n (>= 6.4.0-1) 32
   <<
   DocFiles:
 <<
-DescPort: <<
-Based on standard configure options. Non-standard configured variants are 
-also avaiable, e.g. grass64-pgsql for PostgreSQL support.
 
-OpenGL is currently disabled due to build time erros in visualization/nviz.
 
-Uses MacOSX's TclTk because visualization/nviz uses OS's tcltk.
+DescPort:
 
-Will start adding additional configure features back into the package down the 
road.
-<<
-DescPackaging: <<
-Previous versions by Kurt Schwehr <goat...@users.sourceforge.net>
-<<
 # End of Info2
 <<

--- NEW FILE: grass64.patch ---
diff -ruN grass-6.4.0RC6-orig/lib/init/init.sh grass-6.4.0RC6/lib/init/init.sh
--- grass-6.4.0RC6-orig/lib/init/init.sh        2010-02-19 06:14:41.000000000 
+0900
+++ grass-6.4.0RC6/lib/init/init.sh     2010-08-07 13:19:43.000000000 +0900
@@ -302,7 +302,8 @@
 
 if [ ! "$GRASS_PYTHON" ] ; then
     if [ "$MACOSX" ] ; then
-        GRASS_PYTHON=pythonw
+       # Fink's python does not include pythonw
+        GRASS_PYTHON=python
     else
         GRASS_PYTHON=python
     fi
diff -ruN grass-6.4.0RC6-orig/macosx/Makefile grass-6.4.0RC6/macosx/Makefile
--- grass-6.4.0RC6-orig/macosx/Makefile 2010-02-19 06:16:31.000000000 +0900
+++ grass-6.4.0RC6/macosx/Makefile      2010-08-03 08:19:13.000000000 +0900
@@ -4,8 +4,8 @@
 
 MACOSX_APP_NAME = GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
 MACOSX_APPDIR = ${MACOSX_APP_NAME}/Contents/MacOS
-INST_DIR_MACOSX = ${prefix}/${MACOSX_APPDIR}
-MACOSX_SUPPDIR = /Library/GRASS/${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
+INST_DIR_MACOSX = ${INST_DIR}/Applications/${MACOSX_APPDIR}
+MACOSX_SUPPDIR = 
${INST_DIR}/lib/GRASS/${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
 MACOSX_BUNDLE_PREFIX = ${GRASS_HOME}/macosx/dist/${MACOSX_APPDIR}
 VER_MINOR_REL = `printf "%d0%d" ${GRASS_VERSION_MINOR} 
${GRASS_VERSION_RELEASE}`
 VER_DATE = `date +"%g%m%d"`
@@ -50,12 +50,12 @@
 
 # Duplicated, mostly, from the top-level makefile.
 
-real-install-macosx: INST_DIR_TARGET = ${INST_DIR}
-real-install-macosx: PREFIX_TARGET = ${prefix}
+real-install-macosx: INST_DIR_TARGET = ${INST_DIR_MACOSX}
+real-install-macosx: PREFIX_TARGET = ${INST_DIR}
 real-install-macosx: install-basic-macosx macosx-support-dir bundle-macosx
        -cd ${GISBASE} ; tar cBf - modbuild | (cd ${MACOSX_SUPPDIR} ; tar xBf - 
) 2>/dev/null
        @# help file package
-       ${LN_DIR} "${INST_DIR_TARGET}/docs/html" 
/Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
+       @# ${LN_DIR} "${INST_DIR_TARGET}/docs/html" 
${INST_DIR}/share/doc/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}
 
 # create a packagemaker installer package.
 # pretty much the same as install, but needs intermediate install location
@@ -85,7 +85,7 @@
 
 install-basic-macosx:
        ${MAKE_DIR_CMD} ${INST_DIR_TARGET}
-       -cd ${GISBASE} ; tar cBf - ${MACOSX_APP_NAME} | (cd ${PREFIX_TARGET} ; 
tar xBf - ) 2>/dev/null
+       -cd ${GISBASE} ; tar cBf - ${MACOSX_APP_NAME} | (cd 
${PREFIX_TARGET}/Applications ; tar xBf - ) 2>/dev/null
        -cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR_TARGET} ; tar xBf 
- ) 2>/dev/null
        -cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR_TARGET} ; tar xBf - ) 
2>/dev/null
        -cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR_TARGET} ; tar xBf - 
) 2>/dev/null
@@ -99,10 +99,10 @@
        -cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR_TARGET} ; tar xBf - 
) 2>/dev/null
        -cd ${GISBASE} ; tar cBf - lib | (cd ${INST_DIR_TARGET} ; tar xBf - ) 
2>/dev/null
        -sed 's#'${GISBASE}'#'${INST_DIR_TARGET}'#g' ${GISBASE}/etc/monitorcap 
> ${INST_DIR_TARGET}/etc/monitorcap
-       -chmod -R a+rX ${PREFIX_TARGET}/${MACOSX_APP_NAME} 2>/dev/null
+       -chmod -R a+rX ${PREFIX_TARGET}/Applications/${MACOSX_APP_NAME} 
2>/dev/null
        -cd ${GRASS_HOME} ; tar cBf - gem/skeleton | (cd ${INST_DIR_TARGET}/etc 
; tar xBf - ) 2>/dev/null
        -${INSTALL} ${GRASS_HOME}/gem/gem6 ${INST_DIR_TARGET} 2>/dev/null
-       -touch ${PREFIX_TARGET}/${MACOSX_APP_NAME}
+       -touch ${PREFIX_TARGET}/Applications/${MACOSX_APP_NAME}
 
 macosx-support-dir:
        ${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}
diff -ruN grass-6.4.0RC6-orig/macosx/app/build_html_user_index.sh 
grass-6.4.0RC6/macosx/app/build_html_user_index.sh
--- grass-6.4.0RC6-orig/macosx/app/build_html_user_index.sh     2008-12-20 
05:29:47.000000000 +0900
+++ grass-6.4.0RC6/macosx/app/build_html_user_index.sh  2010-08-07 
15:24:16.000000000 +0900
@@ -19,7 +19,7 @@
 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"
+HTMLDIRG="@PREFIX@/lib/GRASS/$GRASS_MMVER/Modules/docs/html"
 
 # $1 is current path to GRASS.app/Contents/MacOS, defaults to /Applications
 if [ "$1" != "" ] ; then
@@ -183,5 +183,5 @@
 done
 
 # 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.0RC6-orig/macosx/app/grass.sh.in 
grass-6.4.0RC6/macosx/app/grass.sh.in
--- grass-6.4.0RC6-orig/macosx/app/grass.sh.in  2010-02-19 06:16:28.000000000 
+0900
+++ grass-6.4.0RC6/macosx/app/grass.sh.in       2010-08-07 17:54:15.000000000 
+0900
@@ -32,7 +32,7 @@
 grass_ver=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
 
 GISBASE_USER="$HOME/Library/GRASS/$grass_ver"
-GISBASE_SYSTEM="/Library/GRASS/$grass_ver"
+GISBASE_SYSTEM="@PREFIX@/lib/GRASS/$grass_ver"
 
 # for extra utils
 # ideally user should have these in their PATH, but make sure here
@@ -96,47 +96,49 @@
 # assume user TclTk progs in default build location /usr/local/bin.
 # check even if /usr/local/bin not in PATH, this is where Aqua will be
 # also assume matching tclsh alongside wish
-if [ ! "$GRASS_WISH" ] ; then
-       gwish=""
-       gtclsh=""
-       if [ -e "/usr/local/bin/wish8.5" ] ; then
-               gwish="/usr/local/bin/wish8.5"
-               gtclsh="/usr/local/bin/tclsh8.5"
-       else
-               # check for any other wish8.5
-               wish85=`type -p wish8.5`
-               tclsh85=`type -p tclsh8.5`
-               if [ "$wish85" ] ; then
-                       gwish="$wish85"
-                       gtclsh="$tclsh85"
-               else
-                       # check for any wish8.4
-                       wish84=`type -p wish8.4`
-                       tclsh84=`type -p tclsh8.4`
-                       if [ ! "$wish84" ] ; then
-                               # or maybe /usr/local/bin not in PATH
-                               wish84="/usr/local/bin/wish8.4"
-                               tclsh84="/usr/local/bin/tclsh8.4"
-                       fi
-                       if [ -e "$wish84" ] ; then
-                               # make sure it's not aqua
-                               # aqua wish is a shell script that starts 
framework wish
-                               if [ "`file $wish84 | grep 'shell script'`" ] ; 
then
-                                       echo "Warning: TclTk Aqua 8.4 
unsupported"
-                               else
-                                       gwish="$wish84"
-                                       gtclsh="$tclsh84"
-                               fi
-                       fi
-               fi
-       fi
-       if [ "$gwish" ] ; then
-               GRASS_WISH="$gwish"
-               export GRASS_WISH
-               GRASS_TCLSH="$gtclsh"
-               export GRASS_TCLSH
-       fi
-fi
+#if [ ! "$GRASS_WISH" ] ; then
+#      gwish=""
+#      gtclsh=""
+#      if [ -e "/usr/local/bin/wish8.5" ] ; then
+#              gwish="/usr/local/bin/wish8.5"
+#              gtclsh="/usr/local/bin/tclsh8.5"
+#      else
+#              # check for any other wish8.5
+#              wish85=`type -p wish8.5`
+#              tclsh85=`type -p tclsh8.5`
+#              if [ "$wish85" ] ; then
+#                      gwish="$wish85"
+#                      gtclsh="$tclsh85"
+#              else
+#                      # check for any wish8.4
+#                      wish84=`type -p wish8.4`
+#                      tclsh84=`type -p tclsh8.4`
+#                      if [ ! "$wish84" ] ; then
+#                              # or maybe /usr/local/bin not in PATH
+#                              wish84="/usr/local/bin/wish8.4"
+#                              tclsh84="/usr/local/bin/tclsh8.4"
+#                      fi
+#                      if [ -e "$wish84" ] ; then
+#                              # make sure it's not aqua
+#                              # aqua wish is a shell script that starts 
framework wish
+#                              if [ "`file $wish84 | grep 'shell script'`" ] ; 
then
+#                                      echo "Warning: TclTk Aqua 8.4 
unsupported"
+#                              else
+#                                      gwish="$wish84"
+#                                      gtclsh="$tclsh84"
+#                              fi
+#                      fi
+#              fi
+#      fi
+#      if [ "$gwish" ] ; then
+#              GRASS_WISH="$gwish"
+#              export GRASS_WISH
+#              GRASS_TCLSH="$gtclsh"
+#              export GRASS_TCLSH
+#      fi
+#fi
+       gwish="/MACORX11/bin/wish"
+       gtclsh="/MACORX11/bin/tclsh"
 
 ### X11 stuff
 
@@ -240,6 +242,7 @@
        echo "Warning: No Python $pyver_want found, needed by wxPython."
        echo "         The wxPython GUI may not work properly."
 fi
+GRASS_PYTHONWX="python"
 export GRASS_PYTHONWX
 # we will execute python scripts from the python wrapper script
 GRASS_PYTHON="python"
diff -ruN grass-6.4.0RC6-orig/macosx/app/python_wrapper 
grass-6.4.0RC6/macosx/app/python_wrapper
--- grass-6.4.0RC6-orig/macosx/app/python_wrapper       2010-02-19 
06:16:28.000000000 +0900
+++ grass-6.4.0RC6/macosx/app/python_wrapper    2010-08-07 14:14:53.000000000 
+0900
@@ -32,6 +32,7 @@
 if [ ! "$GRASS_PYTHONWX" ] ; then
        GRASS_PYTHONWX="pythonw"
 fi
+GRASS_PYTHONWX="python"
 # can't run python 64bit if wx not 64bit, assume OSX 10.5+  possible 64bit
 if [ $(($SYSVER)) -gt 5 ] && [ "$GRASS_WX64BIT" = "0" ] ; then
        case $SYSARCH in
diff -ruN grass-6.4.0RC6-orig/macosx/modbuild/Makefile 
grass-6.4.0RC6/macosx/modbuild/Makefile
--- grass-6.4.0RC6-orig/macosx/modbuild/Makefile        2009-05-03 
17:15:32.000000000 +0900
+++ grass-6.4.0RC6/macosx/modbuild/Makefile     2010-08-07 14:11:32.000000000 
+0900
@@ -9,7 +9,7 @@
        MACOSX_APP_NAME = 
GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
 endif
 MACOSX_APPDIR = ${MACOSX_APP_NAME}/Contents/MacOS
-INST_DIR_MACOSX = ${prefix}/${MACOSX_APPDIR}
+INST_DIR_MACOSX = ${INST_DIR}/Applications/${MACOSX_APPDIR}
 
 default: modbuild
 
@@ -19,7 +19,7 @@
        -cp -f ReadMe.rtf $(ARCH_DISTDIR)/modbuild/
        mkdir -p $(ARCH_DISTDIR)/modbuild/dist.$(ARCH)
        -cp -rf $(ARCH_DISTDIR)/demolocation 
$(ARCH_DISTDIR)/modbuild/dist.$(ARCH)/
-       -sed -e 's,^GISDBASE.*,GISDBASE = 
/Library/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$(ARCH),g'
 
$(ARCH_DISTDIR)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 > 
$(ARCH_DISTDIR)/modbuild/dist.$(ARCH)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
+       -sed -e 's,^GISDBASE.*,GISDBASE = 
@PREFIX@/lib/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$(ARCH),g'
 
$(ARCH_DISTDIR)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 > 
$(ARCH_DISTDIR)/modbuild/dist.$(ARCH)/demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
        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'
        @# 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),gis...@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
        -cp $(MODULE_TOPDIR)/include/Make/Lib.make 
$(ARCH_DISTDIR)/modbuild/include/Make/
        -cp $(MODULE_TOPDIR)/include/Make/Man.make 
$(ARCH_DISTDIR)/modbuild/include/Make/
        sed -e 's,$$(DEPENDENCIES),,g' 
$(MODULE_TOPDIR)/include/Make/Module.make > 
$(ARCH_DISTDIR)/modbuild/include/Make/Module.make


------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users 
worldwide. Take advantage of special opportunities to increase revenue and 
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to