Index: head/graphics/frei0r/Makefile
===================================================================
--- head/graphics/frei0r/Makefile	(revision 561730)
+++ head/graphics/frei0r/Makefile	(revision 561731)
@@ -1,71 +1,70 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	frei0r
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	plugins-
+PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES?=	https://files.dyne.org/frei0r/releases/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT?=	Minimalistic plugin API for video effects
 
 .if !defined(BUILDING_FREI0R_METAPORT)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USES=		cmake pkgconfig
 
 .if defined(BUILDING_FREI0R_OPENCV) && defined(BUILDING_FREI0R_GAVL)
 IGNORE=		cannot build OpenCV and gavl plugins simultaneously
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV) || defined(BUILDING_FREI0R_GAVL)
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-frei0r-plugins \
-		${PATCHDIR}/extra-patch-src_filter_facedetect_CMakeLists.txt \
-		${PATCHDIR}/extra-patch-src_filter_facebl0r_facebl0r.cpp
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-frei0r-plugins
 
 USES+=		localbase
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION=	1
+PORTREVISION=	0
 COMMENT=	Frei0r OpenCV plugins
 PKGNAMESUFFIX=	-plugins-opencv
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core \
 		libopencv_video.so:graphics/opencv
 FREI0R_PLUGINS=	facebl0r facedetect
 
 CMAKE_ARGS+=	-DWITHOUT_OPENCV:BOOL=OFF \
 		-DWITHOUT_GAVL:BOOL=ON
 .elif defined(BUILDING_FREI0R_GAVL)
 PORTREVISION=	0
 COMMENT=	Frei0r gavl plugins
 PKGNAMESUFFIX=	-plugins-gavl
 LIB_DEPENDS+=	libgavl.so:multimedia/gavl
 FREI0R_PLUGINS=	rgbparade scale0tilt vectorscope
 
 CMAKE_ARGS+=	-DWITHOUT_OPENCV:BOOL=ON \
 		-DWITHOUT_GAVL:BOOL=OFF
 .else
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-CMakeLists.txt
 
 USES+=		gnome
 USE_GNOME=	cairo
 
 CMAKE_ARGS+=	-DWITHOUT_OPENCV:BOOL=ON \
 		-DWITHOUT_GAVL:BOOL=ON
 
 .endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL)
 
 .if defined(FREI0R_PLUGINS)
 PLIST=		${WRKSRC}/PLIST
 . for FILE in ${FREI0R_PLUGINS}
 PLIST_FILES+=	lib/frei0r-1/${FILE}.so
 . endfor
 .endif
 
 .include <bsd.port.mk>
 
 .endif # !defined(BUILDING_FREI0R_METAPORT)
Index: head/graphics/frei0r/distinfo
===================================================================
--- head/graphics/frei0r/distinfo	(revision 561730)
+++ head/graphics/frei0r/distinfo	(revision 561731)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518779363
-SHA256 (frei0r-plugins-1.6.1.tar.gz) = e0c24630961195d9bd65aa8d43732469e8248e8918faa942cfb881769d11515e
-SIZE (frei0r-plugins-1.6.1.tar.gz) = 1103969
+TIMESTAMP = 1610463878
+SHA256 (frei0r-plugins-1.7.0.tar.gz) = 1b1ff8f0f9bc23eed724e94e9a7c1d8f0244bfe33424bb4fe68e6460c088523a
+SIZE (frei0r-plugins-1.7.0.tar.gz) = 1214323
Index: head/graphics/frei0r/files/extra-patch-src_filter_facebl0r_facebl0r.cpp
===================================================================
--- head/graphics/frei0r/files/extra-patch-src_filter_facebl0r_facebl0r.cpp	(revision 561730)
+++ head/graphics/frei0r/files/extra-patch-src_filter_facebl0r_facebl0r.cpp	(nonexistent)
@@ -1,10 +0,0 @@
---- src/filter/facebl0r/facebl0r.cpp.orig	2020-12-20 08:53:32 UTC
-+++ src/filter/facebl0r/facebl0r.cpp
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <opencv/cv.h>
- #include <opencv/highgui.h>
-+#include <opencv2/imgproc.hpp>
- 
- #include <frei0r.hpp>
- #include <frei0r_math.h>

Property changes on: head/graphics/frei0r/files/extra-patch-src_filter_facebl0r_facebl0r.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt
===================================================================
--- head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt	(revision 561730)
+++ head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt	(nonexistent)
@@ -1,15 +0,0 @@
-The facedetect plugin cannot be built with C++11:
-
-frei0r-plugins-1.5.0/src/filter/facedetect/facedetect.cpp:271:15: 
-  error: non-constant-expression cannot be narrowed from type 'int' 
-  to 'double' in initializer list [-Wc++11-narrowing]
-
---- src/filter/facedetect/CMakeLists.txt.orig	2018-01-17 09:42:26 UTC
-+++ src/filter/facedetect/CMakeLists.txt
-@@ -11,5 +11,6 @@ LINK_LIBRARIES(${OpenCV_LIBS} ${OpenCV_LIBRARIES})
- 
- add_library (${TARGET}  MODULE ${SOURCES})
- set_target_properties (${TARGET} PROPERTIES PREFIX "")
-+set_property(TARGET facedetect PROPERTY CXX_STANDARD 98)
- 
- install (TARGETS ${TARGET} LIBRARY DESTINATION ${LIBDIR})

Property changes on: head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/frei0r/files/extra-patch-CMakeLists.txt
===================================================================
--- head/graphics/frei0r/files/extra-patch-CMakeLists.txt	(revision 561730)
+++ head/graphics/frei0r/files/extra-patch-CMakeLists.txt	(revision 561731)
@@ -1,17 +1,17 @@
---- CMakeLists.txt.orig	2016-04-02 00:29:38 UTC
+--- CMakeLists.txt.orig	2019-12-06 16:20:37 UTC
 +++ CMakeLists.txt
-@@ -48,7 +48,7 @@ INCLUDE( cmake/modules/TargetDistclean.c
+@@ -41,7 +41,7 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
  # See this thread for a ridiculous discussion about the simple question how to install a header file with CMake: http://www.cmake.org/pipermail/cmake/2009-October/032874.html
  install (DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "frei0r.h" PATTERN "msvc" EXCLUDE)
  
 -add_subdirectory (doc)
 +#add_subdirectory (doc)
  add_subdirectory (src)
  
  # Generate frei0r.pc and install it.
-@@ -57,4 +57,4 @@ set (exec_prefix "${CMAKE_INSTALL_PREFIX
- set (libdir "${CMAKE_INSTALL_PREFIX}/lib")
+@@ -50,4 +50,4 @@ set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
+ set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
  set (includedir "${CMAKE_INSTALL_PREFIX}/include")
  configure_file ("frei0r.pc.in" "frei0r.pc" @ONLY)
--install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION lib/pkgconfig)
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION libdata/pkgconfig)
Index: head/graphics/frei0r/files/extra-patch-frei0r-plugins
===================================================================
--- head/graphics/frei0r/files/extra-patch-frei0r-plugins	(revision 561730)
+++ head/graphics/frei0r/files/extra-patch-frei0r-plugins	(revision 561731)
@@ -1,121 +1,124 @@
---- CMakeLists.txt.orig	2017-05-31 05:57:25 UTC
+--- CMakeLists.txt.orig	2019-12-06 16:20:37 UTC
 +++ CMakeLists.txt
-@@ -10,8 +10,6 @@ if (NOT WITHOUT_OPENCV)
+@@ -11,8 +11,6 @@ if (NOT WITHOUT_OPENCV)
    find_package (OpenCV)
  endif ()
  
 -find_package (Cairo)
 -
  include(FindPkgConfig)
  option (WITHOUT_GAVL "Disable plugins dependent upon gavl" OFF)
  if (PKG_CONFIG_FOUND AND NOT WITHOUT_GAVL)
-@@ -45,16 +43,8 @@ set (FREI0R_1_1_DEF ${CMAKE_SOURCE_DIR}/msvc/frei0r_1_
+@@ -38,16 +36,8 @@ set (FREI0R_1_1_DEF "${CMAKE_SOURCE_DIR}/msvc/frei0r_1
  # --- custom targets: ---
  INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
  
 -# See this thread for a ridiculous discussion about the simple question how to install a header file with CMake: http://www.cmake.org/pipermail/cmake/2009-October/032874.html
 -install (DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "frei0r.h" PATTERN "msvc" EXCLUDE)
 +add_subdirectory (src/filter)
  
 -add_subdirectory (doc)
 -add_subdirectory (src)
 -
 -# Generate frei0r.pc and install it.
  set (prefix "${CMAKE_INSTALL_PREFIX}")
  set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
- set (libdir "${CMAKE_INSTALL_PREFIX}/lib")
+ set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 -set (includedir "${CMAKE_INSTALL_PREFIX}/include")
 -configure_file ("frei0r.pc.in" "frei0r.pc" @ONLY)
--install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION lib/pkgconfig)
---- src/filter/CMakeLists.txt.orig	2017-05-31 05:57:25 UTC
+-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+--- src/filter/CMakeLists.txt.orig	2019-12-06 16:20:37 UTC
 +++ src/filter/CMakeLists.txt
-@@ -8,89 +8,3 @@ if (${OpenCV_FOUND})
+@@ -8,92 +8,3 @@ if (${OpenCV_FOUND})
      add_subdirectory (facebl0r)
      add_subdirectory (facedetect)
  endif (${OpenCV_FOUND})
 -
 -if (${Cairo_FOUND})
 -  add_subdirectory (cairoimagegrid)
 -  add_subdirectory (cairogradient)
 -endif (${Cairo_FOUND})
 -
 -add_subdirectory (3dflippo)
 -add_subdirectory (alpha0ps)
 -add_subdirectory (balanc0r)
 -add_subdirectory (baltan)
 -add_subdirectory (bluescreen0r)
 -add_subdirectory (bgsubtract0r)
 -add_subdirectory (blur)
 -add_subdirectory (brightness)
 -add_subdirectory (bw0r)
 -add_subdirectory (cartoon)
 -add_subdirectory (cluster)
 -add_subdirectory (colgate)
 -add_subdirectory (coloradj)
 -add_subdirectory (colordistance)
 -add_subdirectory (colorize)
 -add_subdirectory (colorhalftone)
 -add_subdirectory (colortap)
 -add_subdirectory (contrast0r)
 -add_subdirectory (c0rners)
 -add_subdirectory (curves)
 -add_subdirectory (d90stairsteppingfix)
 -add_subdirectory (defish0r)
 -add_subdirectory (delay0r)
 -add_subdirectory (delaygrab)
 -add_subdirectory (denoise)
 -add_subdirectory (distort0r)
 -add_subdirectory (dither)
 -add_subdirectory (edgeglow)
+-add_subdirectory (elastic_scale)
 -add_subdirectory (emboss)
 -add_subdirectory (equaliz0r)
 -add_subdirectory (flippo)
 -add_subdirectory (gamma)
 -add_subdirectory (glow)
 -add_subdirectory (glitch0r)
 -#add_subdirectory (host_param_test)
 -add_subdirectory (hueshift0r)
 -add_subdirectory (invert0r)
 -add_subdirectory (keyspillm0pup)
 -add_subdirectory (lenscorrection)
 -add_subdirectory (letterb0xed)
 -add_subdirectory (levels)
 -add_subdirectory (lightgraffiti)
 -add_subdirectory (luminance)
 -add_subdirectory (mask0mate)
 -add_subdirectory (medians)
 -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 -  # clang 3.1 on OSX fails to compile this one
 -  add_subdirectory (measure)
 -endif ()
 -add_subdirectory (ndvi)
 -add_subdirectory (nervous)
+-add_subdirectory (normaliz0r)
 -add_subdirectory (nosync0r)
 -add_subdirectory (perspective)
 -add_subdirectory (pixeliz0r)
 -add_subdirectory (posterize)
+-add_subdirectory (premultiply)
 -add_subdirectory (primaries)
 -add_subdirectory (RGB)
 -add_subdirectory (rgbnoise)
 -add_subdirectory (rgbsplit0r)
 -add_subdirectory (saturat0r)
 -add_subdirectory (scanline0r)
 -add_subdirectory (select0r)
 -add_subdirectory (sharpness)
 -add_subdirectory (sigmoidaltransfer)
 -add_subdirectory (sobel)
 -add_subdirectory (softglow)
 -add_subdirectory (sopsat)
 -add_subdirectory (spillsupress)
 -add_subdirectory (squareblur)
 -add_subdirectory (tehroxx0r)
 -add_subdirectory (three_point_balance)
 -add_subdirectory (threelay0r)
 -add_subdirectory (threshold0r)
 -add_subdirectory (timeout)
 -add_subdirectory (tint0r)
 -add_subdirectory (transparency)
 -add_subdirectory (tutorial)
 -add_subdirectory (twolay0r)
 -add_subdirectory (vertigo)
 -add_subdirectory (vignette)
Index: head/graphics/frei0r/pkg-plist
===================================================================
--- head/graphics/frei0r/pkg-plist	(revision 561730)
+++ head/graphics/frei0r/pkg-plist	(revision 561731)
@@ -1,129 +1,132 @@
 include/frei0r.h
 lib/frei0r-1/3dflippo.so
 lib/frei0r-1/B.so
 lib/frei0r-1/G.so
 lib/frei0r-1/IIRblur.so
 lib/frei0r-1/R.so
 lib/frei0r-1/RGB.so
 lib/frei0r-1/addition.so
 lib/frei0r-1/addition_alpha.so
 lib/frei0r-1/alpha0ps.so
 lib/frei0r-1/alphaatop.so
 lib/frei0r-1/alphagrad.so
 lib/frei0r-1/alphain.so
 lib/frei0r-1/alphainjection.so
 lib/frei0r-1/alphaout.so
 lib/frei0r-1/alphaover.so
 lib/frei0r-1/alphaspot.so
 lib/frei0r-1/alphaxor.so
 lib/frei0r-1/balanc0r.so
 lib/frei0r-1/baltan.so
 lib/frei0r-1/bgsubtract0r.so
 lib/frei0r-1/blend.so
 lib/frei0r-1/bluescreen0r.so
 lib/frei0r-1/brightness.so
 lib/frei0r-1/burn.so
 lib/frei0r-1/bw0r.so
 lib/frei0r-1/c0rners.so
 lib/frei0r-1/cairoaffineblend.so
 lib/frei0r-1/cairoblend.so
 lib/frei0r-1/cairogradient.so
 lib/frei0r-1/cairoimagegrid.so
 lib/frei0r-1/cartoon.so
 lib/frei0r-1/cluster.so
 lib/frei0r-1/colgate.so
 lib/frei0r-1/color_only.so
 lib/frei0r-1/coloradj_RGB.so
 lib/frei0r-1/colordistance.so
 lib/frei0r-1/colorhalftone.so
 lib/frei0r-1/colorize.so
 lib/frei0r-1/colortap.so
 lib/frei0r-1/composition.so
 lib/frei0r-1/contrast0r.so
 lib/frei0r-1/curves.so
 lib/frei0r-1/d90stairsteppingfix.so
 lib/frei0r-1/darken.so
 lib/frei0r-1/defish0r.so
 lib/frei0r-1/delay0r.so
 lib/frei0r-1/delaygrab.so
 lib/frei0r-1/difference.so
 lib/frei0r-1/distort0r.so
 lib/frei0r-1/dither.so
 lib/frei0r-1/divide.so
 lib/frei0r-1/dodge.so
 lib/frei0r-1/edgeglow.so
+lib/frei0r-1/elastic_scale.so
 lib/frei0r-1/emboss.so
 lib/frei0r-1/equaliz0r.so
 lib/frei0r-1/flippo.so
 lib/frei0r-1/gamma.so
 lib/frei0r-1/glitch0r.so
 lib/frei0r-1/glow.so
 lib/frei0r-1/grain_extract.so
 lib/frei0r-1/grain_merge.so
 lib/frei0r-1/hardlight.so
 lib/frei0r-1/hqdn3d.so
 lib/frei0r-1/hue.so
 lib/frei0r-1/hueshift0r.so
 lib/frei0r-1/invert0r.so
 lib/frei0r-1/ising0r.so
 lib/frei0r-1/keyspillm0pup.so
 lib/frei0r-1/lenscorrection.so
 lib/frei0r-1/letterb0xed.so
 lib/frei0r-1/levels.so
 lib/frei0r-1/lighten.so
 lib/frei0r-1/lightgraffiti.so
 lib/frei0r-1/lissajous0r.so
 lib/frei0r-1/luminance.so
 lib/frei0r-1/mask0mate.so
 lib/frei0r-1/medians.so
 lib/frei0r-1/multiply.so
 lib/frei0r-1/ndvi.so
 lib/frei0r-1/nervous.so
 lib/frei0r-1/nois0r.so
+lib/frei0r-1/normaliz0r.so
 lib/frei0r-1/nosync0r.so
 lib/frei0r-1/onecol0r.so
 lib/frei0r-1/overlay.so
 lib/frei0r-1/partik0l.so
 lib/frei0r-1/perspective.so
 lib/frei0r-1/pixeliz0r.so
 lib/frei0r-1/plasma.so
 lib/frei0r-1/posterize.so
 lib/frei0r-1/pr0be.so
 lib/frei0r-1/pr0file.so
+lib/frei0r-1/premultiply.so
 lib/frei0r-1/primaries.so
 lib/frei0r-1/rgbnoise.so
 lib/frei0r-1/rgbsplit0r.so
 lib/frei0r-1/saturat0r.so
 lib/frei0r-1/saturation.so
 lib/frei0r-1/scanline0r.so
 lib/frei0r-1/screen.so
 lib/frei0r-1/select0r.so
 lib/frei0r-1/sharpness.so
 lib/frei0r-1/sigmoidaltransfer.so
 lib/frei0r-1/sobel.so
 lib/frei0r-1/softglow.so
 lib/frei0r-1/softlight.so
 lib/frei0r-1/sopsat.so
 lib/frei0r-1/spillsupress.so
 lib/frei0r-1/squareblur.so
 lib/frei0r-1/subtract.so
 lib/frei0r-1/tehRoxx0r.so
 lib/frei0r-1/test_pat_B.so
 lib/frei0r-1/test_pat_C.so
 lib/frei0r-1/test_pat_G.so
 lib/frei0r-1/test_pat_I.so
 lib/frei0r-1/test_pat_L.so
 lib/frei0r-1/test_pat_R.so
 lib/frei0r-1/three_point_balance.so
 lib/frei0r-1/threelay0r.so
 lib/frei0r-1/threshold0r.so
 lib/frei0r-1/timeout.so
 lib/frei0r-1/tint0r.so
 lib/frei0r-1/transparency.so
 lib/frei0r-1/twolay0r.so
 lib/frei0r-1/uvmap.so
 lib/frei0r-1/value.so
 lib/frei0r-1/vertigo.so
 lib/frei0r-1/vignette.so
 lib/frei0r-1/xfade0r.so
 libdata/pkgconfig/frei0r.pc