Upate colord to 1.2.4 and gnome-color-manager to 3.14.1. The

slve colord-gtk (now in ports) works fine with the new
1.2.4 (although it would need to get the dirrmtry removed
from its pkg-plist).


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19998 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 39 insertions, 79 deletions

diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 5ea2ec54c..0c2ba8aa7 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	colord
-PORTVERSION=	1.1.7
+PORTVERSION=	1.2.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index b598ff2d8..b3ecb0f91 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,2 +1,2 @@
-SHA256 (colord-1.1.7.tar.xz) = 295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44
-SIZE (colord-1.1.7.tar.xz) = 1118432
+SHA256 (colord-1.2.4.tar.xz) = 98440deb524f71894a3542cd84c1f10e9306092a908854227b1b065ea3274035
+SIZE (colord-1.2.4.tar.xz) = 1177272
diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist
index ced394dd7..2a243415f 100644
--- a/graphics/colord/pkg-plist
+++ b/graphics/colord/pkg-plist
@@ -29,6 +29,7 @@ include/colord-1/colord/cd-profile.h
 include/colord-1/colord/cd-quirk.h
 include/colord-1/colord/cd-sensor-sync.h
 include/colord-1/colord/cd-sensor.h
+include/colord-1/colord/cd-spectrum.h
 include/colord-1/colord/cd-transform.h
 include/colord-1/colord/cd-version.h
 lib/colord-sensors/libcolord_sensor_argyll.a
@@ -74,6 +75,8 @@ share/color/icc/colord/SwappedRedAndGreen.icc
 share/color/icc/colord/WideGamutRGB.icc
 share/color/icc/colord/sRGB.icc
 share/color/icc/colord/x11-colors.icc
+share/colord/cmf/CIE1931-2deg-XYZ.cmf
+share/colord/cmf/CIE1964-10deg-XYZ.cmf
 share/colord/icons/color-munki-photo-ambient.svg
 share/colord/icons/color-munki-photo-attach.svg
 share/colord/icons/color-munki-photo-calibrate.svg
@@ -90,6 +93,28 @@ share/colord/icons/i1-pro-attach.svg
 share/colord/icons/spyder2-attach.svg
 share/colord/icons/spyder3-attach.svg
 share/colord/icons/spyder4-attach.svg
+share/colord/illuminant/CIE-A.sp
+share/colord/illuminant/CIE-B.sp
+share/colord/illuminant/CIE-C.sp
+share/colord/illuminant/CIE-D50.sp
+share/colord/illuminant/CIE-D55.sp
+share/colord/illuminant/CIE-D65.sp
+share/colord/illuminant/CIE-D93.sp
+share/colord/illuminant/CIE-E.sp
+share/colord/illuminant/CIE-F1.sp
+share/colord/illuminant/CIE-F10.sp
+share/colord/illuminant/CIE-F11.sp
+share/colord/illuminant/CIE-F12.sp
+share/colord/illuminant/CIE-F2.sp
+share/colord/illuminant/CIE-F3.sp
+share/colord/illuminant/CIE-F4.sp
+share/colord/illuminant/CIE-F5.sp
+share/colord/illuminant/CIE-F6.sp
+share/colord/illuminant/CIE-F7.sp
+share/colord/illuminant/CIE-F8.sp
+share/colord/illuminant/CIE-F9.sp
+share/colord/ref/CIE-1986-daylight-SPD.cmf
+share/colord/ref/CIE-TCS.sp
 share/colord/ti1/display-long.ti1
 share/colord/ti1/display-normal.ti1
 share/colord/ti1/display-short.ti1
@@ -169,43 +194,5 @@ share/locale/zh_CN/LC_MESSAGES/colord.mo
 share/locale/zh_HK/LC_MESSAGES/colord.mo
 share/locale/zh_TW/LC_MESSAGES/colord.mo
 share/polkit-1/actions/org.freedesktop.color.policy
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/nn_NO/LC_MESSAGES
-@dirrmtry share/locale/nn_NO
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/it_IT/LC_MESSAGES
-@dirrmtry share/locale/it_IT
-@dirrmtry share/locale/ia/LC_MESSAGES
-@dirrmtry share/locale/ia
-@dirrmtry share/locale/da_DK/LC_MESSAGES
-@dirrmtry share/locale/da_DK
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/bg_BG/LC_MESSAGES
-@dirrmtry share/locale/bg_BG
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm share/colord/ti1
-@dirrm share/colord/icons
-@dirrm share/colord
-@dirrm share/color/icc/colord
-@dirrm share/color/icc
-@dirrm share/color
-@dirrm lib/colord-sensors
-@dirrm include/colord-1/colord-session
-@dirrm include/colord-1/colord
-@dirrm include/colord-1
-@cwd /
-@dirrmtry var/db/colord/icc
-@dirrmtry var/db/colord
-@cwd
+@dir /var/db/colord/icc
+@dir /var/db/colord
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
index 1be6916ea..6449b729b 100644
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gnome-color-manager
-PORTVERSION=	3.12.3
-PORTREVISION=	2
+PORTVERSION=	3.14.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/graphics/gnome-color-manager/distinfo b/graphics/gnome-color-manager/distinfo
index 628f4cfee..362f2f3d4 100644
--- a/graphics/gnome-color-manager/distinfo
+++ b/graphics/gnome-color-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-color-manager-3.12.3.tar.xz) = ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039
-SIZE (gnome3/gnome-color-manager-3.12.3.tar.xz) = 2618564
+SHA256 (gnome3/gnome-color-manager-3.14.1.tar.xz) = 806333af6f31e976ca9a1abca19a82cca8dde58bd0f6f81aeb200d0b9f610b19
+SIZE (gnome3/gnome-color-manager-3.14.1.tar.xz) = 2628920
diff --git a/graphics/gnome-color-manager/pkg-plist b/graphics/gnome-color-manager/pkg-plist
index 2968e095e..6f65bc94a 100644
--- a/graphics/gnome-color-manager/pkg-plist
+++ b/graphics/gnome-color-manager/pkg-plist
@@ -65,6 +65,10 @@ share/help/es/gnome-color-manager/color-import-linux.page
 share/help/es/gnome-color-manager/color-import-osx.page
 share/help/es/gnome-color-manager/color-import-windows.page
 share/help/es/gnome-color-manager/legal.xml
+share/help/fi/gnome-color-manager/color-import-linux.page
+share/help/fi/gnome-color-manager/color-import-osx.page
+share/help/fi/gnome-color-manager/color-import-windows.page
+share/help/fi/gnome-color-manager/legal.xml
 share/help/fr/gnome-color-manager/color-import-linux.page
 share/help/fr/gnome-color-manager/color-import-osx.page
 share/help/fr/gnome-color-manager/color-import-windows.page
@@ -131,6 +135,7 @@ share/locale/eu/LC_MESSAGES/gnome-color-manager.mo
 share/locale/fa/LC_MESSAGES/gnome-color-manager.mo
 share/locale/fi/LC_MESSAGES/gnome-color-manager.mo
 share/locale/fr/LC_MESSAGES/gnome-color-manager.mo
+share/locale/fur/LC_MESSAGES/gnome-color-manager.mo
 share/locale/gl/LC_MESSAGES/gnome-color-manager.mo
 share/locale/gu/LC_MESSAGES/gnome-color-manager.mo
 share/locale/he/LC_MESSAGES/gnome-color-manager.mo
@@ -147,6 +152,7 @@ share/locale/lv/LC_MESSAGES/gnome-color-manager.mo
 share/locale/mr/LC_MESSAGES/gnome-color-manager.mo
 share/locale/ml/LC_MESSAGES/gnome-color-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-color-manager.mo
+share/locale/ne/LC_MESSAGES/gnome-color-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-color-manager.mo
 share/locale/or/LC_MESSAGES/gnome-color-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-color-manager.mo
@@ -171,35 +177,3 @@ share/locale/vi/LC_MESSAGES/gnome-color-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-color-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-color-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-color-manager.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrm share/help/zh_TW/gnome-color-manager
-@dirrmtry share/help/zh_TW
-@dirrm share/help/zh_HK/gnome-color-manager
-@dirrmtry share/help/zh_HK
-@dirrm share/help/zh_CN/gnome-color-manager
-@dirrm share/help/pt_BR/gnome-color-manager
-@dirrm share/help/ml/gnome-color-manager
-@dirrmtry share/help/ml
-@dirrm share/help/hu/gnome-color-manager
-@dirrm share/help/gl/gnome-color-manager
-@dirrm share/help/cs/gnome-color-manager
-@dirrm share/help/fr/gnome-color-manager
-@dirrm share/help/es/gnome-color-manager
-@dirrm share/help/el/gnome-color-manager
-@dirrm share/help/de/gnome-color-manager
-@dirrm share/help/C/gnome-color-manager
-@dirrm %%DATADIR%%/ti1
-@dirrm %%DATADIR%%/targets
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/figures
-@dirrm %%DATADIR%%
-@dirrmtry share/appdata