4 files changed, 90 insertions, 91 deletions

diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 7b4dec42e88b..f5ec247eec2b 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,19 +1,19 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/graphics/colord/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	colord
-PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTVERSION=	1.2.11
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Manage color profiles to accurately color input/output devices
 
+BUILD_DEPENDS=	spotread:${PORTSDIR}/graphics/argyllcms
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2
+RUN_DEPENDS=	spotread:${PORTSDIR}/graphics/argyllcms
 
 USERS=		colord
 GROUPS=		colord
@@ -32,8 +32,6 @@ CONFIGURE_ARGS=	--disable-udev \
 		--disable-sane \
 		--with-daemon-user=colord \
 		--disable-systemd-login
-# takes ages we don't want to wait.
-CONFIGURE_ARGS+=--disable-print-profiles
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	USB_CFLAGS="-I/usr/include" \
@@ -42,17 +40,16 @@ INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
 
-OPTIONS_DEFINE=	MANPAGES
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	MANPAGES PPROFILES
+OPTIONS_DEFAULT=MANPAGES
 
-.include <bsd.port.options.mk>
+MANPAGES_BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
+			docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+PPROFILES_DESC=		Build extra print profiles (long build time)
+PPROFILES_CONFIGURE_ENABLE=	print-profiles
 
-.if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
-PLIST_SUB+=	MAN=""
-.else
-PLIST_SUB+=	MAN="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wclobbered||g' \
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index b3ecb0f918cf..955ee3fe4bb1 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,2 +1,2 @@
-SHA256 (colord-1.2.4.tar.xz) = 98440deb524f71894a3542cd84c1f10e9306092a908854227b1b065ea3274035
-SIZE (colord-1.2.4.tar.xz) = 1177272
+SHA256 (colord-1.2.11.tar.xz) = dac29c83659703a8548db561bc670832f26b30f7a88ed90a6530eb052a10df8f
+SIZE (colord-1.2.11.tar.xz) = 1205468
diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in
index b59719ac3f69..4c059fd0dbe6 100644
--- a/graphics/colord/files/patch-Makefile.in
+++ b/graphics/colord/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	2014-09-20 11:19:51.251881889 +0200
-+++ Makefile.in	2014-09-20 11:20:28.024080455 +0200
-@@ -424,7 +424,7 @@
- # this needs client/cd-create-profile
+--- Makefile.in.orig	2015-04-26 18:53:13.990362000 +0200
++++ Makefile.in	2015-04-26 18:54:20.559863000 +0200
+@@ -92,7 +92,6 @@
+ @HAVE_UNIX_TRUE@am__append_1 = \
+ @HAVE_UNIX_TRUE@	man						\
+ @HAVE_UNIX_TRUE@	policy						\
+-@HAVE_UNIX_TRUE@	rules						\
+ @HAVE_UNIX_TRUE@	src
  
- # this needs data/profiles/*.icc
--SUBDIRS = policy man lib rules po client contrib doc examples data src
-+SUBDIRS = policy man lib po client contrib doc examples data src
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--enable-introspection				\
- 	--enable-fd-fallback				\
+ subdir = .
diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist
index 2a243415f716..1ded00e46f29 100644
--- a/graphics/colord/pkg-plist
+++ b/graphics/colord/pkg-plist
@@ -1,6 +1,7 @@
 bin/cd-create-profile
 bin/cd-fix-profile
 bin/cd-iccdump
+bin/cd-it8
 bin/colormgr
 etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
 include/colord-1/colord-private.h
@@ -40,17 +41,18 @@ lib/girepository-1.0/Colord-1.0.typelib
 lib/libcolord.a
 lib/libcolord.so
 lib/libcolord.so.2
-lib/libcolord.so.2.0.2
+lib/libcolord.so.2.0.4
 lib/libcolordprivate.a
 lib/libcolordprivate.so
 lib/libcolordprivate.so.2
-lib/libcolordprivate.so.2.0.2
+lib/libcolordprivate.so.2.0.4
 libdata/pkgconfig/colord.pc
 libexec/colord
 libexec/colord-session
-%%MAN%%man/man1/cd-create-profile.1.gz
-%%MAN%%man/man1/cd-fix-profile.1.gz
-%%MAN%%man/man1/colormgr.1.gz
+%%MANPAGES%%man/man1/cd-create-profile.1.gz
+%%MANPAGES%%man/man1/cd-fix-profile.1.gz
+%%MANPAGES%%man/man1/cd-it8.1.gz
+%%MANPAGES%%man/man1/colormgr.1.gz
 share/color/icc/colord/AdobeRGB1998.icc
 share/color/icc/colord/AppleRGB.icc
 share/color/icc/colord/BestRGB.icc
@@ -64,63 +66,78 @@ share/color/icc/colord/DonRGB4.icc
 share/color/icc/colord/ECI-RGBv1.icc
 share/color/icc/colord/ECI-RGBv2.icc
 share/color/icc/colord/EktaSpacePS5.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA27L_coated.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA28L_webcoated.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA29L_uncoated.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA30L_uncoated_yellowish.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA39L_coated.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA40L_SC_paper.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA45L_lwc.icc
+%%PPROFILES%%share/color/icc/colord/FOGRA47L_uncoated.icc
 share/color/icc/colord/Gamma5000K.icc
 share/color/icc/colord/Gamma5500K.icc
 share/color/icc/colord/Gamma6500K.icc
+%%PPROFILES%%share/color/icc/colord/GRACoL_TR006_coated.icc
+%%PPROFILES%%share/color/icc/colord/IFRA26S_2004_newsprint.icc
 share/color/icc/colord/NTSC-RGB.icc
 share/color/icc/colord/PAL-RGB.icc
 share/color/icc/colord/ProPhotoRGB.icc
 share/color/icc/colord/SMPTE-C-RGB.icc
+%%PPROFILES%%share/color/icc/colord/SNAP_TR002_newsprint.icc
+%%PPROFILES%%share/color/icc/colord/SWOP_TR003_coated_3.icc
 share/color/icc/colord/SwappedRedAndGreen.icc
+%%PPROFILES%%share/color/icc/colord/SWOP_TR005_coated_5.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
-share/colord/icons/color-munki-photo-projector.svg
-share/colord/icons/color-munki-photo-screen.svg
-share/colord/icons/color-munki-smile-attach.svg
-share/colord/icons/colorhug-attach.svg
-share/colord/icons/dtp94-attach.svg
-share/colord/icons/hcfr-attach.svg
-share/colord/icons/huey-attach.svg
-share/colord/icons/i1-display3-attach.svg
-share/colord/icons/i1-monitor-attach.svg
-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
-share/colord/ti1/printer-long.ti1
-share/colord/ti1/printer-normal.ti1
-share/colord/ti1/printer-short.ti1
+%%DATADIR%%/cmf/CIE1931-2deg-XYZ.cmf
+%%DATADIR%%/cmf/CIE1964-10deg-XYZ.cmf
+%%DATADIR%%/icons/color-munki-photo-ambient.svg
+%%DATADIR%%/icons/color-munki-photo-attach.svg
+%%DATADIR%%/icons/color-munki-photo-calibrate.svg
+%%DATADIR%%/icons/color-munki-photo-projector.svg
+%%DATADIR%%/icons/color-munki-photo-screen.svg
+%%DATADIR%%/icons/color-munki-smile-attach.svg
+%%DATADIR%%/icons/colorhug-attach.svg
+%%DATADIR%%/icons/colorhug2-attach.svg
+%%DATADIR%%/icons/dtp94-attach.svg
+%%DATADIR%%/icons/hcfr-attach.svg
+%%DATADIR%%/icons/huey-attach.svg
+%%DATADIR%%/icons/i1-display3-attach.svg
+%%DATADIR%%/icons/i1-monitor-attach.svg
+%%DATADIR%%/icons/i1-pro-attach.svg
+%%DATADIR%%/icons/spyder2-attach.svg
+%%DATADIR%%/icons/spyder3-attach.svg
+%%DATADIR%%/icons/spyder4-attach.svg
+%%DATADIR%%/icons/spyder5-attach.svg
+%%DATADIR%%/illuminant/CIE-A.sp
+%%DATADIR%%/illuminant/CIE-B.sp
+%%DATADIR%%/illuminant/CIE-C.sp
+%%DATADIR%%/illuminant/CIE-D50.sp
+%%DATADIR%%/illuminant/CIE-D55.sp
+%%DATADIR%%/illuminant/CIE-D65.sp
+%%DATADIR%%/illuminant/CIE-D93.sp
+%%DATADIR%%/illuminant/CIE-E.sp
+%%DATADIR%%/illuminant/CIE-F1.sp
+%%DATADIR%%/illuminant/CIE-F10.sp
+%%DATADIR%%/illuminant/CIE-F11.sp
+%%DATADIR%%/illuminant/CIE-F12.sp
+%%DATADIR%%/illuminant/CIE-F2.sp
+%%DATADIR%%/illuminant/CIE-F3.sp
+%%DATADIR%%/illuminant/CIE-F4.sp
+%%DATADIR%%/illuminant/CIE-F5.sp
+%%DATADIR%%/illuminant/CIE-F6.sp
+%%DATADIR%%/illuminant/CIE-F7.sp
+%%DATADIR%%/illuminant/CIE-F8.sp
+%%DATADIR%%/illuminant/CIE-F9.sp
+%%DATADIR%%/ref/CIE-1986-daylight-SPD.cmf
+%%DATADIR%%/ref/CIE-TCS.sp
+%%DATADIR%%/ti1/display-long.ti1
+%%DATADIR%%/ti1/display-normal.ti1
+%%DATADIR%%/ti1/display-short.ti1
+%%DATADIR%%/ti1/printer-long.ti1
+%%DATADIR%%/ti1/printer-normal.ti1
+%%DATADIR%%/ti1/printer-short.ti1
 share/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
@@ -130,47 +147,36 @@ share/dbus-1/services/org.freedesktop.ColorHelper.service
 share/dbus-1/system-services/org.freedesktop.ColorManager.service
 share/gir-1.0/Colord-1.0.gir
 share/locale/as/LC_MESSAGES/colord.mo
-share/locale/bg/LC_MESSAGES/colord.mo
-share/locale/bg_BG/LC_MESSAGES/colord.mo
 share/locale/bn_IN/LC_MESSAGES/colord.mo
 share/locale/ca/LC_MESSAGES/colord.mo
 share/locale/cs/LC_MESSAGES/colord.mo
 share/locale/da/LC_MESSAGES/colord.mo
-share/locale/da_DK/LC_MESSAGES/colord.mo
 share/locale/de/LC_MESSAGES/colord.mo
 share/locale/el/LC_MESSAGES/colord.mo
 share/locale/en_GB/LC_MESSAGES/colord.mo
 share/locale/eo/LC_MESSAGES/colord.mo
 share/locale/es/LC_MESSAGES/colord.mo
 share/locale/eu/LC_MESSAGES/colord.mo
-share/locale/fa/LC_MESSAGES/colord.mo
 share/locale/fi/LC_MESSAGES/colord.mo
 share/locale/fr/LC_MESSAGES/colord.mo
-share/locale/ga/LC_MESSAGES/colord.mo
 share/locale/gl/LC_MESSAGES/colord.mo
 share/locale/gu/LC_MESSAGES/colord.mo
 share/locale/he/LC_MESSAGES/colord.mo
 share/locale/hi/LC_MESSAGES/colord.mo
-share/locale/hr/LC_MESSAGES/colord.mo
 share/locale/hu/LC_MESSAGES/colord.mo
-share/locale/ia/LC_MESSAGES/colord.mo
 share/locale/id/LC_MESSAGES/colord.mo
 share/locale/it/LC_MESSAGES/colord.mo
 share/locale/it_IT/LC_MESSAGES/colord.mo
 share/locale/ja/LC_MESSAGES/colord.mo
-share/locale/ka/LC_MESSAGES/colord.mo
 share/locale/kk/LC_MESSAGES/colord.mo
 share/locale/kn/LC_MESSAGES/colord.mo
 share/locale/ko/LC_MESSAGES/colord.mo
-share/locale/lt/LC_MESSAGES/colord.mo
 share/locale/lv/LC_MESSAGES/colord.mo
 share/locale/ml/LC_MESSAGES/colord.mo
 share/locale/mr/LC_MESSAGES/colord.mo
-share/locale/ms/LC_MESSAGES/colord.mo
 share/locale/nb/LC_MESSAGES/colord.mo
 share/locale/nb_NO/LC_MESSAGES/colord.mo
 share/locale/nl/LC_MESSAGES/colord.mo
-share/locale/nn_NO/LC_MESSAGES/colord.mo
 share/locale/or/LC_MESSAGES/colord.mo
 share/locale/pa/LC_MESSAGES/colord.mo
 share/locale/pl/LC_MESSAGES/colord.mo
@@ -181,17 +187,14 @@ share/locale/ro/LC_MESSAGES/colord.mo
 share/locale/ru/LC_MESSAGES/colord.mo
 share/locale/sk/LC_MESSAGES/colord.mo
 share/locale/sl/LC_MESSAGES/colord.mo
-share/locale/sq/LC_MESSAGES/colord.mo
 share/locale/sr/LC_MESSAGES/colord.mo
 share/locale/sr@latin/LC_MESSAGES/colord.mo
 share/locale/sv/LC_MESSAGES/colord.mo
 share/locale/ta/LC_MESSAGES/colord.mo
-share/locale/te/LC_MESSAGES/colord.mo
 share/locale/th/LC_MESSAGES/colord.mo
 share/locale/tr/LC_MESSAGES/colord.mo
 share/locale/uk/LC_MESSAGES/colord.mo
 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
 @dir /var/db/colord/icc