Really update to 3.6.3.

Add patch to fix the build with heimdal.

Submitted by:	Gustau Perez


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

5 files changed, 88 insertions, 202 deletions

diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index dd838d51b..f342242fd 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -13,11 +13,13 @@ COMMENT=	Control center for GNOME 3 project
 
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
 		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
+		libpwquality>=0:${PORTSDIR}/security/libpwquality \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
 		xklavier:${PORTSDIR}/x11/libxklavier \
 		upower-glib:${PORTSDIR}/sysutils/upower \
 		colord:${PORTSDIR}/graphics/colord \
+		ibus:${PORTSDIR}/textproc/ibus \
 		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
 		socialweb:${PORTSDIR}/www/libsocialweb \
 		gtop-2.0:${PORTSDIR}/devel/libgtop \
@@ -43,11 +45,11 @@ USE_XORG=	xscrnsaver x11 xxf86misc kbproto xi
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-libsocialweb=yes --disable-ibus
+CONFIGURE_ARGS=	--with-libsocialweb=yes --disable-systemd
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=	gnome-control-center.1
+MAN1=		gnome-control-center.1
 
 OPTIONS_DEFINE=	CUPS
 OPTIONS_DEFAULT=CUPS
diff --git a/sysutils/gnome-control-center3/distinfo b/sysutils/gnome-control-center3/distinfo
index 5c5d2c49e..ad35becda 100644
--- a/sysutils/gnome-control-center3/distinfo
+++ b/sysutils/gnome-control-center3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-control-center-3.4.2.tar.xz) = efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
-SIZE (gnome3/gnome-control-center-3.4.2.tar.xz) = 4267688
+SHA256 (gnome3/gnome-control-center-3.6.3.tar.xz) = 2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb
+SIZE (gnome3/gnome-control-center-3.6.3.tar.xz) = 4877812
diff --git a/sysutils/gnome-control-center3/files/patch-configure b/sysutils/gnome-control-center3/files/patch-configure
deleted file mode 100644
index 82319f8de..000000000
--- a/sysutils/gnome-control-center3/files/patch-configure
+++ /dev/null
@@ -1,191 +0,0 @@
---- configure.orig	2012-06-13 19:32:44.000000000 -0500
-+++ configure	2012-06-13 19:39:51.000000000 -0500
-@@ -650,8 +650,6 @@
- NETWORK_MANAGER_LIBS
- NETWORK_MANAGER_CFLAGS
- GDESKTOP_PREFIX
--WACOM_PANEL_LIBS
--WACOM_PANEL_CFLAGS
- USER_ACCOUNTS_PANEL_LIBS
- USER_ACCOUNTS_PANEL_CFLAGS
- UNIVERSAL_ACCESS_PANEL_LIBS
-@@ -937,8 +935,6 @@
- UNIVERSAL_ACCESS_PANEL_LIBS
- USER_ACCOUNTS_PANEL_CFLAGS
- USER_ACCOUNTS_PANEL_LIBS
--WACOM_PANEL_CFLAGS
--WACOM_PANEL_LIBS
- NETWORK_MANAGER_CFLAGS
- NETWORK_MANAGER_LIBS
- BLUETOOTH_CFLAGS
-@@ -1708,10 +1704,6 @@
-               C compiler flags for USER_ACCOUNTS_PANEL, overriding pkg-config
-   USER_ACCOUNTS_PANEL_LIBS
-               linker flags for USER_ACCOUNTS_PANEL, overriding pkg-config
--  WACOM_PANEL_CFLAGS
--              C compiler flags for WACOM_PANEL, overriding pkg-config
--  WACOM_PANEL_LIBS
--              linker flags for WACOM_PANEL, overriding pkg-config
-   NETWORK_MANAGER_CFLAGS
-               C compiler flags for NETWORK_MANAGER, overriding pkg-config
-   NETWORK_MANAGER_LIBS
-@@ -13468,7 +13460,6 @@
- LIBNOTIFY_REQUIRED_VERSION=0.7.3
- GNOME_DESKTOP_REQUIRED_VERSION=3.1.91
- SCHEMAS_REQUIRED_VERSION=3.3.0
--LIBWACOM_REQUIRED_VERSION=0.3
- 
- COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
-  glib-2.0 >= $GLIB_REQUIRED_VERSION
-@@ -15671,123 +15662,6 @@
- 
- fi
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM_PANEL" >&5
--$as_echo_n "checking for WACOM_PANEL... " >&6; }
--
--if test -n "$WACOM_PANEL_CFLAGS"; then
--    pkg_cv_WACOM_PANEL_CFLAGS="$WACOM_PANEL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES
--                  gnome-settings-daemon >= \$GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= \$LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_WACOM_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$WACOM_PANEL_LIBS"; then
--    pkg_cv_WACOM_PANEL_LIBS="$WACOM_PANEL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES
--                  gnome-settings-daemon >= \$GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= \$LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_WACOM_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        WACOM_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>&1`
--        else
--	        WACOM_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$WACOM_PANEL_PKG_ERRORS" >&5
--
--	as_fn_error $? "Package requirements ($COMMON_MODULES
--                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) were not met:
--
--$WACOM_PANEL_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables WACOM_PANEL_CFLAGS
--and WACOM_PANEL_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details." "$LINENO" 5
--
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables WACOM_PANEL_CFLAGS
--and WACOM_PANEL_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
--else
--	WACOM_PANEL_CFLAGS=$pkg_cv_WACOM_PANEL_CFLAGS
--	WACOM_PANEL_LIBS=$pkg_cv_WACOM_PANEL_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--fi
- 
- GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
- 
-@@ -16416,7 +16290,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libsocialweb" >&5
- $as_echo "$with_libsocialweb" >&6; }
- 
--if test "x$with_libsocialweb" == "xyes"; then
-+if test "x$with_libsocialweb" = "xyes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCIALWEB" >&5
-@@ -16652,7 +16526,7 @@
- fi
- 
- 
--ac_config_files="$ac_config_files Makefile panels/Makefile panels/common/Makefile panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/bluetooth/Makefile panels/bluetooth/bluetooth-properties.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile panels/display/Makefile panels/display/gnome-display-panel.desktop.in panels/keyboard/Makefile panels/keyboard/gnome-keyboard-panel.desktop.in panels/keyboard/gnome-keybindings.pc panels/region/Makefile panels/region/gnome-region-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in panels/online-accounts/Makefile panels/online-accounts/gnome-online-accounts-panel.desktop.in panels/online-accounts/icons/Makefile panels/online-accounts/icons/16x16/Makefile panels/online-accounts/icons/22x22/Makefile panels/online-accounts/icons/24x24/Makefile panels/online-accounts/icons/32x32/Makefile panels/online-accounts/icons/48x48/Makefile panels/online-accounts/icons/256x256/Makefile panels/sound/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in panels/sound/data/symbolic-icons/Makefile panels/sound/data/symbolic-icons/scalable/Makefile panels/sound/data/symbolic-icons/scalable/status/Makefile panels/sound/data/icons/Makefile panels/sound/data/icons/16x16/Makefile panels/sound/data/icons/16x16/apps/Makefile panels/sound/data/icons/16x16/devices/Makefile panels/sound/data/icons/16x16/status/Makefile panels/sound/data/icons/22x22/Makefile panels/sound/data/icons/22x22/apps/Makefile panels/sound/data/icons/22x22/status/Makefile panels/sound/data/icons/24x24/Makefile panels/sound/data/icons/24x24/apps/Makefile panels/sound/data/icons/24x24/devices/Makefile panels/sound/data/icons/24x24/status/Makefile panels/sound/data/icons/32x32/Makefile panels/sound/data/icons/32x32/apps/Makefile panels/sound/data/icons/32x32/devices/Makefile panels/sound/data/icons/32x32/status/Makefile panels/sound/data/icons/48x48/Makefile panels/sound/data/icons/48x48/apps/Makefile panels/sound/data/icons/48x48/devices/Makefile panels/sound/data/icons/scalable/Makefile panels/sound/data/icons/scalable/apps/Makefile panels/sound/data/icons/scalable/devices/Makefile panels/sound/data/sounds/Makefile panels/screen/Makefile panels/screen/gnome-screen-panel.desktop.in panels/info/Makefile panels/info/gnome-info-panel.desktop.in panels/power/Makefile panels/power/gnome-power-panel.desktop.in panels/power/icons/Makefile panels/power/icons/16x16/Makefile panels/power/icons/22x22/Makefile panels/power/icons/24x24/Makefile panels/power/icons/32x32/Makefile panels/power/icons/48x48/Makefile panels/power/icons/256x256/Makefile panels/color/Makefile panels/color/gnome-color-panel.desktop.in panels/color/icons/Makefile panels/color/icons/16x16/Makefile panels/color/icons/22x22/Makefile panels/color/icons/24x24/Makefile panels/color/icons/32x32/Makefile panels/color/icons/48x48/Makefile panels/color/icons/64x64/Makefile panels/color/icons/256x256/Makefile panels/color/icons/scalable/Makefile panels/printers/Makefile panels/printers/gnome-printers-panel.desktop.in panels/network/Makefile panels/network/gnome-network-panel.desktop.in panels/universal-access/Makefile panels/universal-access/gnome-universal-access-panel.desktop.in panels/user-accounts/Makefile panels/user-accounts/data/Makefile panels/user-accounts/data/gnome-user-accounts-panel.desktop.in panels/user-accounts/data/faces/Makefile panels/user-accounts/data/icons/Makefile panels/wacom/Makefile panels/wacom/calibrator/Makefile panels/wacom/gnome-wacom-panel.desktop.in po/Makefile.in shell/Makefile shell/gnome-control-center.desktop.in"
-+ac_config_files="$ac_config_files Makefile panels/Makefile panels/common/Makefile panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/bluetooth/Makefile panels/bluetooth/bluetooth-properties.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile panels/display/Makefile panels/display/gnome-display-panel.desktop.in panels/keyboard/Makefile panels/keyboard/gnome-keyboard-panel.desktop.in panels/keyboard/gnome-keybindings.pc panels/region/Makefile panels/region/gnome-region-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in panels/online-accounts/Makefile panels/online-accounts/gnome-online-accounts-panel.desktop.in panels/online-accounts/icons/Makefile panels/online-accounts/icons/16x16/Makefile panels/online-accounts/icons/22x22/Makefile panels/online-accounts/icons/24x24/Makefile panels/online-accounts/icons/32x32/Makefile panels/online-accounts/icons/48x48/Makefile panels/online-accounts/icons/256x256/Makefile panels/sound/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in panels/sound/data/symbolic-icons/Makefile panels/sound/data/symbolic-icons/scalable/Makefile panels/sound/data/symbolic-icons/scalable/status/Makefile panels/sound/data/icons/Makefile panels/sound/data/icons/16x16/Makefile panels/sound/data/icons/16x16/apps/Makefile panels/sound/data/icons/16x16/devices/Makefile panels/sound/data/icons/16x16/status/Makefile panels/sound/data/icons/22x22/Makefile panels/sound/data/icons/22x22/apps/Makefile panels/sound/data/icons/22x22/status/Makefile panels/sound/data/icons/24x24/Makefile panels/sound/data/icons/24x24/apps/Makefile panels/sound/data/icons/24x24/devices/Makefile panels/sound/data/icons/24x24/status/Makefile panels/sound/data/icons/32x32/Makefile panels/sound/data/icons/32x32/apps/Makefile panels/sound/data/icons/32x32/devices/Makefile panels/sound/data/icons/32x32/status/Makefile panels/sound/data/icons/48x48/Makefile panels/sound/data/icons/48x48/apps/Makefile panels/sound/data/icons/48x48/devices/Makefile panels/sound/data/icons/scalable/Makefile panels/sound/data/icons/scalable/apps/Makefile panels/sound/data/icons/scalable/devices/Makefile panels/sound/data/sounds/Makefile panels/screen/Makefile panels/screen/gnome-screen-panel.desktop.in panels/info/Makefile panels/info/gnome-info-panel.desktop.in panels/power/Makefile panels/power/gnome-power-panel.desktop.in panels/power/icons/Makefile panels/power/icons/16x16/Makefile panels/power/icons/22x22/Makefile panels/power/icons/24x24/Makefile panels/power/icons/32x32/Makefile panels/power/icons/48x48/Makefile panels/power/icons/256x256/Makefile panels/color/Makefile panels/color/gnome-color-panel.desktop.in panels/color/icons/Makefile panels/color/icons/16x16/Makefile panels/color/icons/22x22/Makefile panels/color/icons/24x24/Makefile panels/color/icons/32x32/Makefile panels/color/icons/48x48/Makefile panels/color/icons/64x64/Makefile panels/color/icons/256x256/Makefile panels/color/icons/scalable/Makefile panels/printers/Makefile panels/printers/gnome-printers-panel.desktop.in panels/network/Makefile panels/network/gnome-network-panel.desktop.in panels/universal-access/Makefile panels/universal-access/gnome-universal-access-panel.desktop.in panels/user-accounts/Makefile panels/user-accounts/data/Makefile panels/user-accounts/data/gnome-user-accounts-panel.desktop.in panels/user-accounts/data/faces/Makefile panels/user-accounts/data/icons/Makefile po/Makefile.in shell/Makefile shell/gnome-control-center.desktop.in"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -17787,9 +17661,6 @@
-     "panels/user-accounts/data/gnome-user-accounts-panel.desktop.in") CONFIG_FILES="$CONFIG_FILES panels/user-accounts/data/gnome-user-accounts-panel.desktop.in" ;;
-     "panels/user-accounts/data/faces/Makefile") CONFIG_FILES="$CONFIG_FILES panels/user-accounts/data/faces/Makefile" ;;
-     "panels/user-accounts/data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES panels/user-accounts/data/icons/Makefile" ;;
--    "panels/wacom/Makefile") CONFIG_FILES="$CONFIG_FILES panels/wacom/Makefile" ;;
--    "panels/wacom/calibrator/Makefile") CONFIG_FILES="$CONFIG_FILES panels/wacom/calibrator/Makefile" ;;
--    "panels/wacom/gnome-wacom-panel.desktop.in") CONFIG_FILES="$CONFIG_FILES panels/wacom/gnome-wacom-panel.desktop.in" ;;
-     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-     "shell/Makefile") CONFIG_FILES="$CONFIG_FILES shell/Makefile" ;;
-     "shell/gnome-control-center.desktop.in") CONFIG_FILES="$CONFIG_FILES shell/gnome-control-center.desktop.in" ;;
diff --git a/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-realm-manager.c b/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-realm-manager.c
new file mode 100644
index 000000000..32e85e827
--- /dev/null
+++ b/sysutils/gnome-control-center3/files/patch-panels_user-accounts_um-realm-manager.c
@@ -0,0 +1,24 @@
+http://git.pld-linux.org/gitweb.cgi?p=packages/gnome-control-center.git;a=blob;f=krb5.patch;h=260e9aac087453b798dc58b23bbc79705e6172d9;hb=49c1b881b47743e0c76eaf9158a37fd6532c111f
+
+--- panels/user-accounts/um-realm-manager.c.orig	2013-06-17 21:10:46.000000000 +0000
++++ panels/user-accounts/um-realm-manager.c	2013-06-17 21:20:51.000000000 +0000
+@@ -23,7 +23,7 @@
+ 
+ #include "um-realm-manager.h"
+ 
+-#include <krb5/krb5.h>
++#include <krb5.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -732,8 +732,10 @@
+         code = krb5_get_init_creds_opt_alloc (k5, &opts);
+         g_return_val_if_fail (code == 0, code);
+ 
++#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_OUT_CCACHE
+         code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache);
+         g_return_val_if_fail (code == 0, code);
++#endif
+ 
+         code = krb5_get_init_creds_password (k5, &creds, principal,
+                                              (char *)password,
diff --git a/sysutils/gnome-control-center3/pkg-plist b/sysutils/gnome-control-center3/pkg-plist
index 04da73e19..63a3139b9 100644
--- a/sysutils/gnome-control-center3/pkg-plist
+++ b/sysutils/gnome-control-center3/pkg-plist
@@ -104,13 +104,11 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
 %%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
 %%DATADIR%%/keybindings/00-multimedia.xml
+%%DATADIR%%/keybindings/01-input-sources.xml
 %%DATADIR%%/keybindings/01-launchers.xml
 %%DATADIR%%/keybindings/01-screenshot.xml
 %%DATADIR%%/keybindings/01-system.xml
 %%DATADIR%%/keybindings/50-accessibility.xml
-%%DATADIR%%/pixmaps/double-click-maybe.png
-%%DATADIR%%/pixmaps/double-click-off.png
-%%DATADIR%%/pixmaps/double-click-on.png
 %%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
 %%DATADIR%%/pixmaps/gnome-about-me-lock.png
 %%DATADIR%%/pixmaps/left-index-finger.png
@@ -123,6 +121,7 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/pixmaps/left-ring-finger.svg
 %%DATADIR%%/pixmaps/left-thumb.png
 %%DATADIR%%/pixmaps/left-thumb.svg
+%%DATADIR%%/pixmaps/noise-texture-light.png
 %%DATADIR%%/pixmaps/print_error.png
 %%DATADIR%%/pixmaps/print_error.svg
 %%DATADIR%%/pixmaps/print_ok.png
@@ -140,66 +139,110 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/sounds/gnome-sounds-default.xml
 %%DATADIR%%/ui/GnomeLogoVerticalMedium.svg
 %%DATADIR%%/ui/background/background.ui
-%%DATADIR%%/ui/background/display-base.png
-%%DATADIR%%/ui/background/display-overlay.png
 %%DATADIR%%/ui/color.ui
+%%DATADIR%%/ui/datetime/bg_dim.png
 %%DATADIR%%/ui/datetime/bg.png
 %%DATADIR%%/ui/datetime/cc.png
 %%DATADIR%%/ui/datetime/datetime.ui
 %%DATADIR%%/ui/datetime/pin.png
 %%DATADIR%%/ui/datetime/timezone_-1.png
 %%DATADIR%%/ui/datetime/timezone_-10.png
+%%DATADIR%%/ui/datetime/timezone_-10_dim.png
 %%DATADIR%%/ui/datetime/timezone_-11.png
+%%DATADIR%%/ui/datetime/timezone_-11_dim.png
+%%DATADIR%%/ui/datetime/timezone_-1_dim.png
 %%DATADIR%%/ui/datetime/timezone_-2.png
+%%DATADIR%%/ui/datetime/timezone_-2_dim.png
 %%DATADIR%%/ui/datetime/timezone_-3.5.png
+%%DATADIR%%/ui/datetime/timezone_-3.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_-3.png
+%%DATADIR%%/ui/datetime/timezone_-3_dim.png
 %%DATADIR%%/ui/datetime/timezone_-4.5.png
+%%DATADIR%%/ui/datetime/timezone_-4.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_-4.png
+%%DATADIR%%/ui/datetime/timezone_-4_dim.png
 %%DATADIR%%/ui/datetime/timezone_-5.5.png
+%%DATADIR%%/ui/datetime/timezone_-5.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_-5.png
+%%DATADIR%%/ui/datetime/timezone_-5_dim.png
 %%DATADIR%%/ui/datetime/timezone_-6.png
+%%DATADIR%%/ui/datetime/timezone_-6_dim.png
 %%DATADIR%%/ui/datetime/timezone_-7.png
+%%DATADIR%%/ui/datetime/timezone_-7_dim.png
 %%DATADIR%%/ui/datetime/timezone_-8.png
+%%DATADIR%%/ui/datetime/timezone_-8_dim.png
 %%DATADIR%%/ui/datetime/timezone_-9.5.png
+%%DATADIR%%/ui/datetime/timezone_-9.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_-9.png
+%%DATADIR%%/ui/datetime/timezone_-9_dim.png
 %%DATADIR%%/ui/datetime/timezone_0.png
+%%DATADIR%%/ui/datetime/timezone_0_dim.png
 %%DATADIR%%/ui/datetime/timezone_1.png
 %%DATADIR%%/ui/datetime/timezone_10.5.png
+%%DATADIR%%/ui/datetime/timezone_10.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_10.png
+%%DATADIR%%/ui/datetime/timezone_10_dim.png
 %%DATADIR%%/ui/datetime/timezone_11.5.png
+%%DATADIR%%/ui/datetime/timezone_11.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_11.png
+%%DATADIR%%/ui/datetime/timezone_11_dim.png
 %%DATADIR%%/ui/datetime/timezone_12.75.png
+%%DATADIR%%/ui/datetime/timezone_12.75_dim.png
 %%DATADIR%%/ui/datetime/timezone_12.png
+%%DATADIR%%/ui/datetime/timezone_12_dim.png
 %%DATADIR%%/ui/datetime/timezone_13.png
+%%DATADIR%%/ui/datetime/timezone_13_dim.png
 %%DATADIR%%/ui/datetime/timezone_14.png
+%%DATADIR%%/ui/datetime/timezone_14_dim.png
+%%DATADIR%%/ui/datetime/timezone_1_dim.png
 %%DATADIR%%/ui/datetime/timezone_2.png
+%%DATADIR%%/ui/datetime/timezone_2_dim.png
 %%DATADIR%%/ui/datetime/timezone_3.5.png
+%%DATADIR%%/ui/datetime/timezone_3.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_3.png
+%%DATADIR%%/ui/datetime/timezone_3_dim.png
 %%DATADIR%%/ui/datetime/timezone_4.5.png
+%%DATADIR%%/ui/datetime/timezone_4.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_4.png
+%%DATADIR%%/ui/datetime/timezone_4_dim.png
 %%DATADIR%%/ui/datetime/timezone_5.5.png
+%%DATADIR%%/ui/datetime/timezone_5.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_5.75.png
+%%DATADIR%%/ui/datetime/timezone_5.75_dim.png
 %%DATADIR%%/ui/datetime/timezone_5.png
+%%DATADIR%%/ui/datetime/timezone_5_dim.png
 %%DATADIR%%/ui/datetime/timezone_6.5.png
+%%DATADIR%%/ui/datetime/timezone_6.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_6.png
+%%DATADIR%%/ui/datetime/timezone_6_dim.png
 %%DATADIR%%/ui/datetime/timezone_7.png
+%%DATADIR%%/ui/datetime/timezone_7_dim.png
 %%DATADIR%%/ui/datetime/timezone_8.75.png
+%%DATADIR%%/ui/datetime/timezone_8.75_dim.png
 %%DATADIR%%/ui/datetime/timezone_8.png
+%%DATADIR%%/ui/datetime/timezone_8_dim.png
 %%DATADIR%%/ui/datetime/timezone_9.5.png
+%%DATADIR%%/ui/datetime/timezone_9.5_dim.png
 %%DATADIR%%/ui/datetime/timezone_9.png
+%%DATADIR%%/ui/datetime/timezone_9_dim.png
 %%DATADIR%%/ui/display-capplet.ui
 %%DATADIR%%/ui/gnome-keyboard-panel.ui
 %%DATADIR%%/ui/gnome-mouse-properties.ui
-%%DATADIR%%/ui/gnome-region-panel-layout-chooser.ui
-%%DATADIR%%/ui/gnome-region-panel-options-dialog.ui
+%%DATADIR%%/ui/gnome-mouse-test.ui
 %%DATADIR%%/ui/gnome-region-panel.ui
+%%DATADIR%%/ui/gnome-region-panel-input-chooser.ui
 %%DATADIR%%/ui/info.ui
 %%DATADIR%%/ui/language-chooser.ui
 %%DATADIR%%/ui/online-accounts.ui
 %%DATADIR%%/ui/power.ui
+%%CUPS%%%%DATADIR%%/ui/printers/jobs-dialog.ui
 %%CUPS%%%%DATADIR%%/ui/printers/new-printer-dialog.ui
+%%CUPS%%%%DATADIR%%/ui/printers/options-dialog.ui
+%%CUPS%%%%DATADIR%%/ui/printers/ppd-selection-dialog.ui
 %%CUPS%%%%DATADIR%%/ui/printers/printers.ui
 %%DATADIR%%/ui/screen.ui
+%%DATADIR%%/ui/scroll-test-gegl.svg
+%%DATADIR%%/ui/scroll-test.svg
 %%DATADIR%%/ui/shell.ui
 %%DATADIR%%/ui/uap.ui
 %%DATADIR%%/ui/user-accounts/account-dialog.ui
@@ -334,12 +377,14 @@ share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/km/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ky/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/lo/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/lt/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -446,6 +491,8 @@ share/pixmaps/faces/sunset.jpg
 share/pixmaps/faces/tennis-ball.png
 share/pixmaps/faces/yellow-rose.jpg
 share/polkit-1/actions/org.gnome.controlcenter.datetime.policy
+share/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
+share/polkit-1/rules.d/gnome-control-center.rules
 share/sounds/gnome/default/alerts/bark.ogg
 share/sounds/gnome/default/alerts/drip.ogg
 share/sounds/gnome/default/alerts/glass.ogg
@@ -490,8 +537,12 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/lo/LC_MESSAGES
 @dirrmtry share/locale/lo
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/ilo/LC_MESSAGES