diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2016-09-23 22:45:02 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2016-09-23 22:45:02 +0000 |
commit | 16a147efd11807adfcaed38c539fb00904944852 (patch) | |
tree | 3d62a1e461f7a69157e704859cf7aa438f389bd7 /graphics | |
parent | 1cbd3576d5c61de441cb731ffcde9fc791088d83 (diff) | |
download | ports-16a147efd11807adfcaed38c539fb00904944852.tar.gz ports-16a147efd11807adfcaed38c539fb00904944852.zip |
Notes
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/opencv/Makefile | 2 | ||||
-rw-r--r-- | graphics/py-opencv/Makefile | 9 | ||||
-rw-r--r-- | graphics/py-opencv/pkg-plist | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 39a5284a319f..a2dc5235ea06 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -228,7 +228,7 @@ CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} -USES+= python +USES+= python:2.7 CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On . for module in apps java stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off diff --git a/graphics/py-opencv/Makefile b/graphics/py-opencv/Makefile index 77b0a0d7c295..c4b156385c22 100644 --- a/graphics/py-opencv/Makefile +++ b/graphics/py-opencv/Makefile @@ -12,13 +12,4 @@ OCV_PYTHON= yes MASTERDIR= ${.CURDIR:H}/opencv PLIST= ${.CURDIR}/pkg-plist -.if defined(PYTHON_REL) && ${PYTHON_REL} >= 3200 -PLIST_SUB+= PYTHON3="" \ - PYTHON2="@comment " \ - PYTHON_SUFFIX="${PYTHON_SUFFIX}" -.else -PLIST_SUB+= PYTHON3="@comment " \ - PYTHON2="" -.endif - .include "${MASTERDIR}/Makefile" diff --git a/graphics/py-opencv/pkg-plist b/graphics/py-opencv/pkg-plist index 10122aa92232..cc41f22ca9c3 100644 --- a/graphics/py-opencv/pkg-plist +++ b/graphics/py-opencv/pkg-plist @@ -1,6 +1,4 @@ %%PYTHON_SITELIBDIR%%/cv.py -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cv.pyc -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cv.pyo -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/__pycache__/cv.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/__pycache__/cv.cpython-%%PYTHON_SUFFIX%%.pyo +%%PYTHON_SITELIBDIR%%/cv.pyc +%%PYTHON_SITELIBDIR%%/cv.pyo %%PYTHON_SITELIBDIR%%/cv2.so |