Ticket #27605: Portfile.diff

Portfile

@@ -5 +5 @@
 PortGroup                       cmake 1.0
 
 name                            opencv
-version                         2.1.0
+version                         2.2.0
 categories                      graphics science
 platforms                       darwin
 maintainers                     gmail.com:stante
@@ -25 +25 @@
 use_bzip2                       yes
 distname                        OpenCV-${version}
 
-checksums                       md5     1d71584fb4e04214c0085108f95e24c8 \
-                                sha1    8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 \
-                                rmd160  e31cdbd30e7925e3725f5957616ffc59c58db247
+checksums                       md5     122c9ac793a46854ef2819fedbbd6b1b \
+                                sha1    984ed71672d50391d0617fce2ef58e7590ec0fd7 \
+                                rmd160  57aedb7678964f43af3f1c838a8266c7b4869b01
 
 depends_build-append            port:pkgconfig
 
@@ -73 +73 @@
     }
 }
 
-variant python26 description {Add Python 2.6 bindings} {
+variant python26 conflicts python27 description {Add Python 2.6 bindings} {
     depends_lib-append          port:python26
     configure.args-delete       -DBUILD_NEW_PYTHON_SUPPORT=OFF
     configure.args-append       -DINSTALL_PYTHON_EXAMPLES=ON \
+                                -DBUILD_NEW_PYTHON_SUPPORT=ON \
+                                -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
                                 -DPYTHON_LIBRARY=${prefix}/lib/libpython2.6.dylib \
                                 -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/Headers
 }
 
+variant python27 conflicts python26 description {Add Python 2.7 bindings} {
+    depends_lib-append          port:python27
+    configure.args-delete       -DBUILD_NEW_PYTHON_SUPPORT=OFF
+    configure.args-append       -DINSTALL_PYTHON_EXAMPLES=ON \
+                                -DBUILD_NEW_PYTHON_SUPPORT=ON \
+                                -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
+                                -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
+                                -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers
+}
+
 variant tbb description {Use Intel TBB} {
     depends_lib-append          port:tbb
     configure.args-append       -DWITH_TBB=ON \