From owner-svn-ports-head@freebsd.org Fri Apr 14 05:30:30 2017 Return-Path: Delivered-To: svn-ports-head@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 0BCF9D3D8B0; Fri, 14 Apr 2017 05:30:30 +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 C960C32F; Fri, 14 Apr 2017 05:30:29 +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 v3E5UTmj044514; Fri, 14 Apr 2017 05:30:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3E5UPOr044478; Fri, 14 Apr 2017 05:30:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201704140530.v3E5UPOr044478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 14 Apr 2017 05:30:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438490 - in head: . graphics graphics/caffe graphics/cimg graphics/frei0r graphics/gimp-gmic-plugin graphics/gstreamer-plugins-opencv graphics/gstreamer1-plugins-opencv graphics/kipi-p... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2017 05:30:30 -0000 Author: jbeich Date: Fri Apr 14 05:30:25 2017 New Revision: 438490 URL: https://svnweb.freebsd.org/changeset/ports/438490 Log: graphics/opencv: back out r423216 and r423063 (replaying r423316) Renaming didn't help to unblock 3.x progress as co-existence with 2.x was no less complex than simply fixing consumers. This commit also restores directory-level history accidentally lost via git-svn. PR: 210505 Pointy hat to: jbeich (should've discussed first) Added: head/graphics/opencv/ - copied from r423215, head/graphics/opencv/ head/graphics/opencv-core/ - copied from r423215, head/graphics/opencv-core/ head/graphics/opencv-java/ - copied from r423215, head/graphics/opencv-java/ head/graphics/py-opencv/ - copied from r423215, head/graphics/py-opencv/ Deleted: head/graphics/opencv2/ head/graphics/opencv2-core/ head/graphics/opencv2-java/ head/graphics/py-opencv2/ Modified: head/MOVED head/graphics/Makefile head/graphics/caffe/Makefile head/graphics/cimg/Makefile head/graphics/frei0r/Makefile head/graphics/gimp-gmic-plugin/Makefile head/graphics/gstreamer-plugins-opencv/Makefile head/graphics/gstreamer1-plugins-opencv/Makefile head/graphics/kipi-plugin-removeredeyes/Makefile head/graphics/libkface/Makefile head/graphics/nomacs/Makefile head/graphics/opencv-core/Makefile head/graphics/opencv-java/Makefile head/graphics/opencv/Makefile head/graphics/openimageio/Makefile head/graphics/p5-Image-ObjectDetect/Makefile head/graphics/php-facedetect/Makefile head/graphics/py-opencv/Makefile head/graphics/rubygem-objectdetect/Makefile head/graphics/waifu2x-converter-cpp/Makefile head/math/saga/Makefile head/math/scilab-toolbox-sivp/Makefile head/misc/auto-multiple-choice/Makefile head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg0/Makefile head/multimedia/gstreamer-plugins/Makefile.common head/multimedia/gstreamer1-plugins/Makefile.common head/multimedia/libav/Makefile head/multimedia/lives/Makefile head/multimedia/py-moviepy/Makefile head/net-im/qTox/Makefile head/net-im/tox/Makefile head/net-p2p/retroshare/Makefile head/net/freeswitch/Makefile head/x11-toolkits/py-kivy/Makefile head/x11/xpra/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Fri Apr 14 05:22:41 2017 (r438489) +++ head/MOVED Fri Apr 14 05:30:25 2017 (r438490) @@ -8634,10 +8634,6 @@ 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 databases/postgresql91-client||2016-10-03|Has expired: End-of-life is near databases/postgresql91-pgtcl||2016-10-03|Has expired: Depends on expired PostgreSQL 9.1 databases/postgresql91-server||2016-10-03|Has expired: End-of-life is near @@ -9232,3 +9228,7 @@ devel/go-pretty||2017-04-10|Has expired: databases/godis||2017-04-10|Has expired: Go libraries should not be packaged www/moodle29|www/moodle32|2017-04-10|Has expired: Upstream support EoL, please migrate to moodle32 audio/schism|audio/schismtracker|2017-04-12|Renamed for better naming +graphics/opencv2|graphics/opencv|2017-04-14|Revert previous rename +graphics/opencv2-core|graphics/opencv-core|2017-04-14|Revert previous rename +graphics/opencv2-java|graphics/opencv-java|2017-04-14|Revert previous rename +graphics/py-opencv2|graphics/py-opencv|2017-04-14|Revert previous rename Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -620,9 +620,9 @@ SUBDIR += opencolorio SUBDIR += opencolorio-tools SUBDIR += opencsg - SUBDIR += opencv2 - SUBDIR += opencv2-core - SUBDIR += opencv2-java + SUBDIR += opencv + SUBDIR += opencv-core + SUBDIR += opencv-java SUBDIR += opendx SUBDIR += opengl-man SUBDIR += opengtl @@ -862,7 +862,7 @@ SUBDIR += py-ming SUBDIR += py-nwdiag SUBDIR += py-opencolorio - SUBDIR += py-opencv2 + SUBDIR += py-opencv SUBDIR += py-openexr SUBDIR += py-openimageio SUBDIR += py-paint Modified: head/graphics/caffe/Makefile ============================================================================== --- head/graphics/caffe/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/caffe/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,7 +2,7 @@ PORTNAME= caffe PORTVERSION= 1.0.0.r5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= eric@camachat.org @@ -23,8 +23,8 @@ LIB_DEPENDS= libsnappy.so:archivers/snap libgflags.so:devel/gflags \ libglog.so:devel/glog \ libprotobuf.so:devel/protobuf \ - libopencv_highgui.so:graphics/opencv2 \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_highgui.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-core \ libopenblas.so:math/openblas \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/cimg/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= cimg DISTVERSION= 1.7.9 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -57,8 +57,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/opencv2 \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_legacy.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-core \ libGraphicsMagick.so:graphics/GraphicsMagick USES+= jpeg ALL_TARGET= Mlinux Modified: head/graphics/frei0r/Makefile ============================================================================== --- head/graphics/frei0r/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/frei0r/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -28,10 +28,10 @@ USES+= localbase .endif .if defined(BUILDING_FREI0R_OPENCV) -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Frei0r OpenCV plugins PKGNAMESUFFIX= -plugins-opencv -LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv2 +LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv FREI0R_PLUGINS= facebl0r facedetect CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=OFF \ Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/gimp-gmic-plugin/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -14,7 +14,7 @@ COMMENT= GREYC's Magic Image Converter LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/OpenEXR \ - libopencv_legacy.so:graphics/opencv2 \ + libopencv_legacy.so:graphics/opencv \ 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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/gstreamer-plugins-opencv/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -1,7 +1,7 @@ # Created by: Koop Mast # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics COMMENT= Gstreamer opencv real time computer vision plugin Modified: head/graphics/gstreamer1-plugins-opencv/Makefile ============================================================================== --- head/graphics/gstreamer1-plugins-opencv/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/gstreamer1-plugins-opencv/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= GStreamer opencv real time computer vision plugin Modified: head/graphics/kipi-plugin-removeredeyes/Makefile ============================================================================== --- head/graphics/kipi-plugin-removeredeyes/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/kipi-plugin-removeredeyes/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv KIPI_PLUGIN= removeredeyes .include "${.CURDIR}/../digikam-kde4/Makefile.common" Modified: head/graphics/libkface/Makefile ============================================================================== --- head/graphics/libkface/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/libkface/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,7 +2,7 @@ PORTNAME= libkface PORTVERSION= ${KDE4_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -13,7 +13,7 @@ COMMENT= KDE4 library for face recogniti LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv USES= cmake:outsource kde:4 pathfix pkgconfig tar:xz USE_KDE= kdelibs automoc4 marble Modified: head/graphics/nomacs/Makefile ============================================================================== --- head/graphics/nomacs/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/nomacs/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,7 +2,7 @@ PORTNAME= nomacs PORTVERSION= 2.2.0 -PORTREVISION= 7 +PORTREVISION= 8 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/opencv2-core + libopencv_core.so:graphics/opencv-core USES= cmake desktop-file-utils dos2unix pkgconfig tar:bzip2 USE_QT4= gui network linguist_build moc_build \ qmake_build rcc_build uic_build Modified: head/graphics/opencv-core/Makefile ============================================================================== --- head/graphics/opencv-core/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/opencv-core/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -1,7 +1,7 @@ # Created by: Martin Matuska # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -${OCV_SLAVE} COMMENT= OpenCV core libraries Modified: head/graphics/opencv-java/Makefile ============================================================================== --- head/graphics/opencv-java/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/opencv-java/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics java PKGNAMESUFFIX= -${OCV_SLAVE} Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/opencv/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME?= opencv PORTVERSION= 2.4.13.1 -PORTREVISION?= 0 +PORTREVISION?= 6 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes -USES= cmake compiler:c++11-lib pkgconfig +USES= cmake pkgconfig USE_LDCONFIG= yes NOT_FOR_ARCHS= sparc64 @@ -28,7 +28,6 @@ CMAKE_ARGS+= -DWITH_CUDA:BOOL=Off \ -DWITH_UNICAP:BOOL=Off \ -DBUILD_TESTS:BOOL=Off \ -DBUILD_DOCS:BOOL=Off \ - -DENABLE_PRECOMPILED_HEADERS:BOOL=Off \ -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD} SUB_FILES= FindOpenCVCore.cmake Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/openimageio/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -4,7 +4,7 @@ PORTNAME= openimageio PORTVERSION= 1.6.12 DISTVERSIONPREFIX= Release- -PORTREVISION= 8 +PORTREVISION= 9 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/opencv2 +OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv 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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/p5-Image-ObjectDetect/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= Image-ObjectDetect PORTVERSION= 0.12 -PORTREVISION= 3 +PORTREVISION= 4 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/opencv2 +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PERL5= configure Modified: head/graphics/php-facedetect/Makefile ============================================================================== --- head/graphics/php-facedetect/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/php-facedetect/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= facedetect PORTVERSION= 1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics PKGNAMEPREFIX= php- @@ -12,7 +12,7 @@ COMMENT= Face detection extension for PH LICENSE= PHP30 -LIB_DEPENDS= libopencv_objdetect.so:graphics/opencv2 +LIB_DEPENDS= libopencv_objdetect.so:graphics/opencv USE_GITHUB= yes GH_ACCOUNT= infusion Modified: head/graphics/py-opencv/Makefile ============================================================================== --- head/graphics/py-opencv/Makefile Mon Oct 3 17:46:28 2016 (r423215) +++ head/graphics/py-opencv/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -1,7 +1,7 @@ # Created by: Martin Matuska # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/graphics/rubygem-objectdetect/Makefile ============================================================================== --- head/graphics/rubygem-objectdetect/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/rubygem-objectdetect/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= objectdetect PORTVERSION= 0.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ COMMENT= Simple library for detecting ob LICENSE= MIT -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv USE_RUBY= yes USES= gem pkgconfig Modified: head/graphics/waifu2x-converter-cpp/Makefile ============================================================================== --- head/graphics/waifu2x-converter-cpp/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/graphics/waifu2x-converter-cpp/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= waifu2x-converter-cpp DISTVERSION= 1.0.0-410 DISTVERSIONSUFFIX= -g5e5ac35 -PORTREVISION= 2 +PORTREVISION= 3 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 @@ -18,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/opencv2 \ - libopencv_imgproc.so:graphics/opencv2-core +LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ + libopencv_imgproc.so:graphics/opencv-core USE_GITHUB= yes GH_ACCOUNT= tanakamura Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/math/saga/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 3.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -21,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/opencv2 \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_ml.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-core \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libtbb.so:devel/tbb \ Modified: head/math/scilab-toolbox-sivp/Makefile ============================================================================== --- head/math/scilab-toolbox-sivp/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/math/scilab-toolbox-sivp/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,7 +2,7 @@ PORTNAME= sivp DISTVERSION= 1.0.0.r286 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math graphics multimedia MASTER_SITES= LOCAL/makc PKGNAMEPREFIX= scilab-toolbox- @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Scilab Image and Video Processing Toolbox BUILD_DEPENDS= ${SCILAB_CMD}:math/scilab -LIB_DEPENDS= libopencv_legacy.so:graphics/opencv2 +LIB_DEPENDS= libopencv_legacy.so:graphics/opencv RUN_DEPENDS= ${SCILAB_CMD}:math/scilab USES= dos2unix pkgconfig tar:xz Modified: head/misc/auto-multiple-choice/Makefile ============================================================================== --- head/misc/auto-multiple-choice/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/misc/auto-multiple-choice/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,7 +2,7 @@ PORTNAME= auto-multiple-choice PORTVERSION= 1.3.0 -PORTREVISION= 4 +PORTREVISION= 5 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/opencv2 \ + libopencv_highgui.so:graphics/opencv \ 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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/ffmpeg/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 3.2.4 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -251,7 +251,7 @@ OPENCL_LIB_DEPENDS= libOpenCL.so:devel/o OPENCL_CONFIGURE_ENABLE= opencl # opencv -OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core +OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv # opengl Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/ffmpeg0/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.17 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -103,7 +103,7 @@ GSM_CONFIGURE_ENABLE= libgsm LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame -OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core +OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv-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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/gstreamer-plugins/Makefile.common Fri Apr 14 05:30:25 2017 (r438490) @@ -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/opencv2 +gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv 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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/gstreamer1-plugins/Makefile.common Fri Apr 14 05:30:25 2017 (r438490) @@ -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/opencv2 +gst_opencv_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv 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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/libav/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,6 +2,7 @@ PORTNAME= libav PORTVERSION= 11.8 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ @@ -11,7 +12,7 @@ COMMENT= Realtime audio/video conversion LICENSE= GPLv2+ BUILD_DEPENDS= yasm:devel/yasm -LIB_DEPENDS= libopencv_core.so:graphics/opencv2-core \ +LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ libgmp.so:math/gmp \ libvdpau.so:multimedia/libvdpau \ libhogweed.so:security/nettle @@ -101,7 +102,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/opencv2 +OPENCV_LIB_DEPENDS= libopencv_gpu.so:graphics/opencv OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 Modified: head/multimedia/lives/Makefile ============================================================================== --- head/multimedia/lives/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/lives/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= lives PORTVERSION= 2.8.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -23,8 +23,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/opencv2 \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_calib3d.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/multimedia/py-moviepy/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -2,6 +2,7 @@ PORTNAME= moviepy PORTVERSION= 0.2.2.13 +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-opencv2 \ + ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv \ ${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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/net-im/qTox/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= qTox PORTVERSION= 1.9.0 -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/opencv2 \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_highgui.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-core \ libavcodec.so:multimedia/ffmpeg \ libvpx.so:multimedia/libvpx \ libfilteraudio.so:audio/libfilteraudio \ Modified: head/net-im/tox/Makefile ============================================================================== --- head/net-im/tox/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/net-im/tox/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= toxcore PORTVERSION= 0.1.5 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= net-im net-p2p @@ -17,7 +17,7 @@ BUILD_DEPENDS= checkmk:devel/check LIB_DEPENDS= libvpx.so:multimedia/libvpx \ libsndfile.so:audio/libsndfile \ libsodium.so:security/libsodium \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_core.so:graphics/opencv-core \ libopus.so:audio/opus TEST_DEPENDS= ${LOCALBASE}/lib/libmsgpackc.so:devel/msgpack \ ${LOCALBASE}/lib/libportaudio.so:audio/portaudio Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/net-p2p/retroshare/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -4,7 +4,7 @@ PORTNAME= retroshare PORTVERSION= 0.6.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 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/opencv2 \ - libopencv_imgproc.so:graphics/opencv2-core \ + libopencv_highgui.so:graphics/opencv \ + libopencv_imgproc.so:graphics/opencv-core \ libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd Modified: head/net/freeswitch/Makefile ============================================================================== --- head/net/freeswitch/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/net/freeswitch/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= freeswitch PORTVERSION= 1.6.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds @@ -80,8 +80,8 @@ 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_gpu.so:graphics/opencv2 \ - libopencv_core.so:graphics/opencv2-core \ + libopencv_gpu.so:graphics/opencv \ + libopencv_core.so:graphics/opencv-core \ 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 Fri Apr 14 05:22:41 2017 (r438489) +++ head/x11-toolkits/py-kivy/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,7 +3,7 @@ PORTNAME= kivy PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits python MASTER_SITES= GH LOCAL/dbn/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -60,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-opencv2 +OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv 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 Modified: head/x11/xpra/Makefile ============================================================================== --- head/x11/xpra/Makefile Fri Apr 14 05:22:41 2017 (r438489) +++ head/x11/xpra/Makefile Fri Apr 14 05:30:25 2017 (r438490) @@ -3,6 +3,7 @@ PORTNAME= xpra PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ @@ -76,7 +77,7 @@ SWSCALE_LIB_DEPENDS= libswscale.so:multi SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_VARS= XPRA_OPTIONS+=vpx -WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv2>2:graphics/py-opencv2 +WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv WEBCAM_VARS= XPRA_OPTIONS+=webcam X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_VARS= XPRA_OPTIONS+=enc_x264