The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.

This update updates Glib20 to 2.36 and Gtk+ 3.8

* The gio-fam-backend port that used gamin for the GFileMonitor API is gone.
  It is replaced by a GIO kqueue implementation developed as part of a NetBSD
  GSoC 2011 project by Dimitry Matveev.
* Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0
  pkgconfig file [1]. This broke static linking and newer binutils.
* Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to
  prevent creation of /  root/.cache dir. Defaults to build & run depend,
  but :build and :run switches available.
* New x11-toolkits/pangox-compat port and companion USE_GNOME component for
  pangox support which was removed from the pango port. Add it to ports still
  using pangox API.

Exp-run by:	bapt@
PR:		ports/178958 [1]
Submitted by:	emaste@ [1]

19 files changed, 240 insertions, 78 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 86138978b877..270c2e0f1feb 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -92,6 +92,7 @@
     SUBDIR += clutter-box2d
     SUBDIR += clutter-gtk
     SUBDIR += colord
+    SUBDIR += colord-gtk
     SUBDIR += comical
     SUBDIR += comix
     SUBDIR += commons-utilities
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 8803a43c1892..1049c13cb825 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -37,5 +37,7 @@ post-patch:
 		${WRKSRC}/clutter/x11/*.h \
 		${WRKSRC}/clutter/cogl/cogl/*.h \
 		${WRKSRC}/clutter/json/*.c
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/clutter/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile
new file mode 100644
index 000000000000..8610bf949e6e
--- /dev/null
+++ b/graphics/colord-gtk/Makefile
@@ -0,0 +1,37 @@
+# Created by: Koop Mast <kwm@FreeBSD.org>
+# $FreeBSD$
+#    $MCom: ports/trunk/graphics/colord-gtk/Makefile 18610 2013-06-30 16:33:05Z marcus $
+
+PORTNAME=	colord-gtk
+PORTVERSION=	0.1.25
+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=	colord>=0.1.20:${PORTSDIR}/graphics/colord
+LIB_DEPENDS=	colord:${PORTSDIR}/graphics/colord \
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
+		dbus-1:${PORTSDIR}/devel/dbus \
+		lcms2:${PORTSDIR}/graphics/lcms2
+
+USE_XZ=		yes
+USE_GNOME=	gnomehier gtk30 intlhack introspection:build
+USES=		gettext gmake pathfix pkgconfig
+USE_SQLITE=	3
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--enable-gtk-doc-html=no
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Wclobbered||g' \
+		-e 's|-Wempty-body||g' \
+		-e 's|-Wignored-qualifiers||g' \
+		-e 's|-Wtype-limits||g' \
+		-e 's|-Wmissing-parameter-type||g' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/graphics/colord-gtk/distinfo b/graphics/colord-gtk/distinfo
new file mode 100644
index 000000000000..2b99ce36069e
--- /dev/null
+++ b/graphics/colord-gtk/distinfo
@@ -0,0 +1,2 @@
+SHA256 (colord-gtk-0.1.25.tar.xz) = bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a
+SIZE (colord-gtk-0.1.25.tar.xz) = 271192
diff --git a/graphics/colord-gtk/pkg-descr b/graphics/colord-gtk/pkg-descr
new file mode 100644
index 000000000000..b92a9b339ac9
--- /dev/null
+++ b/graphics/colord-gtk/pkg-descr
@@ -0,0 +1,3 @@
+Gtk3 widget for the colord system service.
+
+WWW: http://www.freedesktop.org/software/colord
diff --git a/graphics/colord-gtk/pkg-plist b/graphics/colord-gtk/pkg-plist
new file mode 100644
index 000000000000..5e857889adea
--- /dev/null
+++ b/graphics/colord-gtk/pkg-plist
@@ -0,0 +1,15 @@
+include/colord-1/colord-gtk.h
+include/colord-1/colord-gtk/cd-sample-widget.h
+include/colord-1/colord-gtk/cd-sample-window.h
+include/colord-1/colord-gtk/cd-version.h
+include/colord-1/colord-gtk/cd-window-sync.h
+include/colord-1/colord-gtk/cd-window.h
+lib/girepository-1.0/ColordGtk-1.0.typelib
+lib/libcolord-gtk.a
+lib/libcolord-gtk.la
+lib/libcolord-gtk.so
+lib/libcolord-gtk.so.1
+libdata/pkgconfig/colord-gtk.pc
+share/gir-1.0/ColordGtk-1.0.gir
+share/locale/en_GB/LC_MESSAGES/colord-gtk.mo
+@dirrmtry include/colord-1/colord-gtk
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index b4661f2fc968..1789595b9f34 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,47 +1,48 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/graphics/colord/Makefile,v 1.10 2012/12/17 23:50:40 kwm Exp $
+#    $MCom: ports/trunk/graphics/colord/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	colord
-PORTVERSION=	0.1.20
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 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=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		vala-vapigen>=0.13.0:${PORTSDIR}/lang/vala-vapigen
 LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
 		dbus-1:${PORTSDIR}/devel/dbus \
 		lcms2:${PORTSDIR}/graphics/lcms2
 
+USERS=		colord
+GROUPS=		colord
+
 USE_XZ=		yes
-USE_GNOME=	gnomehier glib20 intlhack
-USES=		pathfix gettext
-USE_GMAKE=	yes
-USE_SQLITE=	yes
+USE_GNOME=	gnomehier glib20 intlhack introspection:build
+USES=		gettext gmake pathfix pkgconfig
+USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS=	--disable-gudev --enable-gtk-doc-html=no --disable-gtk
+CONFIGURE_ARGS=	--disable-gudev \
+		--enable-gtk-doc-html=no \
+		--disable-bash-completion \
+		--disable-gusb \
+		--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" \
 		USB_LIBS="-L/usr/lib -lusb"
-MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
-OPTIONS_DEFINE=	SANE MANPAGES
+GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	MANPAGES
 
-.if ${PORT_OPTIONS:MSANE}
-CONFGIURE_ARGS+=--enable-sane=yes
-LIB_DEPENDS+=	sane:${PORTSDIR}/graphics/sane-backends
-.else
-CONFIGURE_ARGS+=--disable-sane
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
@@ -57,9 +58,17 @@ post-patch:
 		-e 's|-Wmissing-parameter-type||g' \
 		-e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \
 		${WRKSRC}/configure
-.if !${PORT_OPTIONS:MMANPAGES}
+	@${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}/src/cd-profile.c
+.if ! ${PORT_OPTIONS:MMANPAGES}
 	@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
 		s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
 .endif
 
+post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.mk>
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index 2db4de59d601..0df0e3bd034c 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,2 +1,2 @@
-SHA256 (colord-0.1.20.tar.xz) = 45d6e7e73c9eab9f3f3c0eec8d008fd96c147333aeb4a77a2c2695657e48ae58
-SIZE (colord-0.1.20.tar.xz) = 551408
+SHA256 (colord-1.0.1.tar.xz) = 053f028aba6071068064ca7fe949bb3f74fb5ad16af2d7ec5bba10dea00cb785
+SIZE (colord-1.0.1.tar.xz) = 1074508
diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in
index 8adde68742b5..262c61c66e78 100644
--- a/graphics/colord/files/patch-Makefile.in
+++ b/graphics/colord/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2012-05-15 23:46:55.000000000 +0200
-+++ Makefile.in	2012-05-15 23:47:27.000000000 +0200
-@@ -329,7 +329,7 @@
- # this needs libcolord and libcolord-gtk
- 
+--- 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 @@
  # this needs client/cd-create-profile
--SUBDIRS = etc policy man libcolord rules po $(am__append_1) client \
-+SUBDIRS = etc policy man libcolord po $(am__append_1) client \
- 	contrib doc examples src data
+ 
+ # 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
  DISTCHECK_CONFIGURE_FLAGS = \
  	--enable-introspection				\
diff --git a/graphics/colord/files/patch-client_Makefile.in b/graphics/colord/files/patch-client_Makefile.in
deleted file mode 100644
index 4c832e9f1f11..000000000000
--- a/graphics/colord/files/patch-client_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- client/Makefile.in.orig	2012-05-16 20:35:37.000000000 +0200
-+++ client/Makefile.in	2012-05-16 20:35:57.000000000 +0200
-@@ -36,8 +36,8 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \
--	cd-fix-profile$(EXEEXT)
-+@HAVE_GTK_TRUE@bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \
-+@HAVE_GTK_TRUE@	cd-fix-profile$(EXEEXT)
- @HAVE_GTK_TRUE@noinst_PROGRAMS = colord-convert$(EXEEXT)
- subdir = client
- DIST_COMMON = $(dist_bashcompletion_DATA) $(srcdir)/Makefile.am \
diff --git a/graphics/colord/files/patch-configure b/graphics/colord/files/patch-configure
new file mode 100644
index 000000000000..bd3d39baefdf
--- /dev/null
+++ b/graphics/colord/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2013-04-11 10:05:05.000000000 +0000
++++ configure	2013-04-11 10:06:38.000000000 +0000
+@@ -17763,7 +17763,7 @@
+ fi
+ 
+ # per-machine directory
+-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc"
++CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc"
+ 
+ 
+ ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/session-helper/Makefile contrib/colord-sane/Makefile examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/figures/Makefile data/profiles/Makefile data/ti1/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/plugins/Makefile src/sensors/Makefile client/Makefile lib/Makefile lib/colord/cd-version.h lib/colord/colord.pc lib/colord/Makefile lib/colorhug/Makefile lib/colorhug/colorhug.pc lib/colorhug/ch-version.h lib/dtp94/Makefile lib/huey/Makefile lib/munki/Makefile"
diff --git a/graphics/colord/files/patch-src_Makefile_in b/graphics/colord/files/patch-src_Makefile_in
new file mode 100644
index 000000000000..15edb6bfb971
--- /dev/null
+++ b/graphics/colord/files/patch-src_Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $
+--- src/Makefile.in.orig	Thu Mar 28 11:16:10 2013
++++ src/Makefile.in	Sat Mar 30 16:25:48 2013
+@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml
+ 		$(srcdir)/colord.gresource.xml
+ 
+ install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
+-		mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \
+-		chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \
+-		chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \
+-	fi
+ 
+ -include $(top_srcdir)/git.mk
+ 
diff --git a/graphics/colord/pkg-install b/graphics/colord/pkg-install
new file mode 100644
index 000000000000..30e77997e670
--- /dev/null
+++ b/graphics/colord/pkg-install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	/bin/mkdir -p /var/db/colord/icc
+	/bin/chmod 0755 /var/db/colord
+	/usr/sbin/chown colord:colord /var/db/colord
+	/usr/sbin/chown colord:colord /var/db/colord/icc
+	exit 0
+	;;
+esac
diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist
index eba0ba0519fc..bb35fb489274 100644
--- a/graphics/colord/pkg-plist
+++ b/graphics/colord/pkg-plist
@@ -1,23 +1,38 @@
-etc/bash_completion.d/colormgr-completion.bash
+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
-etc/dbus-1/system.d/org.freedesktop.colord-sane.conf
-include/colord-1/colord.h
 include/colord-1/colord-private.h
+include/colord-1/colord-session/cd-session.h
+include/colord-1/colord.h
+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-enum.h
-include/colord-1/colord/cd-it8.h
+include/colord-1/colord/cd-icc.h
+include/colord-1/colord/cd-interp-akima.h
+include/colord-1/colord/cd-interp-linear.h
+include/colord-1/colord/cd-interp.h
 include/colord-1/colord/cd-it8-utils.h
+include/colord-1/colord/cd-it8.h
 include/colord-1/colord/cd-math.h
 include/colord-1/colord/cd-profile-sync.h
 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-transform.h
 include/colord-1/colord/cd-version.h
+lib/colord-sensors/libcolord_sensor_argyll.a
+lib/colord-sensors/libcolord_sensor_argyll.la
+lib/colord-sensors/libcolord_sensor_argyll.so
 lib/colord-sensors/libcolord_sensor_dummy.a
 lib/colord-sensors/libcolord_sensor_dummy.la
 lib/colord-sensors/libcolord_sensor_dummy.so
@@ -26,17 +41,66 @@ lib/libcolord.a
 lib/libcolord.la
 lib/libcolord.so
 lib/libcolord.so.1
+lib/libcolordprivate.a
+lib/libcolordprivate.la
+lib/libcolordprivate.so
+lib/libcolordprivate.so.1
 libdata/pkgconfig/colord.pc
 libexec/colord
-share/color/icc/colord/crayons.icc
+libexec/colord-session
+share/color/icc/colord/AdobeRGB1998.icc
+share/color/icc/colord/AppleRGB.icc
+share/color/icc/colord/BestRGB.icc
+share/color/icc/colord/BetaRGB.icc
+share/color/icc/colord/Bluish.icc
+share/color/icc/colord/BruceRGB.icc
+share/color/icc/colord/CIE-RGB.icc
+share/color/icc/colord/ColorMatchRGB.icc
+share/color/icc/colord/Crayons.icc
+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
+share/color/icc/colord/Gamma5000K.icc
+share/color/icc/colord/Gamma5500K.icc
+share/color/icc/colord/Gamma6500K.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
+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/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/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
+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
 share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
-share/dbus-1/interfaces/org.freedesktop.colord.sane.xml
+share/dbus-1/services/org.freedesktop.ColorHelper.service
 share/dbus-1/system-services/org.freedesktop.ColorManager.service
-share/dbus-1/system-services/org.freedesktop.colord-sane.service
 share/gir-1.0/Colord-1.0.gir
 share/locale/as/LC_MESSAGES/colord.mo
 share/locale/bg/LC_MESSAGES/colord.mo
@@ -51,6 +115,7 @@ 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
@@ -58,11 +123,14 @@ 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
@@ -82,6 +150,7 @@ 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
@@ -91,14 +160,11 @@ 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
-share/vala/vapi/colord.vapi
-@exec mkdir -p %D/var/lib/colord/icc
-@dirrmtry var/lib/colord/icc
-@dirrmtry var/lib/colord
-@dirrmtry var/lib
-@dirrmtry var
+@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
@@ -109,16 +175,25 @@ share/vala/vapi/colord.vapi
 @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/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
-@dirrmtry etc/bash_completion.d
+@cwd /
+@dirrmtry var/db/colord/icc
+@dirrmtry var/db/colord
+@cwd
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 54ef516378e9..99ea21f16197 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,10 +1,9 @@
 # Created by: Ade Lovett <ade@lovett.com>
 # $FreeBSD$
-#    $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.28 2012/12/10 12:09:15 kwm Exp $
+#    $MCom: ports/trunk/graphics/gdk-pixbuf2/Makefile 18634 2013-07-26 10:42:35Z kwm $
 
 PORTNAME=	gdk-pixbuf
-PORTVERSION=	2.26.5
-PORTREVISION=	3
+PORTVERSION=	2.28.2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
@@ -13,20 +12,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graphic library for GTK+
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-
 LATEST_LINK=	gdk-pixbuf2
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_XORG=	xt xi x11
 USE_AUTOTOOLS=	libtool
-USE_GNOME+=	gnomehack gnomehier glib20 ltverhack
+USES=		gmake pathfix pkgconfig
+USE_GNOME+=	gnomehier glib20 ltverhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=yes --with-x11
-MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
 MAN1=		gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
 
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index b694e8216b8e..f773527303e0 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdk-pixbuf-2.26.5.tar.xz) = 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84
-SIZE (gnome2/gdk-pixbuf-2.26.5.tar.xz) = 1181336
+SHA256 (gnome2/gdk-pixbuf-2.28.2.tar.xz) = 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617
+SIZE (gnome2/gdk-pixbuf-2.28.2.tar.xz) = 1192936
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index 700b06a52ddc..a9eec0e893dc 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -165,6 +165,7 @@ share/gir-1.0/GdkPixbuf-2.0.gir
 %%NLS%%share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/te/LC_MESSAGES/gdk-pixbuf.mo
+%%NLS%%share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 55ca726929f2..95269785357c 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	liblqr-1
 DISTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://liblqr.wdfiles.com/local--files/en:download-page/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -14,8 +14,8 @@ COMMENT=	An easy to use C/C++ seam carving library
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	_glib20
-USES=		gettext pkgconfig
+USE_GNOME=	glib20 pkgconfig
+USES=		gettext
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 107cad9293ba..71907d910a3f 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.147 2012/10/16 08:58:47 kwm Exp $
+#   $MCom: ports/trunk/graphics/librsvg2/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	librsvg
 PORTVERSION=	2.36.4
@@ -12,26 +12,23 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection		
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
-		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
+		croco-0.6:${PORTSDIR}/textproc/libcroco
 RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehier gnomeprefix libgsf ltverhack gtk20
-USES=		pathfix gettext
+USE_GNOME=	gnomehier gnomeprefix libgsf ltverhack gtk20 \
+		introspection:build
+USES=		gettext gmake pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-svgz \
 		--with-croco \
 		--disable-Bsymbolic \
 		--enable-gtk-theme
-CROCO_VERSION=	0.6
 MAN1=		rsvg-convert.1
-MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \