From 04b12efb16efdc5843c581826d1ce0cf19160db5 Mon Sep 17 00:00:00 2001
From: ocefpaf <ocefpaf@gmail.com>
Date: Sat, 10 Oct 2015 19:26:10 -0300
Subject: [PATCH] Renamed proj4 to proj.4

---
 cartopy/meta.yaml          | 10 +++++-----
 proj.4/bld.bat             |  7 +++++++
 {proj4 => proj.4}/build.sh |  6 ++++++
 proj.4/meta.yaml           | 26 ++++++++++++++++++++++++++
 proj4/bld.bat              |  3 ---
 proj4/meta.yaml            | 20 --------------------
 6 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 proj.4/bld.bat
 rename {proj4 => proj.4}/build.sh (57%)
 create mode 100644 proj.4/meta.yaml
 delete mode 100644 proj4/bld.bat
 delete mode 100644 proj4/meta.yaml

diff --git a/cartopy/meta.yaml b/cartopy/meta.yaml
index 87a7f22..f907138 100644
--- a/cartopy/meta.yaml
+++ b/cartopy/meta.yaml
@@ -10,8 +10,8 @@ source:
     - cartopy.win.patch  # [win]
 
 build:
-  number: 0  # [not linux]
-  number: 1  # [linux]
+  number: 1  # [not linux]
+  number: 2  # [linux]
 
 requirements:
   build:
@@ -21,7 +21,7 @@ requirements:
     # We must bake the numpy version into the build string.
     - numpy *
     - cython
-    - proj4
+    - proj.4
     - geos
     # On OSX We need to effectively pin the geos version to the
     # one used by the specific shapely being targetted (we're letting
@@ -30,7 +30,7 @@ requirements:
     - owslib
     - pyshp
     - pyepsg
-  
+
   run:
     - python
     - six
@@ -39,7 +39,7 @@ requirements:
     - pillow
     - owslib
     - numpy
-    - proj4
+    - proj.4
     - shapely >=1.5.6
     - scipy
     - pyshp
diff --git a/proj.4/bld.bat b/proj.4/bld.bat
new file mode 100644
index 0000000..1ebf35b
--- /dev/null
+++ b/proj.4/bld.bat
@@ -0,0 +1,7 @@
+nmake /f makefile.vc
+
+nmake INSTDIR=%LIBRARY_PREFIX% /f makefile.vc install-all
+if errorlevel 1 exit 1
+
+move %LIBRARY_PREFIX%\bin\*.* %PREFIX%
+if errorlevel 1 exit 1
diff --git a/proj4/build.sh b/proj.4/build.sh
similarity index 57%
rename from proj4/build.sh
rename to proj.4/build.sh
index 2125a59..3de2649 100644
--- a/proj4/build.sh
+++ b/proj.4/build.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
 ./configure --prefix=$PREFIX --without-jni
+
 make
+
+if [[ $(uname) == Linux ]]; then
+    make check
+fi
+
 make install
diff --git a/proj.4/meta.yaml b/proj.4/meta.yaml
new file mode 100644
index 0000000..d44d759
--- /dev/null
+++ b/proj.4/meta.yaml
@@ -0,0 +1,26 @@
+package:
+    name: proj.4
+    version: "4.9.1"
+
+source:
+    fn:  proj-4.9.1.tar.gz
+    url: http://download.osgeo.org/proj/proj-4.9.1.tar.gz
+    md5: 3cbb2a964fd19a496f5f4265a717d31c
+
+build:
+    number: 1
+
+requirements:
+    run:
+        # The VS version is important. See # https://github.com/SciTools/conda-recipes-scitools/issues/94.
+        - python  # [win]
+
+test:
+    commands:
+        - echo -105 40 | proj +proj=utm +zone=13 +ellps=WGS84
+        - echo -117 30 | cs2cs +proj=latlong +datum=NAD27 +to +proj=latlong +datum=NAD83
+
+about:
+    home: http://trac.osgeo.org/proj/
+    license: MIT
+    summary: 'Cartographic projection software'
diff --git a/proj4/bld.bat b/proj4/bld.bat
deleted file mode 100644
index 7d0587c..0000000
--- a/proj4/bld.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-nmake /f makefile.vc
-
-nmake INSTDIR=%LIBRARY_PREFIX% /f makefile.vc install-all
\ No newline at end of file
diff --git a/proj4/meta.yaml b/proj4/meta.yaml
deleted file mode 100644
index 820a8d1..0000000
--- a/proj4/meta.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-package:
-  name: proj4
-  version: !!str 4.9.1
-
-source:
-  fn:  proj-4.9.1.tar.gz
-  url: http://download.osgeo.org/proj/proj-4.9.1.tar.gz
-
-build:
-  number: 1  # [not osx]
-
-requirements:
-  run:
-    # The VS version is important. See # https://github.com/SciTools/conda-recipes-scitools/issues/94.
-    - python  # [win]
-
-about:
-  home: http://trac.osgeo.org/proj/
-  license: MIT
-  summary: 'Cartographic projection software'