[82208] trunk/dports/graphics/opencv/Portfile

[ryandesign at macports.org]

Revision: 82208
          http://trac.macports.org/changeset/82208
Author:   ryandesign at macports.org
Date:     2011-08-10 07:20:26 -0700 (Wed, 10 Aug 2011)
Log Message:
-----------
opencv: move the post-patch reinplaces into the python variants they relate to

Modified Paths:
--------------
    trunk/dports/graphics/opencv/Portfile

Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile	2011-08-10 14:04:45 UTC (rev 82207)
+++ trunk/dports/graphics/opencv/Portfile	2011-08-10 14:20:26 UTC (rev 82208)
@@ -56,15 +56,6 @@
     patchfiles-append           patch-pch-CMakeLists.txt.diff
 }
 
-post-patch {
-    if {[variant_isset python26]} {
-        reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages|g" ${worksrcpath}/CMakeLists.txt
-    }
-    if {[variant_isset python27]} {
-        reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages|g" ${worksrcpath}/CMakeLists.txt
-    }
-}
-
 configure.args-append           -DBUILD_NEW_PYTHON_SUPPORT=OFF \
                                 -DBUILD_EXAMPLES=ON \
                                 -DINSTALL_C_EXAMPLES=ON \
@@ -98,6 +89,9 @@
                                 -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
                                 -DPYTHON_LIBRARY=${prefix}/lib/libpython2.6.dylib \
                                 -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/Headers
+    post-patch {
+        reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages|g" ${worksrcpath}/CMakeLists.txt
+    }
 }
 
 variant python27 conflicts python26 description {Add Python 2.7 bindings} {
@@ -108,6 +102,9 @@
                                 -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
                                 -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
                                 -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers
+    post-patch {
+        reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages|g" ${worksrcpath}/CMakeLists.txt
+    }
 }
 
 variant tbb description {Use Intel TBB} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110810/dcec1b06/attachment.html>