diff -ruN nomacs/Makefile nomacs-neu/Makefile
--- nomacs/Makefile	2014-07-22 22:40:35.000000000 +0200
+++ nomacs-neu/Makefile	2014-07-24 15:17:24.000000000 +0200
@@ -1,8 +1,7 @@
 # $FreeBSD: head/graphics/nomacs/Makefile 350164 2014-04-04 20:36:47Z danfe $
 
 PORTNAME=	nomacs
-PORTVERSION=	1.6.4
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -30,6 +29,7 @@
 RAW_LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw \
 			libopencv_core.so:${PORTSDIR}/graphics/opencv-core
 RAW_CMAKE_OFF=		-DENABLE_RAW=0
+RAW_CMAKE_ON=           -DENABLE_OPENCV=1
 
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 TIFF_CMAKE_OFF=		-DENABLE_TIFF=0
diff -ruN nomacs/distinfo nomacs-neu/distinfo
--- nomacs/distinfo	2014-07-22 22:40:35.000000000 +0200
+++ nomacs-neu/distinfo	2014-07-24 15:17:24.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (nomacs-1.6.4-source.tar.bz2) = 85bb13567165af08f699ee87630151bf2a81d77cd75e025a7a332ab9c9022a94
-SIZE (nomacs-1.6.4-source.tar.bz2) = 1173684
+SHA256 (nomacs-2.0.0-source.tar.bz2) = a47c09b073396692e87c0cf7e177e15a63cd8621fcb05b52276986522570c73c
+SIZE (nomacs-2.0.0-source.tar.bz2) = 1269714
diff -ruN nomacs/files/patch-CMakeLists.txt nomacs-neu/files/patch-CMakeLists.txt
--- nomacs/files/patch-CMakeLists.txt	2014-07-22 22:40:35.000000000 +0200
+++ nomacs-neu/files/patch-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
---- ./CMakeLists.txt.orig	2013-12-02 09:23:52.000000000 -0500
-+++ ./CMakeLists.txt	2013-12-02 09:25:24.000000000 -0500
-@@ -208,19 +178,12 @@
-     endif()
- 	          
- 	# OpenCV
--	SET(OpenCV_LIBS "")
--	if (PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux  with old old opencv systems
--		pkg_check_modules(OpenCV  opencv>=2.1.0)
--		SET(OpenCV_LIBS ${OpenCV_LIBRARIES})
--	endif(PKG_CONFIG_FOUND)
--	IF (OpenCV_LIBS STREQUAL "") 
--		find_package(OpenCV 2.1.0 REQUIRED core imgproc)
--	ENDIF()
-+		find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
- 	IF (OpenCV_VERSION VERSION_LESS 2.4.0 AND OpenCV_FOUND AND MSVC) # OpenCV didn't allow to define packages before version 2.4.0 ... nomacs was linking against all libs even if they were not compiled -> error
- 		string(REGEX REPLACE "\\." "" OpenCV_SHORT_VERSION ${OpenCV_VERSION})
- 		SET(OpenCV_LIBS "debug;opencv_imgproc${OpenCV_SHORT_VERSION}d;optimized;opencv_imgproc${OpenCV_SHORT_VERSION};debug;opencv_core${OpenCV_SHORT_VERSION}d;optimized;opencv_core${OpenCV_SHORT_VERSION};")
- 	ENDIF()
--	IF (NOT OpenCV_FOUND)
-+	IF (NOT OPENCVCORE_FOUND)
- 		message(FATAL_ERROR "OpenCV not found. It's mandatory when used with ENABLE_RAW enabled") 
- 	ELSE()
- 		add_definitions(-DWITH_OPENCV)
-@@ -285,6 +243,8 @@
- 	
- ENDIF(ENABLE_TIFF)
- 
-+# sysinfo library
-+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)
- 	
- include_directories (
- 	${QT_INCLUDES}
-@@ -427,7 +387,7 @@
- 		set(EXE_NAME ${CMAKE_PROJECT_NAME})
- 		link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
- 		add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE})
--		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES})
-+		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${SYSINFO_LIBRARY})
- 
- 		IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
- 			SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp)
diff -ruN nomacs/files/patch-Unix-cmake.diff nomacs-neu/files/patch-Unix-cmake.diff
--- nomacs/files/patch-Unix-cmake.diff	1970-01-01 01:00:00.000000000 +0100
+++ nomacs-neu/files/patch-Unix-cmake.diff	2014-07-24 15:17:24.000000000 +0200
@@ -0,0 +1,52 @@
+--- cmake/Unix.cmake.orig	2014-07-22 10:45:43.000000000 +0200
++++ cmake/Unix.cmake	2014-07-24 15:00:21.000000000 +0200
+@@ -36,21 +36,12 @@
+ # search for opencv
+ unset(OpenCV_FOUND CACHE)
+ if(ENABLE_OPENCV)
+-	set(OpenCV_LIBS "")
+-	set(OpenCV_FOUND false)
+-	if(PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux  with old old opencv systems
+-		pkg_check_modules(OpenCV  opencv>=2.1.0)
+-		set(OpenCV_LIBS ${OpenCV_LIBRARIES})
+-	endif(PKG_CONFIG_FOUND)
+-
+-	if(OpenCV_LIBS STREQUAL "")
+-		find_package(OpenCV 2.1.0 REQUIRED core imgproc)
+-	endif(OpenCV_LIBS STREQUAL "")
++        find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
+ 
+-	if(NOT OpenCV_FOUND)
++	if(NOT OPENCVCORE_FOUND)
+ 		message(FATAL_ERROR "OpenCV not found.") 
+ 	else()
+-		add_definitions(-DWITH_OPENCV)
++		add_definitions(-DENABLE_OPENCV)
+ 	endif()
+ 
+ 	if(${OpenCV_VERSION} EQUAL "2.1.0")
+@@ -60,7 +51,7 @@
+ 
+ # search for libraw
+ if(ENABLE_RAW)
+-	if(NOT OpenCV_FOUND)
++	if(NOT ENABLE_OPENCV)
+ 		message(FATAL_ERROR "OpenCV is mandotory when enabling RAW. You have to enable ENABLE_OPENCV")
+ 	endif()
+ 
+@@ -76,7 +67,7 @@
+ unset(TIFF_INCLUDE_DIR CACHE)
+ unset(TIFF_LIBRARY CACHE)
+ if(ENABLE_TIFF)
+-	if(NOT OpenCV_FOUND)
++	if(NOT ENABLE_OPENCV)
+ 		message(FATAL_ERROR "OpenCV is mandotory when enabling TIFF. You have to enable ENABLE_OPENCV")
+ 	endif()
+ 	find_package(TIFF)
+@@ -87,3 +78,6 @@
+ 		message(FATAL_ERROR "libtiff was not found. It's mandatory when used with ENABLE_TIFF enabled.")
+ 	endif()
+ endif(ENABLE_TIFF)
++
++# sysinfo library
++FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)
diff -ruN nomacs/files/patch-UnixBuildTarget-cmake.diff nomacs-neu/files/patch-UnixBuildTarget-cmake.diff
--- nomacs/files/patch-UnixBuildTarget-cmake.diff	1970-01-01 01:00:00.000000000 +0100
+++ nomacs-neu/files/patch-UnixBuildTarget-cmake.diff	2014-07-24 15:17:24.000000000 +0200
@@ -0,0 +1,11 @@
+--- ./cmake/UnixBuildTarget.cmake.old	2014-07-23 23:44:53.000000000 +0200
++++ ./cmake/UnixBuildTarget.cmake	2014-07-23 23:45:42.000000000 +0200
+@@ -3,7 +3,7 @@
+   set(BINARY_NAME ${CMAKE_PROJECT_NAME})
+   link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
+   add_executable(${BINARY_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE})
+-  target_link_libraries(${BINARY_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARY})
++  target_link_libraries(${BINARY_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARY} ${SYSINFO_LIBRARY})
+ 
+   if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ 	  SET_TARGET_PROPERTIES(${BINARY_NAME} PROPERTIES LINK_FLAGS -fopenmp)