qgis · May 8, 2011
diff --git a/‎INSTALL
Lines changed: 98 additions & 137 deletions b/‎INSTALL
Lines changed: 98 additions & 137 deletions
diff --git a/‎doc/osx.t2t
Lines changed: 84 additions & 154 deletions b/‎doc/osx.t2t
Lines changed: 84 additions & 154 deletions
@@ -2,8 +2,8 @@ Quantum GIS (QGIS)
 Building QGIS from source - step by step
 
 
-Last update: 20110426
-Last change: 20110404
+Last update: 20110508
+Last change: 20110508
 
 
   1. Introduction
@@ -22,12 +22,12 @@ Last change: 20110404
     4.1. Building with Microsoft Visual Studio
     4.2. Building using MinGW
     4.3. Creation of MSYS environment for compilation of Quantum GIS
-  5. MacOS X: building using frameworks and Cmake
-    5.1. Install Qt4 from .dmg
+  5. Building on MacOS X
+    5.1. Install Qt4 from disk image
     5.2. Install development frameworks for QGIS dependencies
     5.3. Install CMake for OSX
-    5.4. Install subversion for OSX
-    5.5. Check out QGIS from SVN
+    5.4. Install git for OSX
+    5.5. Check out QGIS from git
     5.6. Configure the build
     5.7. Building
   6. Authors and Acknowledgments
@@ -1160,14 +1160,14 @@ We're done with preparation of MSYS environment. Now you can delete all stuff in
 of space and it's not necessary at all.
 
 
-  5. MacOS X: building using frameworks and Cmake
-  ===============================================
+  5. Building on MacOS X
+  ======================
 
 In this approach I will try to avoid as much as possible building dependencies
 from source and rather use frameworks wherever possible.
 
 The base system here is Mac OS X 10.4 (Tiger), with a single architecture build.
-Included are a few notes for building on Mac OS X 10.5 (Leopard) and 10.6 (Snow Leopard).
+Included are notes for building on Mac OS X 10.5 (Leopard) and 10.6 (Snow Leopard).
 Make sure to read each section completely before typing the first command you see.
 
 General note on Terminal usage:  When I say "cd" to a folder in a Terminal,
@@ -1192,25 +1192,26 @@ ie: Mac Pro "8 Core" model (2 quad core processors) = 8
 ie: Macbook Pro i5 (hyperthreading) = 2 cores X 2 = 4
 
 
-  5.1. Install Qt4 from .dmg
-  ==========================
+  5.1. Install Qt4 from disk image
+  ================================
 
-You need a minimum of Qt-4.4.0. I suggest getting the latest.
+You need a minimum of Qt-4.4.0. I suggest getting the latest.  There is no need for the full Qt SDK, so save yourself some download time and get the frameworks only.
 
 Snow Leopard note: If you are building on Snow Leopard, you will need to
 decide between 32-bit support in the older, Qt Carbon branch, or 64-bit
 support in the Qt Cocoa branch. Appropriate installers are available for both
 as of Qt-4.5.2.  Qt 4.6+ is recommended for Cocoa.
 
-PPC note: There appear to be issues with Qt Cocoa on PPC Macs.  QT Carbon
-is recommended on PPC Macs.
+PPC note: The readymade Qt Cocoa installers don't include PPC support, you'd
+have to compile Qt yourself.  But, there appear to be issues with Qt Cocoa on PPC
+Macs anyyways.  QT Carbon is recommended on PPC Macs.
 
-  http://qt.nokia.com/downloads
+http://qt.nokia.com/downloads
 
-If you want debug frameworks, Qt also provides a dmg with these.  These are in
-addition to the non-debug frameworks.
+If you want debug frameworks, Qt also provides a separate download with these.
+These are in addition to the non-debug frameworks.
 
-Once downloaded open the dmg and run the installer. Note you need admin
+Once downloaded open the disk image and run the installer. Note you need admin
 privileges to install.
 
 Qt note: Starting in Qt 4.4, libQtCLucene was added, and in 4.5
@@ -1230,10 +1231,10 @@ CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
   =========================================================
 
 Download William Kyngesburye's excellent GDAL Complete package that includes
-PROJ, GEOS, GDAL, SQLite3, and image libraries, as frameworks.  There is also
-a GSL framework.
+PROJ, GEOS, GDAL, SQLite3, Spatialite, and image libraries, as frameworks.
+There is also a GSL framework.
 
-  http://www.kyngchaos.com/wiki/software/frameworks
+http://www.kyngchaos.com/wiki/software/frameworks
 
 Once downloaded, open and install the frameworks.
 
@@ -1242,11 +1243,11 @@ Qgis just needs the libpq client library, so unless you want to setup the full
 Postgres + PostGIS server, all you need is the client-only package.
 It's available here:
 
-  http://www.kyngchaos.com/wiki/software/postgres 
+http://www.kyngchaos.com/wiki/software/postgres 
 
 Also available is a GRASS application:
 
-  http://www.kyngchaos.com/wiki/software/grass
+http://www.kyngchaos.com/wiki/software/grass
 
 
     5.2.1. Additional Dependencies: General compatibility note
@@ -1272,7 +1273,7 @@ not necessary on Snow Leopard.
 
 Get the expat sources:
 
-  http://sourceforge.net/project/showfiles.php?group_id=10127 
+http://sourceforge.net/project/showfiles.php?group_id=10127 
 
 Double-click the source tarball to unpack, then, in Terminal.app, cd to the source folder and:
 
@@ -1290,7 +1291,7 @@ Leopard and Snow Leopard. You can still install Python from python.org if prefer
 
 If installing from python.org, make sure you install at least the latest Python 2.x from 
 
-  http://www.python.org/download/
+http://www.python.org/download/
 
 Python 3 is a major change, and may have compatibility issues, so try it at your own risk.
 
@@ -1300,31 +1301,33 @@ Python 3 is a major change, and may have compatibility issues, so try it at your
 
 Retrieve the python bindings toolkit SIP from
 
-  http://www.riverbankcomputing.com/software/sip/download
+http://www.riverbankcomputing.com/software/sip/download
 
-Double-click the source tarball to unpack it, then, in Terminal.app, cd to the source folder
-and (this installs by default into the Python framework, and is appropriate only for 
-python.org Python installs):
+Double-click the source tarball to unpack it, then, in Terminal.app,
+cd to the source folder.  Then for your chosen Python:
+
+python.org Python
 
   python configure.py 
   make 
   sudo make install 
 
-Leopard notes
+Leopard system Python
 
-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:
+SIP wants to install in the system path -- this is not a good idea.
+More configuration is needed to install outside the system path:
 
   python configure.py -n -d /Library/Python/2.5/site-packages -b /usr/local/bin \
   -e /usr/local/include -v /usr/local/share/sip -s MacOSX10.5.sdk
 
-Snow Leopard notes
+Snow Leopard system Python
 
 Similar to Leopard, you should install outside the system Python path.
 Also, you need to specify the architecture you want (requires at least SIP 4.9),
 and make sure to run the versioned python binary (this one responds to the
-'arch' command, 'python' does not). If you are using 32-bit Qt (Qt Carbon):
+'arch' command, 'python' does not).
+
+If you are using 32-bit Qt (Qt Carbon):
 
   python2.6 configure.py -n -d /Library/Python/2.6/site-packages -b /usr/local/bin \
   -e /usr/local/include -v /usr/local/share/sip --arch=i386 -s MacOSX10.6.sdk
@@ -1340,44 +1343,30 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
 
 Retrieve the python bindings toolkit for Qt from
 
-  http://www.riverbankcomputing.com/software/pyqt/download
+http://www.riverbankcomputing.com/software/pyqt/download
+
+Double-click the source tarball to unpack it, then, in Terminal.app,
+cd to the source folder.  Then for your chosen Python:
 
-Double-click the source tarball to unpack it, then, in Terminal.app, cd to the source folder
-and (this installs by default into the Python framework, and is appropriate only for
-python.org Python installs):
+python.org Python
 
   python configure.py 
   yes 
 
-There is a problem with the configuration that needs to be fixed now
-(it affects PyQwt compilation later).  Edit pyqtconfig.py and change the qt_dir line to:
-
-      'qt_dir': '/usr',
-
-Then continue with compilation and installation (this is a good place to use
-parallel compilation, if you can):
+Leopard system Python
 
-  make 
-  sudo make install 
-
-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:
+PyQt wants to install in the system path -- this is not a good idea.
+More configuration is needed to install outside the system path:
 
   python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin
 
-If there is a problem with undefined symbols in QtOpenGL on Leopard, edit
-QtOpenGL/makefile and add -undefined dynamic_lookup to LFLAGS.
-Then make again.
-
-Snow Leopard notes
+Snow Leopard system Python
 
 Similar to Leopard, you should install outside the system Python path.
 Also, you need to specify the architecture you want (requires at least PyQt 4.6),
 and make sure to run the versioned python binary (this one responds to the
 'arch' command, which is important for pyuic4, 'python' does not).
+
 If you are using 32-bit Qt (Qt Carbon):
 
   python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin --use-arch i386
@@ -1386,40 +1375,41 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
 
   python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin --use-arch x86_64
 
+continue...
+
+There is a problem with the configuration that needs to be fixed now
+(it affects PyQwt compilation later).  Edit pyqtconfig.py and change the qt_dir line to:
+
+      'qt_dir': '/usr',
+
+Then continue with compilation and installation (this is a good place to use
+parallel compilation, if you can):
+
+  make 
+  sudo make install 
+
+If there is a problem with undefined symbols in QtOpenGL on Leopard, edit
+QtOpenGL/makefile and add -undefined dynamic_lookup to LFLAGS.
+Then make again.
+
 
     5.2.6. Additional Dependencies: Qwt/PyQwt
     =========================================
 
 The GPS tracking feature uses Qwt.  Some popular 3rd-party plugins use PyQwt.
 You can take care of both with the PyQwt source from:
 
-  http://pyqwt.sourceforge.net/
+http://pyqwt.sourceforge.net/
 
 Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0 (comes with Qwt 5.2.1).
 Normal compilation does both Qwt and PyQwt at the same time, but Qwt is statically linked
 into PyQwt, and Qgis can't use it.  So, we need to split the build.
 
-First edit qwtconfig.pri in the qwt-5.2 subdir and change some settings so
-you don't get a bloated debug static library (too bad they are not configurable from
-qmake).  Scroll down to the 'release/debug mode' block.  Edit the last 'CONFIG +='
-line, within an 'else' block, and change 'debug' to 'release'.  Like so:
-
-      else {
-          CONFIG           += release     # release/debug
-      }
-
-Also uncomment (remove # prefix) the line 'CONFIG += QwtDll'.  Like so:
-
-  CONFIG           += QwtDll
-
-If you are building for Qt Carbon 32bit on Snow Leopard, add a line at the bottom:
-
-  CONFIG += x86
-
-Save and close.
-
 Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build and install:
 
+  cat >> qwtconfig.pri <<EOF
+  CONFIG += release QwtDll
+  EOF
   qmake -spec macx-g++
   make
   sudo make install
@@ -1429,7 +1419,7 @@ Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build and
 The Qwt shared library is now installed in /usr/local/qwt-5.x.x[-svn] (x.x is the 
 minor.point version, and it may be an SVN version).  Remember this for QGIS and PyQwt configuration.
 
-Now for PyQwt.  Still in the Terminal:
+Now for PyQwt.  Still in the Terminal (for all Pythons, except see Snow Leopard Carbon note below):
 
   cd ../configure
   python configure.py --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
@@ -1473,10 +1463,10 @@ tarball to unpack it, then cd to the source folder and:
 
 Get the latest source release from here:
 
-  http://www.cmake.org/cmake/resources/software.html
+http://www.cmake.org/cmake/resources/software.html
 
 Binary installers are available for OS X, but they are not recommended
-(2.4 versions install in /usr instead of /usr/local, and 2.6 versions are a
+(2.4 versions install in /usr instead of /usr/local, and 2.6+ versions are a
 strange application). Instead, download the source, double-click the source tarball,
 then cd to the source folder and:
 
@@ -1485,45 +1475,32 @@ then cd to the source folder and:
   sudo make install
 
 
-  5.4. Install subversion for OSX
-  ===============================
-
-Leopard and Snow Leopard note: Leopard and Snow Leopard (Xcode 3+)
-include SVN, so this step can be skipped on Leopard and Snow 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:
-
-  curl -O http://ufpr.dl.sourceforge.net/sourceforge/macsvn/Subversion_1.4.2.zip 
-
-Once downloaded open the zip file and run the installer.
-
-You also need to install BerkleyDB available from the same
-http://sourceforge.net/projects/macsvn/ (website). At the time of writing the
-file was here:
+  5.4. Install git for OSX
+  ========================
 
-  curl -O http://ufpr.dl.sourceforge.net/sourceforge/macsvn/Berkeley_DB_4.5.20.zip 
+The git (http://git-scm.com/) project has a downloadable build of git.
+Make sure to get the package matching your processor (x86_64 most likely, only the first Intel Macs need the i386 package).
 
-Once again unzip this and run the installer therein.
+Once downloaded open the disk image and run the installer.
 
-Lastly we need to ensure that the svn commandline executeable is in the path.
-Add the following line to the end of /etc/bashrc using sudo:
+PPC/source note
 
-  sudo vim /etc/bashrc 
+The git site does not offer PPC builds.  If you need a PPC build, or you just want
+a little more control over the installation, you need to compile it yourself.
 
-And add this line to the bottom before saving and quiting:
+Download the source from http://git-scm.com/.  Unzip it, and in a Terminal cd to the source folder, then:
 
-  export PATH=/usr/local/bin:$PATH:/usr/local/pgsql/bin 
+  make prefix=/usr/local
+  sudo make prefix=/usr/local install
 
-/usr/local/bin needs to be first in the path so that the newer bison (that will
-be built from source further down) is found before the bison (which is very
-old) that is installed by MacOSX
+If you don't need any of the extras, Perl, Python or TclTk (GUI), you can disable them before running make with:
 
-Now close and reopen your shell to get the updated vars.
+  export NO_PERL=
+  export NO_TCLTK=
+  export NO_PYTHON=
 
 
-  5.5. Check out QGIS from SVN
+  5.5. Check out QGIS from git
   ============================
 
 Now we are going to check out the sources for QGIS. First we will create a
@@ -1533,27 +1510,7 @@ directory for working in (or some folder of your choice):
 
 Now we check out the sources:
 
-Trunk:
-
-  svn co https://svn.osgeo.org/qgis/trunk/qgis qgis 
-
-For a release branch version x.y.z:
-
-  svn co https://svn.qgis.org/qgis/branches/Release-x_y_z qgis-x.y.z
-
-The first time you check out QGIS sources you will probably get a message like
-this:
-
-   Error validating server certificate for 'https://svn.qgis.org:443':
-   - The certificate is not issued by a trusted authority. Use the fingerprint to
-     validate the certificate manually!  Certificate information:
-   - Hostname: svn.qgis.org
-   - Valid: from Apr  1 00:30:47 2006 GMT until Mar 21 00:30:47 2008 GMT
-   - Issuer: Developer Team, Quantum GIS, Anchorage, Alaska, US
-   - Fingerprint: 2f:cd:f1:5a:c7:64:da:2b:d1:34:a5:20:c6:15:67:28:33:ea:7a:9b
-     (R)eject, accept (t)emporarily or accept (p)ermanently?  
-
-I suggest you press 'p' to accept the key permanently.
+  git clone git://github.com/qgis/Quantum-GIS.git
 
 
   5.6. Configure the build
@@ -1568,7 +1525,7 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
 
   mkdir build
   cd build
-  cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
+  cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
   -D CMAKE_BUILD_TYPE=MinSizeRel \
   -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
   -D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -1587,7 +1544,7 @@ path and version as required):
   -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
   -D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
   -D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
-  -D GRASS_PREFIX=/user/local/grass-6.4.0 \
+  -D GRASS_PREFIX=/user/local/grass-6.4.1 \
   ..
 
 Snow Leopard note: To handle 32-bit Qt (Carbon), create a 32bit python wrapper
@@ -1600,7 +1557,7 @@ script and add arch flags to the configuration:
 
   sudo chmod +x /usr/local/bin/python32
 
-  cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
+  cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
   -D CMAKE_BUILD_TYPE=MinSizeRel \
   -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
   -D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -1614,10 +1571,14 @@ or wait to see if there are immediate crashes when running Qgis.  It's also a go
 idea to bundle Qt if you need to copy Qgis to other Macs (where you would have to
 install Xcode just so Qt would install!).
 
-To bundle Qt, add the following line before the last line in the above cmake configurations:
+To bundle Qt, add the following line before the last line (the ".." line) in the above cmake configurations:
 
   -D QGIS_MACAPP_BUNDLE=1 \
 
+Even better for distribution purposes, to also bundle any extras non-framework, non-standard, libs (ie postgres' libpq) bump the bundle number to 2:
+
+  -D QGIS_MACAPP_BUNDLE=2 \
+
 
   5.7. Building
   =============
@@ -1631,7 +1592,7 @@ If all built without errors you can then install it:
 
   make install 
 
-or, for a /Applications build:
+or, for an /Applications build:
 
   sudo make install
 
 
@@ -1,11 +1,11 @@
 
-= MacOS X: building using frameworks and Cmake =
+= Building on MacOS X =
 
 In this approach I will try to avoid as much as possible building dependencies
 from source and rather use frameworks wherever possible.
 
 The base system here is Mac OS X 10.4 (__Tiger__), with a single architecture build.
-Included are a few notes for building on Mac OS X 10.5 (__Leopard__) and 10.6 (__Snow Leopard__).
+Included are notes for building on Mac OS X 10.5 (__Leopard__) and 10.6 (__Snow Leopard__).
 Make sure to read each section completely before typing the first command you see.
 
 __General note on Terminal usage:__  When I say "cd" to a folder in a Terminal,
@@ -31,26 +31,25 @@ ie: Mac Pro "8 Core" model (2 quad core processors) = 8
 
 ie: Macbook Pro i5 (hyperthreading) = 2 cores X 2 = 4
 
-== Install Qt4 from .dmg ==
+== Install Qt4 from disk image ==
 
-You need a minimum of Qt-4.4.0. I suggest getting the latest.
+You need a minimum of Qt-4.4.0. I suggest getting the latest.  There is no need for the full Qt SDK, so save yourself some download time and get the frameworks only.
 
 __Snow Leopard note:__ If you are building on Snow Leopard, you will need to
 decide between 32-bit support in the older, Qt Carbon branch, or 64-bit
 support in the Qt Cocoa branch. Appropriate installers are available for both
 as of Qt-4.5.2.  Qt 4.6+ is recommended for Cocoa.
 
-__PPC note:__ There appear to be issues with Qt Cocoa on PPC Macs.  QT Carbon
-is recommended on PPC Macs.
+__PPC note:__ The readymade Qt Cocoa installers don't include PPC support, you'd
+have to compile Qt yourself.  But, there appear to be issues with Qt Cocoa on PPC
+Macs anyyways.  QT Carbon is recommended on PPC Macs.
 
-``` 
 http://qt.nokia.com/downloads
-```
 
-If you want debug frameworks, Qt also provides a dmg with these.  These are in
-addition to the non-debug frameworks.
+If you want debug frameworks, Qt also provides a separate download with these.
+These are in addition to the non-debug frameworks.
 
-Once downloaded open the dmg and run the installer. Note you need admin
+Once downloaded open the disk image and run the installer. Note you need admin
 privileges to install.
 
 __Qt note:__ Starting in Qt 4.4, libQtCLucene was added, and in 4.5
@@ -71,12 +70,10 @@ CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
 == Install development frameworks for QGIS dependencies ==
 
 Download William Kyngesburye's excellent GDAL Complete package that includes
-PROJ, GEOS, GDAL, SQLite3, and image libraries, as frameworks.  There is also
-a GSL framework.
+PROJ, GEOS, GDAL, SQLite3, Spatialite, and image libraries, as frameworks.
+There is also a GSL framework.
 
-``` 
 http://www.kyngchaos.com/wiki/software/frameworks
-```
 
 Once downloaded, open and install the frameworks.
 
@@ -85,15 +82,11 @@ Qgis just needs the libpq client library, so unless you want to setup the full
 Postgres + PostGIS server, all you need is the client-only package.
 It's available here:
 
-``` 
 http://www.kyngchaos.com/wiki/software/postgres 
-```
 
 Also available is a GRASS application:
 
-```
 http://www.kyngchaos.com/wiki/software/grass
-```
 
 === Additional Dependencies: General compatibility note ===
 
@@ -115,9 +108,7 @@ not necessary on Snow Leopard.
 
 Get the expat sources:
 
-``` 
 http://sourceforge.net/project/showfiles.php?group_id=10127 
-```
 
 Double-click the source tarball to unpack, then, in Terminal.app, cd to the source folder and:
 
@@ -135,47 +126,45 @@ Leopard and Snow Leopard. You can still install Python from python.org if prefer
 
 If installing from python.org, make sure you install at least the latest Python 2.x from 
 
-```
 http://www.python.org/download/
-```
 
 Python 3 is a major change, and may have compatibility issues, so try it at your own risk.
 
 === Additional Dependencies: SIP ===
 
 Retrieve the python bindings toolkit SIP from
 
-``` 
 http://www.riverbankcomputing.com/software/sip/download
-```
 
-Double-click the source tarball to unpack it, then, in Terminal.app, cd to the source folder
-and (this installs by default into the Python framework, and is appropriate only for 
-python.org Python installs):
+Double-click the source tarball to unpack it, then, in Terminal.app,
+cd to the source folder.  Then for your chosen Python:
+
+__python.org Python__
 
 ``` 
 python configure.py 
 make 
 sudo make install 
 ```
 
-__Leopard notes__
+__Leopard system Python__
 
-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:
+SIP wants to install in the system path -- this is not a good idea.
+More configuration is needed to install outside the system path:
 
 ```
 python configure.py -n -d /Library/Python/2.5/site-packages -b /usr/local/bin \
 -e /usr/local/include -v /usr/local/share/sip -s MacOSX10.5.sdk
 ```
 
-__Snow Leopard notes__
+__Snow Leopard system Python__
 
 Similar to Leopard, you should install outside the system Python path.
 Also, you need to specify the architecture you want (requires at least SIP 4.9),
 and make sure to run the versioned python binary (this one responds to the
-'arch' command, 'python' does not). If you are using 32-bit Qt (Qt Carbon):
+'arch' command, 'python' does not).
+
+If you are using 32-bit Qt (Qt Carbon):
 
 ```
 python2.6 configure.py -n -d /Library/Python/2.6/site-packages -b /usr/local/bin \
@@ -194,54 +183,34 @@ python2.6 configure.py -n -d /Library/Python/2.6/site-packages -b /usr/local/bin
 
 Retrieve the python bindings toolkit for Qt from
 
-``` 
 http://www.riverbankcomputing.com/software/pyqt/download
-```
 
-Double-click the source tarball to unpack it, then, in Terminal.app, cd to the source folder
-and (this installs by default into the Python framework, and is appropriate only for
-python.org Python installs):
+Double-click the source tarball to unpack it, then, in Terminal.app,
+cd to the source folder.  Then for your chosen Python:
+
+__python.org Python__
 
 ``` 
 python configure.py 
 yes 
 ```
 
-There is a problem with the configuration that needs to be fixed now
-(it affects PyQwt compilation later).  Edit pyqtconfig.py and change the qt_dir line to:
-
-```
-    'qt_dir': '/usr',
-```
-
-Then continue with compilation and installation (this is a good place to use
-parallel compilation, if you can):
+__Leopard system Python__
 
-```
-make 
-sudo make install 
-```
-
-__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:
+PyQt wants to install in the system path -- this is not a good idea.
+More configuration is needed to install outside the system path:
 
 ```
 python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin
 ```
 
-If there is a problem with undefined symbols in QtOpenGL on Leopard, edit
-QtOpenGL/makefile and add ""-undefined dynamic_lookup"" to LFLAGS.
-Then make again.
-
-__Snow Leopard notes__
+__Snow Leopard system Python__
 
 Similar to Leopard, you should install outside the system Python path.
 Also, you need to specify the architecture you want (requires at least PyQt 4.6),
 and make sure to run the versioned python binary (this one responds to the
 'arch' command, which is important for pyuic4, 'python' does not).
+
 If you are using 32-bit Qt (Qt Carbon):
 
 ```
@@ -254,48 +223,45 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
 python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin --use-arch x86_64
 ```
 
+__continue...__
 
-=== Additional Dependencies: Qwt/PyQwt ===
-
-The GPS tracking feature uses Qwt.  Some popular 3rd-party plugins use PyQwt.
-You can take care of both with the PyQwt source from:
+There is a problem with the configuration that needs to be fixed now
+(it affects PyQwt compilation later).  Edit pyqtconfig.py and change the qt_dir line to:
 
 ```
-http://pyqwt.sourceforge.net/
+    'qt_dir': '/usr',
 ```
 
-Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0 (comes with Qwt 5.2.1).
-Normal compilation does both Qwt and PyQwt at the same time, but Qwt is statically linked
-into PyQwt, and Qgis can't use it.  So, we need to split the build.
-
-First edit qwtconfig.pri in the qwt-5.2 subdir and change some settings so
-you don't get a bloated debug static library (too bad they are not configurable from
-qmake).  Scroll down to the 'release/debug mode' block.  Edit the last 'CONFIG +='
-line, within an 'else' block, and change 'debug' to 'release'.  Like so:
+Then continue with compilation and installation (this is a good place to use
+parallel compilation, if you can):
 
 ```
-    else {
-        CONFIG           += release     # release/debug
-    }
+make 
+sudo make install 
 ```
 
-Also uncomment (remove # prefix) the line 'CONFIG += QwtDll'.  Like so:
+If there is a problem with undefined symbols in QtOpenGL on Leopard, edit
+QtOpenGL/makefile and add ""-undefined dynamic_lookup"" to LFLAGS.
+Then make again.
 
-```
-CONFIG           += QwtDll
-```
 
-If you are building for Qt Carbon 32bit on Snow Leopard, add a line at the bottom:
+=== Additional Dependencies: Qwt/PyQwt ===
 
-```
-CONFIG += x86
-```
+The GPS tracking feature uses Qwt.  Some popular 3rd-party plugins use PyQwt.
+You can take care of both with the PyQwt source from:
 
-Save and close.
+http://pyqwt.sourceforge.net/
+
+Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0 (comes with Qwt 5.2.1).
+Normal compilation does both Qwt and PyQwt at the same time, but Qwt is statically linked
+into PyQwt, and Qgis can't use it.  So, we need to split the build.
 
 Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build and install:
 
 ```
+cat >> qwtconfig.pri <<EOF
+CONFIG += release QwtDll
+EOF
 qmake -spec macx-g++
 make
 sudo make install
@@ -306,7 +272,7 @@ sudo install_name_tool -id /usr/local/qwt-5.2.1-svn/lib/libqwt.5.dylib \
 The Qwt shared library is now installed in /usr/local/qwt-5.x.x[-svn] (x.x is the 
 minor.point version, and it may be an SVN version).  Remember this for QGIS and PyQwt configuration.
 
-Now for PyQwt.  Still in the Terminal:
+Now for PyQwt.  Still in the Terminal (for all Pythons, except see Snow Leopard Carbon note below):
 
 ```
 cd ../configure
@@ -355,12 +321,10 @@ sudo make install
 
 Get the latest source release from here:
 
-``` 
 http://www.cmake.org/cmake/resources/software.html
-```
 
 Binary installers are available for OS X, but they are not recommended
-(2.4 versions install in /usr instead of /usr/local, and 2.6 versions are a
+(2.4 versions install in /usr instead of /usr/local, and 2.6+ versions are a
 strange application). Instead, download the source, double-click the source tarball,
 then cd to the source folder and:
 
@@ -370,52 +334,34 @@ make
 sudo make install
 ```
 
-== Install subversion for OSX ==
+== Install git for OSX ==
 
-__Leopard and Snow Leopard note:__ Leopard and Snow Leopard (Xcode 3+)
-include SVN, so this step can be skipped on Leopard and Snow Leopard.
+The [git http://git-scm.com/] project has a downloadable build of git.
+Make sure to get the package matching your processor (x86_64 most likely, only the first Intel Macs need the i386 package).
 
-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:
+Once downloaded open the disk image and run the installer.
 
-``` 
-curl -O http://ufpr.dl.sourceforge.net/sourceforge/macsvn/Subversion_1.4.2.zip 
-```
+__PPC/source note__
 
-Once downloaded open the zip file and run the installer.
+The git site does not offer PPC builds.  If you need a PPC build, or you just want
+a little more control over the installation, you need to compile it yourself.
 
-You also need to install BerkleyDB available from the same
-[http://sourceforge.net/projects/macsvn/ website]. At the time of writing the
-file was here:
+Download the source from http://git-scm.com/.  Unzip it, and in a Terminal cd to the source folder, then:
 
-``` 
-curl -O http://ufpr.dl.sourceforge.net/sourceforge/macsvn/Berkeley_DB_4.5.20.zip 
 ```
-
-Once again unzip this and run the installer therein.
-
-Lastly we need to ensure that the svn commandline executeable is in the path.
-Add the following line to the end of /etc/bashrc using sudo:
-
-``` 
-sudo vim /etc/bashrc 
+make prefix=/usr/local
+sudo make prefix=/usr/local install
 ```
 
-And add this line to the bottom before saving and quiting:
+If you don't need any of the extras, Perl, Python or TclTk (GUI), you can disable them before running make with:
 
-``` 
-export PATH=/usr/local/bin:$PATH:/usr/local/pgsql/bin 
+```
+export NO_PERL=
+export NO_TCLTK=
+export NO_PYTHON=
 ```
 
-/usr/local/bin needs to be first in the path so that the newer bison (that will
-be built from source further down) is found before the bison (which is very
-old) that is installed by MacOSX
-
-
-Now close and reopen your shell to get the updated vars.
-
-== Check out QGIS from SVN ==
+== Check out QGIS from git ==
 
 Now we are going to check out the sources for QGIS. First we will create a
 directory for working in (or some folder of your choice):
@@ -426,32 +372,10 @@ mkdir -p ~/dev/cpp cd ~/dev/cpp
 
 Now we check out the sources:
 
-Trunk:
 ``` 
-svn co https://svn.osgeo.org/qgis/trunk/qgis qgis 
+git clone git://github.com/qgis/Quantum-GIS.git
 ```
 
-For a release branch version x.y.z:
-``` 
-svn co https://svn.qgis.org/qgis/branches/Release-x_y_z qgis-x.y.z
-```
-
-The first time you check out QGIS sources you will probably get a message like
-this:
-
-``` 
- Error validating server certificate for 'https://svn.qgis.org:443':
- - The certificate is not issued by a trusted authority. Use the fingerprint to
-   validate the certificate manually!  Certificate information:
- - Hostname: svn.qgis.org
- - Valid: from Apr  1 00:30:47 2006 GMT until Mar 21 00:30:47 2008 GMT
- - Issuer: Developer Team, Quantum GIS, Anchorage, Alaska, US
- - Fingerprint: 2f:cd:f1:5a:c7:64:da:2b:d1:34:a5:20:c6:15:67:28:33:ea:7a:9b
-   (R)eject, accept (t)emporarily or accept (p)ermanently?  
-```
-
-I suggest you press 'p' to accept the key permanently.
-
 == Configure the build ==
 
 CMake supports out of source build so we will create a 'build' dir for the
@@ -464,7 +388,7 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
 ```
 mkdir build
 cd build
-cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
+cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
 -D CMAKE_BUILD_TYPE=MinSizeRel \
 -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
 -D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -485,7 +409,7 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
 -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
 -D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
 -D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
--D GRASS_PREFIX=/user/local/grass-6.4.0 \
+-D GRASS_PREFIX=/user/local/grass-6.4.1 \
 ..
 ```
 
@@ -500,7 +424,7 @@ EOF
 
 sudo chmod +x /usr/local/bin/python32
 
-cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
+cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
 -D CMAKE_BUILD_TYPE=MinSizeRel \
 -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
 -D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -515,12 +439,18 @@ or wait to see if there are immediate crashes when running Qgis.  It's also a go
 idea to bundle Qt if you need to copy Qgis to other Macs (where you would have to
 install Xcode just so Qt would install!).
 
-To bundle Qt, add the following line before the last line in the above cmake configurations:
+To bundle Qt, add the following line before the last line (the ".." line) in the above cmake configurations:
 
 ```
 -D QGIS_MACAPP_BUNDLE=1 \
 ```
 
+Even better for distribution purposes, to also bundle any extras non-framework, non-standard, libs (ie postgres' libpq) bump the bundle number to 2:
+
+```
+-D QGIS_MACAPP_BUNDLE=2 \
+```
+
 == Building ==
 
 Now we can start the build process (remember the parallel compilation note at
@@ -536,7 +466,7 @@ If all built without errors you can then install it:
 make install 
 ```
 
-or, for a /Applications build:
+or, for an /Applications build:
 
 ```
 sudo make install