From owner-svn-ports-all@freebsd.org Mon Oct 3 17:47:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D73CDAF4252; Mon, 3 Oct 2016 17:47:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2CA6980; Mon, 3 Oct 2016 17:47:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u93HlDcZ030049; Mon, 3 Oct 2016 17:47:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u93Hl8Zh029997; Mon, 3 Oct 2016 17:47:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201610031747.u93Hl8Zh029997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 3 Oct 2016 17:47:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423216 - in head: . graphics graphics/cimg graphics/frei0r graphics/gimp-gmic-plugin graphics/gstreamer-plugins-opencv graphics/gstreamer1-plugins-opencv graphics/kipi-plugin-removered... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2016 17:47:14 -0000 Author: jbeich Date: Mon Oct 3 17:47:08 2016 New Revision: 423216 URL: https://svnweb.freebsd.org/changeset/ports/423216 Log: graphics/opencv: add suffix to make room for 3.x series To avoid confusion, the main port is to track the latest release. Whether to rename includes/libraries as well making it possible to install 2.x and 3.x side-by-side remains to be investigated. PR: 210505 (for tracking) Inspired by: PkgSrc Added: head/graphics/opencv2/ head/graphics/opencv2-core/ head/graphics/opencv2-core/Makefile (contents, props changed) - copied, changed from r423215, head/graphics/opencv-core/Makefile head/graphics/opencv2-core/pkg-plist (contents, props changed) - copied, changed from r423215, head/graphics/opencv-core/pkg-plist head/graphics/opencv2-java/ head/graphics/opencv2-java/Makefile (contents, props changed) - copied, changed from r423215, head/graphics/opencv-java/Makefile head/graphics/opencv2-java/pkg-plist (contents, props changed) - copied, changed from r423215, head/graphics/opencv-java/pkg-plist head/graphics/opencv2/Makefile (contents, props changed) - copied, changed from r423215, head/graphics/opencv/Makefile head/graphics/opencv2/distinfo (contents, props changed) - copied, changed from r423215, head/graphics/opencv/distinfo head/graphics/opencv2/files/ head/graphics/opencv2/files/FindOpenCVCore.cmake.in - copied, changed from r423215, head/graphics/opencv/files/FindOpenCVCore.cmake.in head/graphics/opencv2/files/patch-cmake__OpenCVCompilerOptions.cmake (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake head/graphics/opencv2/files/patch-cmake__OpenCVFindLibsGUI.cmake (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake head/graphics/opencv2/files/patch-cmake__OpenCVVersion.cmake (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake head/graphics/opencv2/files/patch-modules__contrib__src__spinimages.cpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp head/graphics/opencv2/files/patch-modules__core__src__system.cpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-modules__core__src__system.cpp head/graphics/opencv2/files/patch-modules__highgui__src__cap_libv4l.cpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp head/graphics/opencv2/files/patch-modules__highgui__src__cap_v4l.cpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp head/graphics/opencv2/files/patch-modules__python__src2__cv2.cv.hpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp head/graphics/opencv2/files/patch-modules__ts__src__ts.cpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-modules__ts__src__ts.cpp head/graphics/opencv2/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp (contents, props changed) - copied, changed from r423215, head/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp head/graphics/opencv2/pkg-descr (contents, props changed) - copied, changed from r423215, head/graphics/opencv/pkg-descr head/graphics/opencv2/pkg-plist (contents, props changed) - copied, changed from r423215, head/graphics/opencv/pkg-plist head/graphics/py-opencv2/ head/graphics/py-opencv2/Makefile (contents, props changed) - copied, changed from r423215, head/graphics/py-opencv/Makefile head/graphics/py-opencv2/pkg-plist (contents, props changed) - copied, changed from r423215, head/graphics/py-opencv/pkg-plist Deleted: head/graphics/opencv/ head/graphics/opencv-core/ head/graphics/opencv-java/ head/graphics/py-opencv/ Modified: head/MOVED head/graphics/Makefile (contents, props changed) head/graphics/cimg/Makefile (contents, props changed) head/graphics/frei0r/Makefile (contents, props changed) head/graphics/gimp-gmic-plugin/Makefile (contents, props changed) head/graphics/gstreamer-plugins-opencv/Makefile (contents, props changed) head/graphics/gstreamer1-plugins-opencv/Makefile (contents, props changed) head/graphics/kipi-plugin-removeredeyes/Makefile (contents, props changed) head/graphics/libkface/Makefile (contents, props changed) head/graphics/nomacs/Makefile (contents, props changed) head/graphics/openimageio/Makefile (contents, props changed) head/graphics/p5-Image-ObjectDetect/Makefile (contents, props changed) head/graphics/php-facedetect/Makefile (contents, props changed) head/graphics/rubygem-objectdetect/Makefile (contents, props changed) head/graphics/waifu2x-converter-cpp/Makefile (contents, props changed) head/math/saga/Makefile (contents, props changed) head/math/scilab-toolbox-sivp/Makefile (contents, props changed) head/misc/auto-multiple-choice/Makefile (contents, props changed) head/multimedia/ffmpeg/Makefile (contents, props changed) head/multimedia/ffmpeg0/Makefile (contents, props changed) head/multimedia/gstreamer-plugins/Makefile.common (contents, props changed) head/multimedia/gstreamer1-plugins/Makefile.common (contents, props changed) head/multimedia/libav/Makefile (contents, props changed) head/multimedia/lives/Makefile (contents, props changed) head/multimedia/py-moviepy/Makefile (contents, props changed) head/net-im/qTox/Makefile (contents, props changed) head/net-p2p/retroshare/Makefile (contents, props changed) head/net/freeswitch/Makefile (contents, props changed) head/x11-toolkits/py-kivy/Makefile (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Mon Oct 3 17:46:28 2016 (r423215) +++ head/MOVED Mon Oct 3 17:47:08 2016 (r423216) @@ -8662,3 +8662,7 @@ databases/postgresql91-plperl||2016-10-0 databases/postgresql91-pltcl||2016-10-02|Has expired: End-of-life is near databases/postgresql91-docs||2016-10-02|Has expired: End-of-life is near www/mediawiki125||2016-10-02|Has expired: EOL upstream +graphics/opencv|graphics/opencv2|2016-10-03|Renamed +graphics/opencv-core|graphics/opencv2-core|2016-10-03|Renamed +graphics/opencv-java|graphics/opencv2-java|2016-10-03|Renamed +graphics/py-opencv|graphics/py-opencv2|2016-10-03|Renamed Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -611,9 +611,9 @@ SUBDIR += opencolorio SUBDIR += opencolorio-tools SUBDIR += opencsg - SUBDIR += opencv - SUBDIR += opencv-core - SUBDIR += opencv-java + SUBDIR += opencv2 + SUBDIR += opencv2-core + SUBDIR += opencv2-java SUBDIR += opendx SUBDIR += opengl-man SUBDIR += opengtl @@ -849,7 +849,7 @@ SUBDIR += py-ming SUBDIR += py-nwdiag SUBDIR += py-opencolorio - SUBDIR += py-opencv + SUBDIR += py-opencv2 SUBDIR += py-openexr SUBDIR += py-openimageio SUBDIR += py-paint Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/cimg/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -4,6 +4,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v DISTVERSION= 1.7.7 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -57,8 +58,8 @@ LIB_DEPENDS+= libcurl.so:ftp/curl \ libIlmImf.so:graphics/OpenEXR \ libgimp-2.0.so:graphics/gimp-app \ libfftw3.so:math/fftw3 \ - libopencv_legacy.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_legacy.so:graphics/opencv2 \ + libopencv_core.so:graphics/opencv2-core \ libGraphicsMagick.so:graphics/GraphicsMagick USES+= jpeg ALL_TARGET= Mlinux Modified: head/graphics/frei0r/Makefile ============================================================================== --- head/graphics/frei0r/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/frei0r/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -28,10 +28,10 @@ USES+= localbase .endif .if defined(BUILDING_FREI0R_OPENCV) -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Frei0r OpenCV plugins PKGNAMESUFFIX= -plugins-opencv -LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv2 FREI0R_PLUGINS= facebl0r facedetect CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=OFF \ Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/gimp-gmic-plugin/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,6 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -13,7 +14,7 @@ COMMENT= GREYC's Magic Image Converter LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/OpenEXR \ - libopencv_legacy.so:graphics/opencv \ + libopencv_legacy.so:graphics/opencv2 \ libMagick++-6.so:graphics/ImageMagick \ libavcodec.so:multimedia/ffmpeg \ libfftw3.so:math/fftw3 \ Modified: head/graphics/gstreamer-plugins-opencv/Makefile ============================================================================== --- head/graphics/gstreamer-plugins-opencv/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/gstreamer-plugins-opencv/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -1,7 +1,7 @@ # Created by: Koop Mast # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics COMMENT= Gstreamer opencv real time computer vision plugin Modified: head/graphics/gstreamer1-plugins-opencv/Makefile ============================================================================== --- head/graphics/gstreamer1-plugins-opencv/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/gstreamer1-plugins-opencv/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= GStreamer opencv real time computer vision plugin Modified: head/graphics/kipi-plugin-removeredeyes/Makefile ============================================================================== --- head/graphics/kipi-plugin-removeredeyes/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/kipi-plugin-removeredeyes/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,12 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} +PORTREVISION= 1 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 KIPI_PLUGIN= removeredeyes .include "${.CURDIR}/../digikam-kde4/Makefile.common" Modified: head/graphics/libkface/Makefile ============================================================================== --- head/graphics/libkface/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/libkface/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,6 +2,7 @@ PORTNAME= libkface PORTVERSION= ${KDE4_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -12,7 +13,7 @@ COMMENT= KDE4 library for face recogniti LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 USES= cmake:outsource kde:4 pathfix pkgconfig tar:xz USE_KDE= kdelibs automoc4 marble Modified: head/graphics/nomacs/Makefile ============================================================================== --- head/graphics/nomacs/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/nomacs/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,7 +2,7 @@ PORTNAME= nomacs PORTVERSION= 2.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -14,7 +14,7 @@ LICENSE= GPLv3 LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libsysinfo.so:devel/libsysinfo \ - libopencv_core.so:graphics/opencv-core + libopencv_core.so:graphics/opencv2-core USES= cmake desktop-file-utils dos2unix pkgconfig tar:bzip2 USE_QT4= gui network linguist_build moc_build \ qmake_build rcc_build uic_build Copied and modified: head/graphics/opencv2-core/Makefile (from r423215, head/graphics/opencv-core/Makefile) ============================================================================== --- head/graphics/opencv-core/Makefile Mon Oct 3 17:46:28 2016 (r423215, copy source) +++ head/graphics/opencv2-core/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTREVISION= 0 -PKGNAMESUFFIX= -${OCV_SLAVE} +PKGNAMESUFFIX= 2-${OCV_SLAVE} COMMENT= OpenCV core libraries OCV_SLAVE= core OCV_CORE= yes -MASTERDIR= ${.CURDIR:H}/opencv +MASTERDIR= ${.CURDIR:H}/opencv2 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Copied and modified: head/graphics/opencv2-core/pkg-plist (from r423215, head/graphics/opencv-core/pkg-plist) ============================================================================== Copied and modified: head/graphics/opencv2-java/Makefile (from r423215, head/graphics/opencv-java/Makefile) ============================================================================== --- head/graphics/opencv-java/Makefile Mon Oct 3 17:46:28 2016 (r423215, copy source) +++ head/graphics/opencv2-java/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,13 +2,13 @@ PORTREVISION= 0 CATEGORIES= graphics java -PKGNAMESUFFIX= -${OCV_SLAVE} +PKGNAMESUFFIX= 2-${OCV_SLAVE} COMMENT= OpenCV Java library OCV_SLAVE= java OCV_JAVA= yes -MASTERDIR= ${.CURDIR:H}/opencv +MASTERDIR= ${.CURDIR:H}/opencv2 PLIST= ${.CURDIR}/pkg-plist PLIST_SUB+= OCV_VER=${DISTVERSION:R:S|.||g} Copied and modified: head/graphics/opencv2-java/pkg-plist (from r423215, head/graphics/opencv-java/pkg-plist) ============================================================================== Copied and modified: head/graphics/opencv2/Makefile (from r423215, head/graphics/opencv/Makefile) ============================================================================== --- head/graphics/opencv/Makefile Mon Oct 3 17:46:28 2016 (r423215, copy source) +++ head/graphics/opencv2/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -5,6 +5,7 @@ PORTNAME?= opencv PORTVERSION= 2.4.13.1 PORTREVISION?= 0 CATEGORIES= graphics +PKGNAMESUFFIX?= 2 MAINTAINER= ports@FreeBSD.org COMMENT= Open Source Computer Vision library @@ -13,6 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes +PORTSCOUT= limit:^2\. + +CONFLICTS_INSTALL= ${PKGBASE:S/${PORTNAME}2/${PORTNAME}/} USES= cmake compiler:c++11-lib pkgconfig USE_LDCONFIG= yes @@ -138,7 +142,7 @@ TBB_DESC= TBB support CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor .elif defined(OCV_PYTHON) -LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv2 BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} USES+= python:2.7 @@ -149,7 +153,7 @@ CMAKE_ARGS+= -DBUILD_opencv_${module}:BO INSTALL_WRKSRC= ${WRKSRC}/modules/python .elif defined(OCV_JAVA) BUILD_DEPENDS+= ant:devel/apache-ant -LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv2 USES+= python:build USE_JAVA= yes CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On @@ -159,7 +163,7 @@ CMAKE_ARGS+= -DBUILD_opencv_${module}:BO CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" INSTALL_WRKSRC= ${WRKSRC}/modules/java .else -LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core +LIB_DEPENDS+= libopencv_core.so:graphics/opencv2-core . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor Copied and modified: head/graphics/opencv2/distinfo (from r423215, head/graphics/opencv/distinfo) ============================================================================== Copied and modified: head/graphics/opencv2/files/FindOpenCVCore.cmake.in (from r423215, head/graphics/opencv/files/FindOpenCVCore.cmake.in) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-cmake__OpenCVCompilerOptions.cmake (from r423215, head/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-cmake__OpenCVFindLibsGUI.cmake (from r423215, head/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-cmake__OpenCVVersion.cmake (from r423215, head/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-modules__contrib__src__spinimages.cpp (from r423215, head/graphics/opencv/files/patch-modules__contrib__src__spinimages.cpp) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-modules__core__src__system.cpp (from r423215, head/graphics/opencv/files/patch-modules__core__src__system.cpp) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-modules__highgui__src__cap_libv4l.cpp (from r423215, head/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.cpp) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-modules__highgui__src__cap_v4l.cpp (from r423215, head/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-modules__python__src2__cv2.cv.hpp (from r423215, head/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-modules__ts__src__ts.cpp (from r423215, head/graphics/opencv/files/patch-modules__ts__src__ts.cpp) ============================================================================== Copied and modified: head/graphics/opencv2/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp (from r423215, head/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_to_scan_images__how_to_scan_images.cpp) ============================================================================== Copied and modified: head/graphics/opencv2/pkg-descr (from r423215, head/graphics/opencv/pkg-descr) ============================================================================== Copied and modified: head/graphics/opencv2/pkg-plist (from r423215, head/graphics/opencv/pkg-plist) ============================================================================== Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/openimageio/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -4,7 +4,7 @@ PORTNAME= openimageio PORTVERSION= 1.6.12 DISTVERSIONPREFIX= Release- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -62,7 +62,7 @@ OCIO_LIB_DEPENDS= libOpenColorIO.so:grap OPENCV_CMAKE_ON= -DUSE_OPENCV:BOOL=ON OPENCV_CMAKE_OFF= -DUSE_OPENCV:BOOL=OFF -OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv +OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv2 OPENJPEG_CMAKE_ON= -DUSE_OPENJPEG:BOOL=ON OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF Modified: head/graphics/p5-Image-ObjectDetect/Makefile ============================================================================== --- head/graphics/p5-Image-ObjectDetect/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/p5-Image-ObjectDetect/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,7 +3,7 @@ PORTNAME= Image-ObjectDetect PORTVERSION= 0.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,7 +14,7 @@ COMMENT= Detects objects from picture us LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv2 RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PERL5= configure Modified: head/graphics/php-facedetect/Makefile ============================================================================== --- head/graphics/php-facedetect/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/php-facedetect/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,7 +3,7 @@ PORTNAME= facedetect PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics PKGNAMEPREFIX= php- @@ -12,7 +12,7 @@ COMMENT= Face detection extension for PH LICENSE= PHP30 -LIB_DEPENDS= libopencv_objdetect.so:graphics/opencv +LIB_DEPENDS= libopencv_objdetect.so:graphics/opencv2 USE_GITHUB= yes GH_ACCOUNT= infusion Copied and modified: head/graphics/py-opencv2/Makefile (from r423215, head/graphics/py-opencv/Makefile) ============================================================================== --- head/graphics/py-opencv/Makefile Mon Oct 3 17:46:28 2016 (r423215, copy source) +++ head/graphics/py-opencv2/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -9,7 +9,7 @@ COMMENT= OpenCV Python library OCV_SLAVE= python OCV_PYTHON= yes -MASTERDIR= ${.CURDIR:H}/opencv +MASTERDIR= ${.CURDIR:H}/opencv2 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Copied and modified: head/graphics/py-opencv2/pkg-plist (from r423215, head/graphics/py-opencv/pkg-plist) ============================================================================== Modified: head/graphics/rubygem-objectdetect/Makefile ============================================================================== --- head/graphics/rubygem-objectdetect/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/rubygem-objectdetect/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,7 +3,7 @@ PORTNAME= objectdetect PORTVERSION= 0.0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ COMMENT= Simple library for detecting ob LICENSE= MIT -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 USE_RUBY= yes USES= gem pkgconfig Modified: head/graphics/waifu2x-converter-cpp/Makefile ============================================================================== --- head/graphics/waifu2x-converter-cpp/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/waifu2x-converter-cpp/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,6 +3,7 @@ PORTNAME= waifu2x-converter-cpp DISTVERSION= 1.0.0-410 DISTVERSIONSUFFIX= -g5e5ac35 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME:C/-.*//}.1.gz?h=${PORTNAME:C/-.*//}-git&id=5c150a5&/:manpage DISTFILES= ${PORTNAME:C/-.*//}.1.gz:manpage @@ -17,8 +18,8 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENS LICENSE_FILE_MIT= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl -LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ - libopencv_imgproc.so:graphics/opencv-core +LIB_DEPENDS= libopencv_highgui.so:graphics/opencv2 \ + libopencv_imgproc.so:graphics/opencv2-core USE_GITHUB= yes GH_ACCOUNT= tanakamura Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/math/saga/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,6 +3,7 @@ PORTNAME= saga PORTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -20,8 +21,8 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libjasper.so:graphics/jasper \ liblas.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ - libopencv_ml.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_ml.so:graphics/opencv2 \ + libopencv_core.so:graphics/opencv2-core \ libproj.so:graphics/proj \ libtbb.so:devel/tbb \ libtiff.so:graphics/tiff Modified: head/math/scilab-toolbox-sivp/Makefile ============================================================================== --- head/math/scilab-toolbox-sivp/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/math/scilab-toolbox-sivp/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,7 +2,7 @@ PORTNAME= sivp DISTVERSION= 1.0.0.r286 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math graphics multimedia MASTER_SITES= LOCAL/makc PKGNAMEPREFIX= scilab-toolbox- @@ -11,7 +11,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Scilab Image and Video Processing Toolbox BUILD_DEPENDS= ${SCILAB_CMD}:math/scilab -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 RUN_DEPENDS= ${SCILAB_CMD}:math/scilab USES= dos2unix pkgconfig tar:xz Modified: head/misc/auto-multiple-choice/Makefile ============================================================================== --- head/misc/auto-multiple-choice/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/misc/auto-multiple-choice/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,7 +2,7 @@ PORTNAME= auto-multiple-choice PORTVERSION= 1.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= http://download.gna.org/auto-qcm/ DISTNAME= auto-multiple-choice_${PORTVERSION}_precomp @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libcairo.so:graphics/cairo \ libnetpbm.so:graphics/netpbm \ - libopencv_highgui.so:graphics/opencv \ + libopencv_highgui.so:graphics/opencv2 \ libpangocairo-1.0.so:x11-toolkits/pango \ libpoppler-glib.so:graphics/poppler-glib RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \ Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/ffmpeg/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.8 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -229,7 +229,7 @@ OPENCL_LIB_DEPENDS= libOpenCL.so:devel/o OPENCL_CONFIGURE_ENABLE= opencl # opencv -OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core +OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core OPENCV_CONFIGURE_ENABLE= libopencv # opengl Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/ffmpeg0/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.17 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -101,7 +101,7 @@ GSM_CONFIGURE_ENABLE= libgsm LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame -OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core +OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 Modified: head/multimedia/gstreamer-plugins/Makefile.common ============================================================================== --- head/multimedia/gstreamer-plugins/Makefile.common Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/gstreamer-plugins/Makefile.common Mon Oct 3 17:47:08 2016 (r423216) @@ -427,7 +427,7 @@ gst_ogg_PLIST_FILES= ${GST_LIB_DIR}/libg gst_ogg_DIST= base # opencv -gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv +gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv2 gst_opencv_CONFIGURE_ENV+= OPENCV_CFLAGS="-I${LOCALBASE}/include/opencv" gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \ ${GST_LIB_DIR}/libgstopencv.so Modified: head/multimedia/gstreamer1-plugins/Makefile.common ============================================================================== --- head/multimedia/gstreamer1-plugins/Makefile.common Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/gstreamer1-plugins/Makefile.common Mon Oct 3 17:47:08 2016 (r423216) @@ -341,7 +341,7 @@ gst_neon_PLIST_FILES= ${GST_LIB_DIR}/lib gst_ogg_LIB_DEPENDS= libogg.so:audio/libogg # opencv -gst_opencv_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv +gst_opencv_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv2 gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.so \ share/gst-plugins-bad/${VERSION}/opencv_haarcascades/fist.xml \ share/gst-plugins-bad/${VERSION}/opencv_haarcascades/palm.xml Modified: head/multimedia/libav/Makefile ============================================================================== --- head/multimedia/libav/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/libav/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 11.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ @@ -10,7 +10,7 @@ MAINTAINER= dem.procopiou@gmail.com COMMENT= Realtime audio/video conversion library BUILD_DEPENDS= yasm:devel/yasm -LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ +LIB_DEPENDS= libopencv_core.so:graphics/opencv2-core \ libgmp.so:math/gmp \ libvdpau.so:multimedia/libvdpau \ libhogweed.so:security/nettle @@ -99,7 +99,7 @@ JACK_CONFIGURE_OFF= --disable-indev=jac LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame -OPENCV_LIB_DEPENDS= libopencv_gpu.so:graphics/opencv +OPENCV_LIB_DEPENDS= libopencv_gpu.so:graphics/opencv2 OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 Modified: head/multimedia/lives/Makefile ============================================================================== --- head/multimedia/lives/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/lives/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,6 +3,7 @@ PORTNAME= lives PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF @@ -20,8 +21,8 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib liboil-0.3.so:devel/liboil \ libprojectM.so:graphics/libprojectm \ libvisual-0.4.so:graphics/libvisual04 \ - libopencv_calib3d.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_calib3d.so:graphics/opencv2 \ + libopencv_core.so:graphics/opencv2-core \ libpng16.so:graphics/png \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ Modified: head/multimedia/py-moviepy/Makefile ============================================================================== --- head/multimedia/py-moviepy/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/multimedia/py-moviepy/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -2,6 +2,7 @@ PORTNAME= moviepy PORTVERSION= 0.2.2.11 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,7 @@ RUN_DEPENDS= convert:graphics/ImageMagic ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm \ ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio \ - ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv \ + ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv2 \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy Modified: head/net-im/qTox/Makefile ============================================================================== --- head/net-im/qTox/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/net-im/qTox/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,7 +3,7 @@ PORTNAME= qTox PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= net-im net-p2p @@ -14,8 +14,8 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libtoxcore.so:net-im/tox \ - libopencv_highgui.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ + libopencv_highgui.so:graphics/opencv2 \ + libopencv_core.so:graphics/opencv2-core \ libavcodec.so:multimedia/ffmpeg \ libvpx.so:multimedia/libvpx \ libfilteraudio.so:audio/libfilteraudio \ Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/net-p2p/retroshare/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -4,7 +4,7 @@ PORTNAME= retroshare PORTVERSION= 0.6.0e DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MAINTAINER= peter@netkey.at @@ -18,8 +18,8 @@ LIB_DEPENDS= libsqlcipher.so:databases/s libupnp.so:devel/upnp \ libgnome-keyring.so:security/libgnome-keyring \ libgpgme.so:security/gpgme \ - libopencv_highgui.so:graphics/opencv \ - libopencv_imgproc.so:graphics/opencv-core \ + libopencv_highgui.so:graphics/opencv2 \ + libopencv_imgproc.so:graphics/opencv2-core \ libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd Modified: head/net/freeswitch/Makefile ============================================================================== --- head/net/freeswitch/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/net/freeswitch/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,6 +3,7 @@ PORTNAME= freeswitch PORTVERSION= 1.6.8 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds @@ -70,7 +71,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/lad ${LOCALBASE}/bin/aclocal:devel/automake RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:audio/ladspa LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg \ - libopencv_legacy.so:graphics/opencv \ + libopencv_legacy.so:graphics/opencv2 \ libhiredis.so:databases/hiredis \ libmemcached.so:databases/libmemcached \ libSoundTouch.so:audio/soundtouch \ Modified: head/x11-toolkits/py-kivy/Makefile ============================================================================== --- head/x11-toolkits/py-kivy/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/x11-toolkits/py-kivy/Makefile Mon Oct 3 17:47:08 2016 (r423216) @@ -3,6 +3,7 @@ PORTNAME= kivy PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= GH LOCAL/dbn/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -59,7 +60,7 @@ GSTREAMER_MAKE_ENV_OFF= USE_GSTREAMER=0 GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer GSTREAMER_USES= pkgconfig -OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv +OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv2 PIL_DESC= Text and window rendering support via Pillow PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow PYGAME_DESC= Window, text and image rendering support via PyGame