Changed my mind about using the SVN version of Shapely. Now using v1.0.14.

diff --git a/lib/README b/lib/README
index 7149482cf78112ae6620e6c691c024e7610a1d33..61bb6f02654b8ff32ce279f7a6a2620eeab6a842 100644 (file)
--- a/lib/README
+++ b/lib/README
@@ -1,8 +1,11 @@
 Third-party libraries are stored here. Currently, Shapely is the only
 one we're using which isn't available through package managers.
 
-Shapely should be pulled from Subversion:
-
-  svn co http://svn.gispython.org/svn/gispy/Shapely/trunk Shapely
+Shapely should be downloaded and extracted:
 
+  wget http://pypi.python.org/packages/source/S/Shapely/Shapely-1.0.14.tar.gz
+  tar -xvzf Shapely-1.0.14.tar.gz
+  mv Shapely-1.0.14 Shapely
+  rm Shapely-1.0.14.tar.gz
+  
 This will probably be handled by the makefile.

diff --git a/makefile b/makefile
index 691e1943f3c230abebaac57f100f0df6b1fe1f2d..11a9c5c60c82671876ab45d006a8770c4a213538 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 DB_NAME=census
 DB_USER=postgres
 TIGER_SRID=4269
-SHAPELY_URL=http://svn.gispython.org/svn/gispy/Shapely/trunk
+SHAPELY_URL=http://pypi.python.org/packages/source/S/Shapely/Shapely-1.0.14.tar.gz
 
 # Root folder for the shapefiles.
 TIGER_ROOT=http://www2.census.gov/geo/tiger/TIGER2009
@@ -43,11 +43,11 @@ test:
 
 # Download or check out any third-party libraries.
 lib:
-       if [ -d lib/Shapely ]; then                \
-               cd lib/Shapely;                    \
-               svn update;                        \
-       else                                       \
-               svn co $(SHAPELY_URL) lib/Shapely; \
+       if [ ! -d lib/Shapely ]; then                   \
+               wget -O shapely.tar.gz $(SHAPELY_URL);  \
+               tar -xvzf shapely.tar.gz -C lib/    ;   \
+               rm shapely.tar.gz;                      \
+               mv lib/Shapely* lib/Shapely;            \
        fi;