From 75105013250ca36e981ace976468480e29977d97 Mon Sep 17 00:00:00 2001
From: ThomasG77 <thomas_gratier@yahoo.fr>
Date: Mon, 26 Dec 2011 16:35:47 -0800
Subject: [PATCH] Updated Optional Installs (markdown)

---
 MacInstallation_Optional.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/MacInstallation_Optional.md b/MacInstallation_Optional.md
index 641cd8b..ec7867a 100644
--- a/MacInstallation_Optional.md
+++ b/MacInstallation_Optional.md
@@ -12,10 +12,14 @@ You may install Proj.4, PostgreSQL/PostGIS, and GDAL if needed.
 
  * *Proj.4 and Datum data* from source
 
+```sh
     $ wget ftp://ftp.remotesensing.org/proj/proj-4.6.1.tar.gz
     $ wget ftp://ftp.remotesensing.org/proj/proj-datumgrid-1.4.tar.gz
+```
+
  * Extract the datum files into the main source code and build:
 
+```sh
     $ tar xzf proj-4.6.1.tar.gz
     $ cd proj-4.6.1/nad
     $ tar xzf ../../proj-datumgrid-1.4.tar.gz
@@ -24,42 +28,54 @@ You may install Proj.4, PostgreSQL/PostGIS, and GDAL if needed.
     $ make
     # make install 
     $ cd ../
+```
 
  * *PostgreSQL and PostGIS* binaries - use [kyngchaos.com](http://www.kyngchaos.com/wiki/software:postgres) or from source:
   * You can build PostgreSQL from source just like any other linux/unix system - [Postgres Docs](http://www.postgresql.org/docs/8.3/interactive/install-procedure.html)
   * Next build PostGIS source (Install GEOS first if you wish to use Spatial Operations in Postgis separately - [http://code.djangoproject.com/wiki/GeoDjangoInstall#GEOS])
 
+```sh
     $ wget http://postgis.refractions.net/download/postgis-1.3.4.tar.gz
     $ tar xzf postgis-1.3.4.tar.gz
     $ cd postgis-1.3.4
     $ ./configure --with-geos --with-proj # these flags are recommend but not needed for Mapnik
     $ make
     # make install
+```
 
   * Alternatively, you may install PostgreSQL and PostGIS using MacPorts. First, run
 
+```sh
     $ sudo port install postgresql83
     $ sudo port install postgis
+```
+
   * Next, modify the SConstruct file to point to the libraries and header files installed by port. Change the lines that list PGSQL to:
 
+```
     opts.Add(PathOption('PGSQL_INCLUDES', 'Search path for PostgreSQL include files', '/opt/local/include/postgresql83'))
     opts.Add(PathOption('PGSQL_LIBS', 'Search path for PostgreSQL library files', '/opt/local/lib/postgresql83'))
+```
+
   * See [[MacPostGIS_Setup]] for setup instructions.
  * *GDAL* binary frameworks - use [kyngchaos.com](http://www.kyngchaos.com/wiki/software:frameworks) or build from source:
 
+```sh
     $ wget http://download.osgeo.org/gdal/gdal-1.5.0.tar.gz
     $ tar xzf gdal-1.5.0.tar.gz
     $ cd gdal-1.5.0
     $ ./configure # --with-package (lots of available options here to support various raster formats)
     $ make
     # make install
+```
 
 ### Install WMS dependencies
 
 Install the Mapnik WMS dependencies if you wish to use the WMS (Web Mapping Service) server (Otherwise optional).
 
- * More details in the [source:trunk/docs/ogcserver/readme.txt WMS Readme] in SVN
+ * More details see in the new dedicated repository (https://github.com/mapnik/OGCServer)
 
+```sh
     wget ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz
     tar xvf libxml2-2.7.6.tar.gz
     cd libxml2-2.7.6
@@ -82,8 +98,10 @@ Install the Mapnik WMS dependencies if you wish to use the WMS (Web Mapping Serv
     $ tar xzvf Imaging-1.1.6.tar.gz 
     $ cd Imaging-1.1.6
     # python setup.py install
+```
 
 You'll need either mod_fastcgi or mod_fcgid installed within apache.
+
  * FastCGI install notes are here: http://blog.cleverelephant.ca/2008/05/fastcgi-on-osx-leopard.html
  * Fcgid install notes are here: http://blog.brandonking.net//2008/01/django-app-modfcgid-apache-2-setup-on.html/
  * TODO FastCGI/mod_fcgi example installation