Update to 1.1.7.

This includes a shlib bump, pkg handles this by itself, port users need
to manualy rebuild.
portmaster -r colord


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

4 files changed, 28 insertions, 20 deletions

diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index a90a0a887..5ea2ec54c 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -3,8 +3,7 @@
 #    $MCom$
 
 PORTNAME=	colord
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 
@@ -24,7 +23,7 @@ USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS=	--disable-gudev \
+CONFIGURE_ARGS=	--disable-udev \
 		--enable-gtk-doc-html=no \
 		--disable-bash-completion \
 		--disable-gusb \
@@ -64,7 +63,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|lib/color|db/color|g' \
 		-e 's|/usr/share/color|${PREFIX}/share/color|g' \
 		${WRKSRC}/src/cd-main.c \
-		${WRKSRC}/src/cd-profile-store.c \
+		${WRKSRC}/lib/colord/cd-icc-store.c \
 		${WRKSRC}/src/cd-profile.c
 .if ! ${PORT_OPTIONS:MMANPAGES}
 	@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
@@ -72,6 +71,6 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}/var/db/colord/icc
+	@${MKDIR} ${STAGEDIR}/var/db/colord/icc
 
 .include <bsd.port.mk>
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index e1070da31..b598ff2d8 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,2 +1,2 @@
-SHA256 (colord-1.0.6.tar.xz) = a40bbceaa3d3b1d6fd2777b181bf641b4eb49ad249796823585136c146ad7e8e
-SIZE (colord-1.0.6.tar.xz) = 1083908
+SHA256 (colord-1.1.7.tar.xz) = 295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44
+SIZE (colord-1.1.7.tar.xz) = 1118432
diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in
index 262c61c66..b59719ac3 100644
--- a/graphics/colord/files/patch-Makefile.in
+++ b/graphics/colord/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2013-03-29 15:05:15.000000000 +0000
-+++ Makefile.in	2013-03-29 15:06:06.000000000 +0000
-@@ -387,7 +387,7 @@
+--- 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
  
  # this needs data/profiles/*.icc
--SUBDIRS = etc policy man lib rules po client contrib doc examples data \
-+SUBDIRS = etc policy man lib po client contrib doc examples data \
- 	src
+-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				\
diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist
index 7db35ff39..ced394dd7 100644
--- a/graphics/colord/pkg-plist
+++ b/graphics/colord/pkg-plist
@@ -2,7 +2,6 @@ bin/cd-create-profile
 bin/cd-fix-profile
 bin/cd-iccdump
 bin/colormgr
-etc/colord.conf
 etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
 include/colord-1/colord-private.h
 include/colord-1/colord-session/cd-session.h
@@ -11,12 +10,13 @@ include/colord-1/colord/cd-buffer.h
 include/colord-1/colord/cd-client-sync.h
 include/colord-1/colord/cd-client.h
 include/colord-1/colord/cd-color.h
-include/colord-1/colord/cd-deprecated.h
 include/colord-1/colord/cd-device-sync.h
 include/colord-1/colord/cd-device.h
 include/colord-1/colord/cd-dom.h
+include/colord-1/colord/cd-edid.h
 include/colord-1/colord/cd-enum.h
 include/colord-1/colord/cd-icc-store.h
+include/colord-1/colord/cd-icc-utils.h
 include/colord-1/colord/cd-icc.h
 include/colord-1/colord/cd-interp-akima.h
 include/colord-1/colord/cd-interp-linear.h
@@ -38,18 +38,17 @@ lib/colord-sensors/libcolord_sensor_dummy.so
 lib/girepository-1.0/Colord-1.0.typelib
 lib/libcolord.a
 lib/libcolord.so
-lib/libcolord.so.1
-lib/libcolord.so.1.0.23
+lib/libcolord.so.2
+lib/libcolord.so.2.0.2
 lib/libcolordprivate.a
 lib/libcolordprivate.so
-lib/libcolordprivate.so.1
-lib/libcolordprivate.so.1.0.23
+lib/libcolordprivate.so.2
+lib/libcolordprivate.so.2.0.2
 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/colord.conf.1.gz
 %%MAN%%man/man1/colormgr.1.gz
 share/color/icc/colord/AdobeRGB1998.icc
 share/color/icc/colord/AppleRGB.icc
@@ -112,6 +111,7 @@ 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
@@ -143,12 +143,15 @@ 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
 share/locale/pt/LC_MESSAGES/colord.mo
 share/locale/pt_BR/LC_MESSAGES/colord.mo
+share/locale/pt_PT/LC_MESSAGES/colord.mo
 share/locale/ro/LC_MESSAGES/colord.mo
 share/locale/ru/LC_MESSAGES/colord.mo
 share/locale/sk/LC_MESSAGES/colord.mo
@@ -172,6 +175,10 @@ share/polkit-1/actions/org.freedesktop.color.policy
 @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
@@ -180,6 +187,8 @@ share/polkit-1/actions/org.freedesktop.color.policy
 @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