Index: head/graphics/oyranos/Makefile =================================================================== --- head/graphics/oyranos/Makefile (revision 447176) +++ head/graphics/oyranos/Makefile (revision 447177) @@ -1,52 +1,56 @@ # $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 \ libcairo.so:graphics/cairo \ libyajl.so:devel/yajl \ 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 + libXcm.so:x11/libXcm \ + libltdl.so:devel/libltdl \ + libfontconfig.so:x11-fonts/fontconfig \ + libOpenICC.so:graphics/openicc-config -USES= cmake gettext iconv pkgconfig tar:bzip2 -USE_GL= yes +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= * PLIST_SUB+= VER=${PORTVERSION} .if !exists(/usr/bin/clang) USE_GCC= yes .endif post-patch: @${REINPLACE_CMD} -e 's|lib|libdata|' \ ${WRKSRC}/extras/CMakeLists.txt .include Index: head/graphics/oyranos/distinfo =================================================================== --- head/graphics/oyranos/distinfo (revision 447176) +++ head/graphics/oyranos/distinfo (revision 447177) @@ -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 Index: head/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c =================================================================== --- head/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c (revision 447176) +++ head/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c (nonexistent) @@ -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); Property changes on: head/graphics/oyranos/files/patch-src-liboyranos_core-oyranos_threads.c ___________________________________________________________________ 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/oyranos/files/patch-CMakeLists.txt =================================================================== --- head/graphics/oyranos/files/patch-CMakeLists.txt (nonexistent) +++ head/graphics/oyranos/files/patch-CMakeLists.txt (revision 447177) @@ -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) Property changes on: head/graphics/oyranos/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/oyranos/files/patch-src_CMakeLists.txt =================================================================== --- head/graphics/oyranos/files/patch-src_CMakeLists.txt (nonexistent) +++ head/graphics/oyranos/files/patch-src_CMakeLists.txt (revision 447177) @@ -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) + Property changes on: head/graphics/oyranos/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/oyranos/pkg-plist =================================================================== --- head/graphics/oyranos/pkg-plist (revision 447176) +++ head/graphics/oyranos/pkg-plist (revision 447177) @@ -1,127 +1,142 @@ bin/oyranos-config bin/oyranos-config-fltk bin/oyranos-icc +bin/oyranos-image-display 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 +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 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 include/oyranos/oyConnector_s.h include/oyranos/oyConversion_s.h include/oyranos/oyFilterCore_s.h include/oyranos/oyFilterGraph_s.h include/oyranos/oyFilterNode_s.h include/oyranos/oyFilterNodes_s.h include/oyranos/oyFilterPlug_s.h include/oyranos/oyFilterPlugs_s.h 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 include/oyranos/oyOptions_s.h include/oyranos/oyPixelAccess_s.h include/oyranos/oyPointer_s.h include/oyranos/oyProfileTag_s.h include/oyranos/oyProfile_s.h include/oyranos/oyProfiles_s.h include/oyranos/oyRectangle_s.h 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 include/oyranos/oyranos_devices.h include/oyranos/oyranos_generic.h include/oyranos/oyranos_icc.h 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 man/man1/oyranos-monitor.1.gz man/man1/oyranos-policy.1.gz man/man1/oyranos-profile-graph.1.gz 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 share/color/settings/prepress.policy.xml share/locale/cs/LC_MESSAGES/oyranos.mo 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