Applied patch from William for Mac OSX build. Regenerated INSTALL fro…

…m t2t doc

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8068 c8812cc2-4d05-0410-92ff-de0c093fc19c

INSTALL

@@ -38,8 +38,7 @@ Building QGIS from source - step by step
     4.5. Install subversion for OSX
     4.6. Check out QGIS from SVN
     4.7. Configure the build
-    4.8. GEOS Issues
-    4.9. Building
+    4.8. Building
   5. Building on GNU/Linux
     5.1. Building QGIS with Qt4.x
     5.2. Prepare apt
@@ -436,6 +435,8 @@ on qgis.nsi and choose the option 'Compile NSIS Script'.
 In this approach I will try to avoid as much as possible building dependencies
 from source and rather use frameworks wherever possible.
 
+Included are a few notes for building on Mac OS X 10.5 (Leopard).
+
 
 	4.1. Install XCODE
 	==================
@@ -487,7 +488,7 @@ Download William Kyngesburye's excellent all in one framework that includes
 proj, gdal, sqlite3 etc
 
 
-  http://www.kyngchaos.com/files/software/unixport/AllFrameworks.dmg 
+  http://www.kyngchaos.com/wiki/software:frameworks
 
 
 Once downloaded, open and install the frameworks.
@@ -496,7 +497,7 @@ William provides an additional installer package for Postgresql/PostGIS. Its
 available here:
 
 
-  http://www.kyngchaos.com/software/unixport/postgres 
+  http://www.kyngchaos.com/wiki/software:postgres 
 
 
 There are some additional dependencies that at the time of writing are not
@@ -546,13 +547,21 @@ Get the expat sources:
 		4.3.3. Additional Dependencies : SIP
 		====================================
 
+Make sure you have the latest Python fom 
+
+
+  http://www.python.org/download/mac/
+
+
+Leopard note: Leopard includes a usable Python 2.5.  Though you can install Python from python.org if preferred.
+
 Retrieve the python bindings toolkit SIP from
 
 
   http://www.riverbankcomputing.com/Downloads/sip4/
 
 
-Then extract and build it to a prefix of /usr/local:
+Then extract and build it (this installs by default into the Python framework):
 
 
   tar xvfz sip-<version number>.tar.gz 
@@ -563,16 +572,18 @@ Then extract and build it to a prefix of /usr/local:
   cd ..  
 
 
+Leopard notes
 
-		4.3.4. Additional Dependencies : PyQt
-		=====================================
+If building on Leopard, using Leopard's bundled Python, SIP wants to install in the system path -- this is not a good idea.  Use this configure command instead of the basic configure above:
 
-Make sure you have the latest python fom 
 
+  python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -e /usr/local/include -v /usr/local/share/sip
 
-  http://www.python.org/download/mac/
 
 
+		4.3.4. Additional Dependencies : PyQt
+		=====================================
+
 If you encounter problems compiling PyQt using the instructions 
 below you can also try adding python from your frameworks dir
 explicitly to your path e.g.
@@ -587,22 +598,35 @@ Retrieve the python bindings toolkit for Qt from
   http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/
 
 
-Then extract and build it to a prefix of /usr/local:
+Then extract and build it (this installs by default into the Python framework):
 
 
   tar xvfz PyQt-mac<version number here>
   cd PyQt-mac<version number here>
+  export QTDIR=/Developer/Applications/Qt
   python configure.py 
   yes 
   make 
   sudo make install 
   cd ..  
 
 
+Leopard notes
+
+If building on Leopard, using Leopard's bundled Python, PyQt wants to install in the system path -- this is not a good idea.  Use this configure command instead of the basic configure above:
+
+
+  python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin
+
+
+There may be a problem with undefined symbols in QtOpenGL on Leopard.  Edit QtOpenGL/makefile and add -undefined dynamic_lookup to LFLAGS.
+
 
 		4.3.5. Additional Dependencies : Bison
 		======================================
 
+Leopard note: Leopard includes Bison 2.3, so this step can be skipped on Leopard.
+
 The version of bison available by default on Mac OSX is too old so you need to
 get a more recent one on your system. Download if from:
 
@@ -643,6 +667,8 @@ Once downloaded open the dmg and run the installer
 	4.5. Install subversion for OSX
 	===============================
 
+Leopard note: Leopard includes SVN, so this step can be skipped on Leopard.
+
 The http://sourceforge.net/projects/macsvn/ (MacSVN) project has a downloadable
 build of svn. If you are a GUI inclined person you may want to grab their gui
 client too. Get the command line client here:
@@ -747,6 +773,12 @@ a pre-existing ${HOME}/apps directory ...
   cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release ..
 
 
+Leopard note: To find the custom install of SIP on Leopard, add -D SIP_BINARY_PATH=/usr/local/bin/sip to the cmake command above, before the .. at the end, ie:
+
+
+  cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release -D SIP_BINARY_PATH=/usr/local/bin/sip ..
+
+
 To use a specific GRASS version, You can optionally use the following 
 cmake invocation (with modifications to suite your system (thanks William 
 Kyngesburye for this hint):
@@ -760,17 +792,7 @@ Kyngesburye for this hint):
 
 
 
-	4.8. GEOS Issues
-	================
-
-I had some issues with GEOS headers so I made the following edits:
-
-In file /Library/Frameworks/GEOS.framework/Headers/io.h, comment out line 61
-
-In file /Library/Frameworks/GEOS.framework/Headers/geom.h, comment out line 145
-
-
-	4.9. Building
+	4.8. Building
 	=============
 
 Now we can start the build process:
@@ -1189,7 +1211,7 @@ Run these commands:
 
 
   export PATH="/usr/local/bin:/usr/local/lib:$PATH"
-  ./configure --prefix=/usr/local --bindir=/usr/local --with-includes=/usr/local/include --with-libs=/usr/local/lib --with-cxx --without-jpeg --without-tiff --without-postgres --with-opengl=windows --with-fftw --with-freetype --with-freetype-includes=/usr/local/include/freetype2 --without-x --without-tcltk --enable-x11=no --enable-shared=yes --with-proj-share=/usr/local/share/proj
+  ./configure --prefix=/usr/local --bindir=/usr/local --with-includes=/usr/local/include --with-libs=/usr/local/lib --with-cxx --without-jpeg --without-tiff --with-postgres=yes --with-postgres-includes=/local/pgsql/include --with-pgsql-libs=/local/pgsql/lib --with-opengl=windows --with-fftw --with-freetype --with-freetype-includes=/mingw/include/freetype2 --without-x --without-tcltk --enable-x11=no --enable-shared=yes --with-proj-share=/usr/local/share/proj
   make
   make install
 

INSTALL.t2t

@@ -341,6 +341,8 @@ on qgis.nsi and choose the option 'Compile NSIS Script'.
 In this approach I will try to avoid as much as possible building dependencies
 from source and rather use frameworks wherever possible.
 
+Included are a few notes for building on Mac OS X 10.5 (__Leopard__).
+
 == Install XCODE ==
 
 I recommend to get the latest xcode dmg from the Apple XDC Web site. Install
@@ -387,7 +389,7 @@ Download William Kyngesburye's excellent all in one framework that includes
 proj, gdal, sqlite3 etc
 
 ``` 
-http://www.kyngchaos.com/files/software/unixport/AllFrameworks.dmg 
+http://www.kyngchaos.com/wiki/software:frameworks
 ```
 
 Once downloaded, open and install the frameworks.
@@ -396,7 +398,7 @@ William provides an additional installer package for Postgresql/PostGIS. Its
 available here:
 
 ``` 
-http://www.kyngchaos.com/software/unixport/postgres 
+http://www.kyngchaos.com/wiki/software:postgres 
 ```
 
 There are some additional dependencies that at the time of writing are not
@@ -440,13 +442,21 @@ cd ..
 
 === Additional Dependencies : SIP ===
 
+Make sure you have the latest Python fom 
+
+```
+http://www.python.org/download/mac/
+```
+
+__Leopard note:__ Leopard includes a usable Python 2.5.  Though you can install Python from python.org if preferred.
+
 Retrieve the python bindings toolkit SIP from
 
 ``` 
 http://www.riverbankcomputing.com/Downloads/sip4/
 ```
 
-Then extract and build it to a prefix of /usr/local:
+Then extract and build it (this installs by default into the Python framework):
 
 ``` 
 tar xvfz sip-<version number>.tar.gz 
@@ -457,14 +467,16 @@ sudo make install
 cd ..  
 ```
 
-=== Additional Dependencies : PyQt ===
+__Leopard notes__
 
-Make sure you have the latest python fom 
+If building on Leopard, using Leopard's bundled Python, SIP wants to install in the system path -- this is not a good idea.  Use this configure command instead of the basic configure above:
 
 ```
-http://www.python.org/download/mac/
+python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -e /usr/local/include -v /usr/local/share/sip
 ```
 
+=== Additional Dependencies : PyQt ===
+
 If you encounter problems compiling PyQt using the instructions 
 below you can also try adding python from your frameworks dir
 explicitly to your path e.g.
@@ -479,20 +491,33 @@ Retrieve the python bindings toolkit for Qt from
 http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/
 ```
 
-Then extract and build it to a prefix of /usr/local:
+Then extract and build it (this installs by default into the Python framework):
 
 ``` 
 tar xvfz PyQt-mac<version number here>
 cd PyQt-mac<version number here>
+export QTDIR=/Developer/Applications/Qt
 python configure.py 
 yes 
 make 
 sudo make install 
 cd ..  
 ```
 
+__Leopard notes__
+
+If building on Leopard, using Leopard's bundled Python, PyQt wants to install in the system path -- this is not a good idea.  Use this configure command instead of the basic configure above:
+
+```
+python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin
+```
+
+There may be a problem with undefined symbols in QtOpenGL on Leopard.  Edit QtOpenGL/makefile and add ""-undefined dynamic_lookup"" to LFLAGS.
+
 === Additional Dependencies : Bison ===
 
+__Leopard note:__ Leopard includes Bison 2.3, so this step can be skipped on Leopard.
+
 The version of bison available by default on Mac OSX is too old so you need to
 get a more recent one on your system. Download if from:
 
@@ -529,6 +554,8 @@ Once downloaded open the dmg and run the installer
 
 == Install subversion for OSX ==
 
+__Leopard note:__ Leopard includes SVN, so this step can be skipped on Leopard.
+
 The [http://sourceforge.net/projects/macsvn/ MacSVN] project has a downloadable
 build of svn. If you are a GUI inclined person you may want to grab their gui
 client too. Get the command line client here:
@@ -628,6 +655,12 @@ cd build
 cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release ..
 ```
 
+__Leopard note:__ To find the custom install of SIP on Leopard, add ""-D SIP_BINARY_PATH=/usr/local/bin/sip"" to the cmake command above, before the "".."" at the end, ie:
+
+``` 
+cmake -D CMAKE_INSTALL_PREFIX=$HOME/apps/ -D CMAKE_BUILD_TYPE=Release -D SIP_BINARY_PATH=/usr/local/bin/sip ..
+```
+
 To use a specific GRASS version, You can optionally use the following 
 cmake invocation (with modifications to suite your system (thanks William 
 Kyngesburye for this hint):
@@ -640,14 +673,6 @@ cmake -D CMAKE_INSTALL_PREFIX=${HOME}/apps/ \
       ..
 ```
 
-== GEOS Issues ==
-
-I had some issues with GEOS headers so I made the following edits:
-
-In file /Library/Frameworks/GEOS.framework/Headers/io.h, comment out line 61
-
-In file /Library/Frameworks/GEOS.framework/Headers/geom.h, comment out line 145
-
 == Building ==
 
 Now we can start the build process: