6 files changed, 79 insertions, 50 deletions

diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index 61f0cc2d8e07..416641aac89f 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	oyranos
-PORTVERSION=	0.9.5
-PORTREVISION=	14
+PORTVERSION=	0.9.6
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|}
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Colour Management System (CMS)
 
+LICENSE=	BSD3CLAUSE
+
 RUN_DEPENDS=	${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \
-		${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor
+		${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \
+		xcalib:x11/xcalib
 LIB_DEPENDS=	libraw.so:graphics/libraw \
 		libexiv2.so:graphics/exiv2 \
 		libpng.so:graphics/png \
@@ -19,22 +20,25 @@ LIB_DEPENDS=	libraw.so:graphics/libraw \
 		libfltk.so:x11-toolkits/fltk \
 		libcups.so:print/cups \
 		libxdot.so:graphics/graphviz \
-		liblcms.so:graphics/lcms \
 		liblcms2.so:graphics/lcms2 \
-		libXcm.so:x11/libXcm
-
-USES=		cmake gettext iconv pkgconfig tar:bzip2
-USE_GL=		yes
+		libXcm.so:x11/libXcm \
+		libltdl.so:devel/libltdl \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libOpenICC.so:graphics/openicc-config
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	oyranos-cms
+USES=		cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig
+USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
-USE_QT4=	gui moc_build qmake_build rcc_build uic_build
-USE_XORG=	xfixes xinerama xrandr xxf86vm
+USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
+USE_XORG=	ice sm x11 xcursor xext xfixes xinerama xrandr xft xxf86vm
 CMAKE_ARGS+=	-DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOXYGEN
-
 DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
 
 PORTDOCS=	*
diff --git a/graphics/oyranos/distinfo b/graphics/oyranos/distinfo
index dbb7942530a8..32f2d280c41a 100644
--- a/graphics/oyranos/distinfo
+++ b/graphics/oyranos/distinfo
@@ -1,2 +1,3 @@
-SHA256 (oyranos-0.9.5.tar.bz2) = 75c2681e6d95cb969336f1e9bdfe12a85ae6a5bd438573d7d2955b37ea466e40
-SIZE (oyranos-0.9.5.tar.bz2) = 1800977
+TIMESTAMP = 1482605955
+SHA256 (oyranos-cms-oyranos-0.9.6_GH0.tar.gz) = 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b
+SIZE (oyranos-cms-oyranos-0.9.6_GH0.tar.gz) = 2247841
diff --git a/graphics/oyranos/files/patch-CMakeLists.txt b/graphics/oyranos/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..c60668d2cb9c
--- /dev/null
+++ b/graphics/oyranos/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2016-12-09 13:36:53.000000000 +0300
++++ CMakeLists.txt	2016-12-26 17:57:38.831330000 +0300
+@@ -66,6 +66,10 @@
+   ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+ ENDIF(UNIX)
+ 
++# Add /usr/local/include to search path
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++  SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
++ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ 
+ # detect top level projects
+ IF(USE_SYSTEM_YAJL)
diff --git a/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c b/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c
deleted file mode 100644
index a9eb9da240a5..000000000000
--- a/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/liboyranos_core/oyranos_threads.c.orig	2014-03-13 22:06:34.153920114 +0400
-+++ src/liboyranos_core/oyranos_threads.c	2014-03-13 22:07:12.182505283 +0400
-@@ -181,9 +181,11 @@
-     oyObject_Lock( oy_job_message_list_->oy_, __func__, __LINE__ );
-     oyObject_UnLock( oy_job_message_list_->oy_, __func__, __LINE__ );
- 
-+#ifdef _OPENMP
-     if((omp_get_num_procs() - 1) >= 1)
-       oy_thread_count_ = omp_get_num_procs() - 1;
-     else
-+#endif
-       oy_thread_count_ = 1;
- 
-     oy_threads_ = (oyThread_t*)calloc(sizeof(oyThread_t),oy_thread_count_+1);
diff --git a/graphics/oyranos/files/patch-src_CMakeLists.txt b/graphics/oyranos/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..2c19eb86f24c
--- /dev/null
+++ b/graphics/oyranos/files/patch-src_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/CMakeLists.txt.orig	2016-12-09 13:36:53.000000000 +0300
++++ src/CMakeLists.txt	2016-12-24 23:59:33.793724000 +0300
+@@ -63,7 +63,6 @@
+   FIND_PATH(DL_INCLUDE_DIR dlfcn.h)
+   IF(DL_INCLUDE_DIR)
+     SET( HAVE_DL 1 )
+-    SET( EXTRA_LIBS ${EXTRA_LIBS} dl )
+   ENDIF(DL_INCLUDE_DIR)
+ ENDIF(HAVE_DL)
+ 
diff --git a/graphics/oyranos/pkg-plist b/graphics/oyranos/pkg-plist
index 6e103b64191c..d376eb73aa4d 100644
--- a/graphics/oyranos/pkg-plist
+++ b/graphics/oyranos/pkg-plist
@@ -1,6 +1,7 @@
 bin/oyranos-config
 bin/oyranos-config-fltk
 bin/oyranos-icc
+bin/oyranos-image-display
 bin/oyranos-monitor
 bin/oyranos-monitor-daemon
 bin/oyranos-policy
@@ -8,13 +9,16 @@ bin/oyranos-profile
 bin/oyranos-profile-graph
 bin/oyranos-profile-install
 bin/oyranos-profiles
+bin/oyranos-xforms
+bin/oyranos-xforms-fltk
 bin/oyranos-xforms-modules
-bin/qcmsevents
+bin/qcmsevents-qt4
 etc/xdg/autostart/oyranos-monitor-setup.desktop
 include/oyranos/alpha/oyranos_alpha.h
 include/oyranos/icc34.h
 include/oyranos/oyArray2d_s.h
 include/oyranos/oyBlob_s.h
+include/oyranos/oyCMM_s.h
 include/oyranos/oyCMMapi4_s.h
 include/oyranos/oyCMMapi7_s.h
 include/oyranos/oyCMMapiFilter_s.h
@@ -53,7 +57,6 @@ include/oyranos/oyStructList_s.h
 include/oyranos/oyStruct_s.h
 include/oyranos/oyranos.h
 include/oyranos/oyranos_color.h
-include/oyranos/oyranos_config.h
 include/oyranos/oyranos_conversion.h
 include/oyranos/oyranos_core.h
 include/oyranos/oyranos_definitions.h
@@ -64,40 +67,43 @@ include/oyranos/oyranos_image.h
 include/oyranos/oyranos_module.h
 include/oyranos/oyranos_object.h
 include/oyranos/oyranos_profile.h
+include/oyranos/oyranos_threads.h
 include/oyranos/oyranos_types.h
 include/oyranos/oyranos_version.h
+lib/cmake/oyranos/OyranosConfig.cmake
 lib/color/modules/liboyranos_CUPS_cmm_module.so
 lib/color/modules/liboyranos_lcm2_cmm_module.so
-lib/color/modules/liboyranos_lcms_cmm_module.so
 lib/color/modules/liboyranos_lraw_cmm_module.so
+lib/color/modules/liboyranos_oJPG_cmm_module.so
 lib/color/modules/liboyranos_oPNG_cmm_module.so
+lib/color/modules/liboyranos_oiDB_cmm_module.so
 lib/color/modules/liboyranos_oicc_cmm_module.so
 lib/color/modules/liboyranos_oyRE_cmm_module.so
 lib/color/modules/liboyranos_oyX1_cmm_module.so
 lib/color/modules/liboyranos_oydi_cmm_module.so
 lib/color/modules/liboyranos_oyra_cmm_module.so
+lib/color/modules/liboyranos_trds_cmm_module.so
+lib/libOyranos.so
+lib/libOyranos.so.0
+lib/libOyranos.so.%%VER%%
+lib/libOyranosConfig.so
+lib/libOyranosConfig.so.0
+lib/libOyranosConfig.so.%%VER%%
+lib/libOyranosCore.so
+lib/libOyranosCore.so.0
+lib/libOyranosCore.so.%%VER%%
+lib/libOyranosModules.so
+lib/libOyranosModules.so.0
+lib/libOyranosModules.so.%%VER%%
+lib/libOyranosObject.so
+lib/libOyranosObject.so.0
+lib/libOyranosObject.so.%%VER%%
 lib/liboyranos-static.a
-lib/liboyranos.so
-lib/liboyranos.so.0
-lib/liboyranos.so.%%VER%%
 lib/liboyranos_config-static.a
-lib/liboyranos_config.so
-lib/liboyranos_config.so.0
-lib/liboyranos_config.so.%%VER%%
 lib/liboyranos_core-static.a
-lib/liboyranos_core.so
-lib/liboyranos_core.so.0
-lib/liboyranos_core.so.%%VER%%
 lib/liboyranos_modules-static.a
-lib/liboyranos_modules.so
-lib/liboyranos_modules.so.0
-lib/liboyranos_modules.so.%%VER%%
 lib/liboyranos_object-static.a
-lib/liboyranos_object.so
-lib/liboyranos_object.so.0
-lib/liboyranos_object.so.%%VER%%
-lib/oyranos/cmake/OyranosConfig.cmake
-lib/oyranos/liboyranos_oyIM_cmm_module.so
+lib/oyranos-meta/liboyranos_oyIM_cmm_module.so
 libdata/pkgconfig/oyranos.pc
 man/man1/oyranos-config-fltk.1.gz
 man/man1/oyranos-monitor-daemon.1.gz
@@ -108,11 +114,16 @@ man/man1/oyranos-profile-install.1.gz
 man/man1/oyranos-profile.1.gz
 man/man1/oyranos-profiles.1.gz
 man/man1/oyranos-xforms-modules.1.gz
+man/man1/qcmsevents-qt4.1.gz
 man/man1/qcmsevents.1.gz
 man/man3/oyranos-config.3.gz
 man/man3/oyranos.3.gz
+share/applications/oyranos-image-display.desktop
 share/applications/oyranos-profile-install.desktop
-share/applications/qcmsevents-applet.desktop
+share/applications/qcmsevents-qt4-applet.desktop
+share/color/rank-map/config.icc_profile.monitor.oyX1.qarz.json
+share/color/rank-map/config.icc_profile.printer.CUPS.json
+share/color/rank-map/config.icc_profile.raw-image.oyRE.json
 share/color/settings/designer.policy.xml
 share/color/settings/office.policy.xml
 share/color/settings/photographer.policy.xml
@@ -122,6 +133,10 @@ share/locale/de/LC_MESSAGES/oyranos.mo
 share/locale/eo/LC_MESSAGES/oyranos.mo
 share/locale/eu/LC_MESSAGES/oyranos.mo
 share/locale/fr/LC_MESSAGES/oyranos.mo
+share/locale/ru/LC_MESSAGES/oyranos.mo
+share/man/man1/oyranos-image-display.1
+share/man/man1/oyranos-xforms-fltk.1
+share/man/man1/oyranos-xforms-modules.1
 share/pixmaps/lcms_logo2.png
 share/pixmaps/oyranos_logo.png
-share/pixmaps/qcmsevents.svg
+share/pixmaps/qcmsevents-qt4.svg