colord: Fix build on macOS and fix config file handling.

[Youri Mouton <youri%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Youri Mouton <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Wed Jul 13 18:57:38 2016 +0200
Changeset:	c02f2eaefeb70b919971bf974fdcbe97ce6f60a8

Modified Files:
	colord/Makefile
	colord/PLIST
	colord/distinfo

Log Message:
colord: Fix build on macOS and fix config file handling.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c02f2eaefeb70b919971bf974fdcbe97ce6f60a8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 colord/Makefile | 30 ++++++++++++------------------
 colord/PLIST    |  5 ++---
 colord/distinfo |  2 ++
 3 files changed, 16 insertions(+), 21 deletions(-)

diffs:
diff --git a/colord/Makefile b/colord/Makefile
index af916aa..b551e8b 100644
--- a/colord/Makefile
+++ b/colord/Makefile
@@ -12,40 +12,34 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake intltool
+USE_TOOLS+=	pkg-config gmake intltool autoconf aclocal automake
 
 PKGCONFIG_OVERRIDE+=	lib/colorhug/colorhug.pc.in
 PKGCONFIG_OVERRIDE+=	lib/colord/colord.pc.in
 
-CONFIGURE_ARGS+=	--enable-gusb=no
-CONFIGURE_ARGS+=	--disable-rfkill
-CONFIGURE_ARGS+=	--disable-network-manager
-CONFIGURE_ARGS+=	--enable-udev=no
-
-# Seems badly detected
+CONFIGURE_ARGS+=	--disable-gusb
+CONFIGURE_ARGS+=	--disable-udev
 CONFIGURE_ARGS+=	--disable-bash-completion
-
 CONFIGURE_ARGS+=	--disable-systemd-login
+CONFIGURE_ARGS+=	--disable-argyllcms-sensor # XXX wip
 
 PKGCONFIG_OVERRIDE+=	lib/colorhug/colorhug.pc.in
 PKGCONFIG_OVERRIDE+=	lib/colord/colord.pc.in
 
+CONF_DIR=	${PREFIX}/share/examples/colord
+CONF_FILES+=	${CONF_DIR}/org.freedesktop.ColorManager.conf \
+		${PKG_SYSCONFDIR}/dbus-1/system-services/org.freedesktop.ColorManager.conf
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf
 
-# XXX conf file?
-#CONF_FILES+=		data/org.freedesktop.ColorManager.conf
+BUILD_DEPENDS+=	gtk-doc-[0-9]*:../../textproc/gtk-doc
 
-# XXX maybe make wip/argyllcms work instead?
-CONFIGURE_ARGS += --disable-argyllcms-sensor
-#.include "../../wip/argyllcms/buildlink3.mk"
+.include "options.mk"
 
-.include "../../print/cups/buildlink3.mk"
-.include "../../wip/geocode-glib/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../security/polkit/buildlink3.mk"
-.include "../../devel/libdbusmenu-qt/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/colord/PLIST b/colord/PLIST
index 8436dd0..b2323f4 100644
--- a/colord/PLIST
+++ b/colord/PLIST
@@ -4,7 +4,6 @@ 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
 include/colord-1/colord-session/cd-session.h
 include/colord-1/colord.h
@@ -35,7 +34,6 @@ 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_dummy.la
-lib/girepository-1.0/Colord-1.0.typelib
 lib/libcolord.la
 lib/libcolordprivate.la
 lib/pkgconfig/colord.pc
@@ -120,7 +118,7 @@ share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
 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/examples/colord/org.freedesktop.ColorManager.conf
 share/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
 share/locale/as/LC_MESSAGES/colord.mo
 share/locale/bn_IN/LC_MESSAGES/colord.mo
@@ -173,3 +171,4 @@ share/locale/uk/LC_MESSAGES/colord.mo
 share/locale/zh_CN/LC_MESSAGES/colord.mo
 share/locale/zh_TW/LC_MESSAGES/colord.mo
 share/polkit-1/actions/org.freedesktop.color.policy
+@pkgdir var/lib/colord/icc
diff --git a/colord/distinfo b/colord/distinfo
index b25dd70..8031e6d 100644
--- a/colord/distinfo
+++ b/colord/distinfo
@@ -4,3 +4,5 @@ SHA1 (colord-1.2.12.tar.xz) = 46c6fda75928b118a8c5d152bba6234a9ffca0a4
 RMD160 (colord-1.2.12.tar.xz) = 4eb97682fa69ba1e2c14ecc987e0529d73c5fb1f
 SHA512 (colord-1.2.12.tar.xz) = 5ce8f4fd10b92ec0cb54a05017ab050753381663a43e40d959606bb5f71ddce5456a3d67f8ce0538a2c945136834c66615f3615fdfb3e1eaaf5f5ca7a9e9c4eb
 Size (colord-1.2.12.tar.xz) = 1214992 bytes
+SHA1 (patch-configure.ac) = 374b225534ef3f1e18ceddacf67cfc0954ca748f
+SHA1 (patch-data_Makefile.am) = 6a6df47e3726651edab8c6e5836e2c7a54c37c23