5 files changed, 63 insertions, 41 deletions

diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index c11857a316c7..36c859814ccf 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	oyranos
-PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTVERSION=	0.9.5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|}
 
@@ -25,8 +24,7 @@ LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libXcm.so:${PORTSDIR}/x11/libXcm
 
-USES=		cmake gettext iconv pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 cmake gettext iconv pkgconfig
 USE_GL=		yes
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
diff --git a/graphics/oyranos/distinfo b/graphics/oyranos/distinfo
index cdea5ac35ce9..dbb7942530a8 100644
--- a/graphics/oyranos/distinfo
+++ b/graphics/oyranos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oyranos-0.9.4.tar.bz2) = 6dcf7f8bef0720077ee55484a5b507ba5f049094f21fbbd2752f2ed120c0768a
-SIZE (oyranos-0.9.4.tar.bz2) = 1632276
+SHA256 (oyranos-0.9.5.tar.bz2) = 75c2681e6d95cb969336f1e9bdfe12a85ae6a5bd438573d7d2955b37ea466e40
+SIZE (oyranos-0.9.5.tar.bz2) = 1800977
diff --git a/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c b/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c
new file mode 100644
index 000000000000..a9eb9da240a5
--- /dev/null
+++ b/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c
@@ -0,0 +1,14 @@
+--- 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_examples_oforms_CMakeLists.txt b/graphics/oyranos/files/patch-src_examples_oforms_CMakeLists.txt
index e0667cdda515..d249ce6caa60 100644
--- a/graphics/oyranos/files/patch-src_examples_oforms_CMakeLists.txt
+++ b/graphics/oyranos/files/patch-src_examples_oforms_CMakeLists.txt
@@ -1,9 +1,8 @@
 --- src/examples/oforms/CMakeLists.txt.orig	2013-05-01 18:22:36.000000000 +0400
 +++ src/examples/oforms/CMakeLists.txt	2013-05-01 18:22:55.000000000 +0400
-@@ -27,5 +27,5 @@ ADD_EXECUTABLE( ../oyranos-xforms-module
- TARGET_LINK_LIBRARIES( ../oyranos-xforms-modules
-              oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
- INSTALL (TARGETS ../oyranos-xforms-modules DESTINATION bin)
+@@ -7,5 +7,5 @@
+ 
+ MESSAGE( "-- OY_OFORMS_LIB: ${OY_OFORMS_LIB}" )
+ 
 -INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION share/man/man1 )
 +INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION man/man1 )
- 
diff --git a/graphics/oyranos/pkg-plist b/graphics/oyranos/pkg-plist
index ca2672969a58..8e5e1d5189d8 100644
--- a/graphics/oyranos/pkg-plist
+++ b/graphics/oyranos/pkg-plist
@@ -1,20 +1,27 @@
-bin/oyranos-config
-bin/oyranos-config-fltk
-bin/oyranos-icc
-bin/oyranos-monitor
-bin/oyranos-monitor-daemon
-bin/oyranos-policy
-bin/oyranos-profile
-bin/oyranos-profile-graph
-bin/oyranos-profile-install
-bin/oyranos-profiles
-bin/oyranos-xforms-modules
-bin/qcmsevents
-etc/xdg/autostart/oyranos-monitor-setup.desktop
+%%QT_BINDIR%%/oyranos-config
+%%QT_BINDIR%%/oyranos-config-fltk
+%%QT_BINDIR%%/oyranos-icc
+%%QT_BINDIR%%/oyranos-monitor
+%%QT_BINDIR%%/oyranos-monitor-daemon
+%%QT_BINDIR%%/oyranos-policy
+%%QT_BINDIR%%/oyranos-profile
+%%QT_BINDIR%%/oyranos-profile-graph
+%%QT_BINDIR%%/oyranos-profile-install
+%%QT_BINDIR%%/oyranos-profiles
+%%QT_BINDIR%%/oyranos-xforms-modules
+%%QT_BINDIR%%/qcmsevents
+%%QT_ETCDIR%%/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/oyCMMapi4_s.h
+include/oyranos/oyCMMapi7_s.h
+include/oyranos/oyCMMapiFilter_s.h
+include/oyranos/oyCMMapiFilters_s.h
+include/oyranos/oyCMMapi_s.h
+include/oyranos/oyCMMapis_s.h
+include/oyranos/oyCMMui_s.h
 include/oyranos/oyConfig_s.h
 include/oyranos/oyConfigs_s.h
 include/oyranos/oyConnectorImaging_s.h
@@ -30,6 +37,8 @@ include/oyranos/oyFilterSocket_s.h
 include/oyranos/oyHash_s.h
 include/oyranos/oyImage_s.h
 include/oyranos/oyName_s.h
+include/oyranos/oyNamedColor_s.h
+include/oyranos/oyNamedColors_s.h
 include/oyranos/oyObject_s.h
 include/oyranos/oyObserver_s.h
 include/oyranos/oyOption_s.h
@@ -43,7 +52,7 @@ include/oyranos/oyRectangle_s.h
 include/oyranos/oyStructList_s.h
 include/oyranos/oyStruct_s.h
 include/oyranos/oyranos.h
-include/oyranos/oyranos_colour.h
+include/oyranos/oyranos_color.h
 include/oyranos/oyranos_config.h
 include/oyranos/oyranos_conversion.h
 include/oyranos/oyranos_core.h
@@ -57,16 +66,16 @@ include/oyranos/oyranos_object.h
 include/oyranos/oyranos_profile.h
 include/oyranos/oyranos_types.h
 include/oyranos/oyranos_version.h
-lib/colour/modules/liboyranos_CUPS_cmm_module.so
-lib/colour/modules/liboyranos_lcm2_cmm_module.so
-lib/colour/modules/liboyranos_lcms_cmm_module.so
-lib/colour/modules/liboyranos_lraw_cmm_module.so
-lib/colour/modules/liboyranos_oPNG_cmm_module.so
-lib/colour/modules/liboyranos_oicc_cmm_module.so
-lib/colour/modules/liboyranos_oyRE_cmm_module.so
-lib/colour/modules/liboyranos_oyX1_cmm_module.so
-lib/colour/modules/liboyranos_oydi_cmm_module.so
-lib/colour/modules/liboyranos_oyra_cmm_module.so
+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_oPNG_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/liboyranos-static.a
 lib/liboyranos.so
 lib/liboyranos.so.0
@@ -118,9 +127,11 @@ share/pixmaps/oyranos_logo.png
 share/pixmaps/qcmsevents.svg
 @dirrmtry share/color/settings
 @dirrmtry share/color
-@dirrm lib/oyranos/cmake
-@dirrm lib/oyranos
-@dirrmtry lib/colour/modules
-@dirrmtry lib/colour
-@dirrm include/oyranos/alpha
-@dirrm include/oyranos
+@dirrmtry lib/oyranos/cmake
+@dirrmtry lib/oyranos
+@dirrmtry lib/color/modules
+@dirrmtry lib/color
+@dirrmtry include/oyranos/alpha
+@dirrmtry include/oyranos
+@dirrmtry %%QT_ETCDIR%%/autostart
+@dirrmtry %%QT_ETCDIR%%