Update to 3.4.2, disable wacom stuff completely by manual because it requires

a new library called libwacom that depends udev. Also, the g-c-c library has
been merged into binary. Gotta edit bsd.gnome.mk about it.


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

5 files changed, 201 insertions, 128 deletions

diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index 0268c0672..34c00ee90 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.35 2012/04/01 03:52:16 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.36 2012/06/13 22:34:57 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	3.2.3
+PORTVERSION=	3.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -39,7 +39,7 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
 LATEST_LINK=	gnome-control-center3
-USE_XZ=	yes
+USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
@@ -47,7 +47,6 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libxml2 gnomemenus3 \
 		libgnomekbd3 desktopfileutils gnomedesktop3 gconf2
 USE_XORG=	xscrnsaver x11 xxf86misc kbproto
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-libsocialweb=yes
@@ -80,6 +79,10 @@ LIB_DEPENDS+=	cheese.2:${PORTSDIR}/multimedia/cheese3
 CONFIGURE_ARGS+=--without-cheese
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|datetime wacom|datetime|g' \
+		${WRKSRC}/panels/Makefile.in
+
 post-install:
 	@-update-desktop-database
 
diff --git a/sysutils/gnome-control-center3/distinfo b/sysutils/gnome-control-center3/distinfo
index ddee94990..5c5d2c49e 100644
--- a/sysutils/gnome-control-center3/distinfo
+++ b/sysutils/gnome-control-center3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-control-center-3.2.3.tar.xz) = f0460410ba5af5a1f784a0006d814bab93b1e647f93a490a5c4c2c585815ae14
-SIZE (gnome3/gnome-control-center-3.2.3.tar.xz) = 4238612
+SHA256 (gnome3/gnome-control-center-3.4.2.tar.xz) = efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
+SIZE (gnome3/gnome-control-center-3.4.2.tar.xz) = 4267688
diff --git a/sysutils/gnome-control-center3/files/patch-configure b/sysutils/gnome-control-center3/files/patch-configure
index 3f393603f..82319f8de 100644
--- a/sysutils/gnome-control-center3/files/patch-configure
+++ b/sysutils/gnome-control-center3/files/patch-configure
@@ -1,6 +1,167 @@
---- configure.orig	2011-10-20 15:49:05.000000000 +0200
-+++ configure	2011-10-20 15:49:11.000000000 +0200
-@@ -16308,7 +16308,7 @@
+--- 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; }
  
@@ -9,3 +170,22 @@
  
  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_datetime_Makefile.in b/sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in
index a6054c408..cc0e27ec5 100644
--- a/sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in
+++ b/sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in
@@ -1,14 +1,15 @@
---- panels/datetime/Makefile.in.orig	2011-03-09 16:13:54.000000000 +0100
-+++ panels/datetime/Makefile.in	2011-03-09 16:14:28.000000000 +0100
-@@ -1078,9 +1078,9 @@ distdir: $(DISTFILES)
+--- panels/datetime/Makefile.in.orig	2012-06-13 19:23:42.000000000 -0500
++++ panels/datetime/Makefile.in	2012-06-13 19:24:01.000000000 -0500
+@@ -1149,10 +1149,10 @@
  	  fi; \
  	done
  check-am: all-am
 -	$(MAKE) $(AM_MAKEFLAGS) check-local
 +	$(MAKE) $(AM_MAKEFLAGS)
- check: check-recursive
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local
 +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
- 	for dir in "$(DESTDIR)$(ccpanelsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(tzdatadir)" "$(DESTDIR)$(uidir)"; do \
+ 	for dir in "$(DESTDIR)$(ccpanelsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(tzdatadir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(polkitdir)"; do \
diff --git a/sysutils/gnome-control-center3/pkg-plist b/sysutils/gnome-control-center3/pkg-plist
index 66d9c5456..04da73e19 100644
--- a/sysutils/gnome-control-center3/pkg-plist
+++ b/sysutils/gnome-control-center3/pkg-plist
@@ -20,9 +20,6 @@ lib/control-center-1/panels/libinfo.so
 lib/control-center-1/panels/libkeyboard.a
 lib/control-center-1/panels/libkeyboard.la
 lib/control-center-1/panels/libkeyboard.so
-lib/control-center-1/panels/libmedia.a
-lib/control-center-1/panels/libmedia.la
-lib/control-center-1/panels/libmedia.so
 lib/control-center-1/panels/libmouse-properties.a
 lib/control-center-1/panels/libmouse-properties.la
 lib/control-center-1/panels/libmouse-properties.so
@@ -50,12 +47,6 @@ lib/control-center-1/panels/libuniversal-access.so
 lib/control-center-1/panels/libuser-accounts.a
 lib/control-center-1/panels/libuser-accounts.la
 lib/control-center-1/panels/libuser-accounts.so
-lib/control-center-1/panels/libwacom-properties.a
-lib/control-center-1/panels/libwacom-properties.la
-lib/control-center-1/panels/libwacom-properties.so
-lib/libgnome-control-center.la
-lib/libgnome-control-center.so
-lib/libgnome-control-center.so.1
 libdata/pkgconfig/gnome-keybindings.pc
 share/applications/gnome-background-panel.desktop
 share/applications/gnome-color-panel.desktop
@@ -64,7 +55,6 @@ share/applications/gnome-datetime-panel.desktop
 share/applications/gnome-display-panel.desktop
 share/applications/gnome-info-panel.desktop
 share/applications/gnome-keyboard-panel.desktop
-share/applications/gnome-media-panel.desktop
 share/applications/gnome-mouse-panel.desktop
 share/applications/gnome-online-accounts-panel.desktop
 share/applications/gnome-power-panel.desktop
@@ -74,7 +64,6 @@ share/applications/gnome-screen-panel.desktop
 share/applications/gnome-sound-panel.desktop
 share/applications/gnome-universal-access-panel.desktop
 share/applications/gnome-user-accounts-panel.desktop
-share/applications/gnome-wacom-panel.desktop
 share/desktop-directories/gnomecc.directory
 %%DATADIR%%/datetime/backward
 %%DATADIR%%/icons/hicolor/16x16/devices/audio-headset.svg
@@ -116,6 +105,7 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
 %%DATADIR%%/keybindings/00-multimedia.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
@@ -147,8 +137,6 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/pixmaps/right-ring-finger.svg
 %%DATADIR%%/pixmaps/right-thumb.png
 %%DATADIR%%/pixmaps/right-thumb.svg
-%%DATADIR%%/pixmaps/wacom-stylus.svg
-%%DATADIR%%/pixmaps/wacom-tablet.svg
 %%DATADIR%%/sounds/gnome-sounds-default.xml
 %%DATADIR%%/ui/GnomeLogoVerticalMedium.svg
 %%DATADIR%%/ui/background/background.ui
@@ -201,12 +189,10 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/ui/datetime/timezone_9.png
 %%DATADIR%%/ui/display-capplet.ui
 %%DATADIR%%/ui/gnome-keyboard-panel.ui
-%%DATADIR%%/ui/gnome-media-properties.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-region-panel.ui
-%%DATADIR%%/ui/gnome-wacom-properties.ui
 %%DATADIR%%/ui/info.ui
 %%DATADIR%%/ui/language-chooser.ui
 %%DATADIR%%/ui/online-accounts.ui
@@ -221,47 +207,7 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/ui/user-accounts/password-dialog.ui
 %%DATADIR%%/ui/user-accounts/photo-dialog.ui
 %%DATADIR%%/ui/user-accounts/user-accounts-dialog.ui
-share/gnome/help/control-center/C/config-accessibility-keyboard.xml
-share/gnome/help/control-center/C/config-background.xml
-share/gnome/help/control-center/C/config-behavior.xml
-share/gnome/help/control-center/C/config-cds.xml
-share/gnome/help/control-center/C/config-default-apps.xml
-share/gnome/help/control-center/C/config-file-type.xml
-share/gnome/help/control-center/C/config-hints.xml
-share/gnome/help/control-center/C/config-html.xml
-share/gnome/help/control-center/C/config-kbd.xml
-share/gnome/help/control-center/C/config-keybindings.xml
-share/gnome/help/control-center/C/config-mouse.xml
-share/gnome/help/control-center/C/config-screensaver.xml
-share/gnome/help/control-center/C/config-themes.xml
-share/gnome/help/control-center/C/control-center.xml
-share/gnome/help/control-center/ca/control-center.xml
-share/gnome/help/control-center/ca@valencia/control-center.xml
-share/gnome/help/control-center/cs/control-center.xml
-share/gnome/help/control-center/de/control-center.xml
-share/gnome/help/control-center/el/control-center.xml
-share/gnome/help/control-center/en_GB/control-center.xml
-share/gnome/help/control-center/es/control-center.xml
-share/gnome/help/control-center/fr/control-center.xml
-share/gnome/help/control-center/gl/control-center.xml
-share/gnome/help/control-center/it/control-center.xml
-share/gnome/help/control-center/ja/control-center.xml
-share/gnome/help/control-center/ko/control-center.xml
-share/gnome/help/control-center/oc/control-center.xml
-share/gnome/help/control-center/pa/control-center.xml
-share/gnome/help/control-center/pl/control-center.xml
-share/gnome/help/control-center/pt/control-center.xml
-share/gnome/help/control-center/pt_BR/control-center.xml
-share/gnome/help/control-center/ru/control-center.xml
-share/gnome/help/control-center/sl/control-center.xml
-share/gnome/help/control-center/sv/control-center.xml
-share/gnome/help/control-center/te/control-center.xml
-share/gnome/help/control-center/th/control-center.xml
-share/gnome/help/control-center/uk/control-center.xml
-share/gnome/help/control-center/vi/control-center.xml
-share/gnome/help/control-center/zh_CN/control-center.xml
-share/gnome/help/control-center/zh_HK/control-center.xml
-share/gnome/help/control-center/zh_TW/control-center.xml
+%%DATADIR%%/ui/zoom-options.ui
 share/icons/hicolor/16x16/apps/gnome-power-manager.png
 share/icons/hicolor/16x16/apps/goa-panel.png
 share/icons/hicolor/16x16/apps/multimedia-volume-control.png
@@ -475,34 +421,6 @@ share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
-share/omf/control-center/control-center-C.omf
-share/omf/control-center/control-center-ca.omf
-share/omf/control-center/control-center-ca@valencia.omf
-share/omf/control-center/control-center-cs.omf
-share/omf/control-center/control-center-de.omf
-share/omf/control-center/control-center-el.omf
-share/omf/control-center/control-center-en_GB.omf
-share/omf/control-center/control-center-es.omf
-share/omf/control-center/control-center-fr.omf
-share/omf/control-center/control-center-gl.omf
-share/omf/control-center/control-center-it.omf
-share/omf/control-center/control-center-ja.omf
-share/omf/control-center/control-center-ko.omf
-share/omf/control-center/control-center-oc.omf
-share/omf/control-center/control-center-pa.omf
-share/omf/control-center/control-center-pl.omf
-share/omf/control-center/control-center-pt.omf
-share/omf/control-center/control-center-pt_BR.omf
-share/omf/control-center/control-center-ru.omf
-share/omf/control-center/control-center-sl.omf
-share/omf/control-center/control-center-sv.omf
-share/omf/control-center/control-center-te.omf
-share/omf/control-center/control-center-th.omf
-share/omf/control-center/control-center-uk.omf
-share/omf/control-center/control-center-vi.omf
-share/omf/control-center/control-center-zh_CN.omf
-share/omf/control-center/control-center-zh_HK.omf
-share/omf/control-center/control-center-zh_TW.omf
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
 share/pixmaps/faces/butterfly.png
@@ -527,6 +445,7 @@ share/pixmaps/faces/sunflower.jpg
 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/sounds/gnome/default/alerts/bark.ogg
 share/sounds/gnome/default/alerts/drip.ogg
 share/sounds/gnome/default/alerts/glass.ogg
@@ -535,7 +454,6 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrm share/sounds/gnome/default
 @dirrm share/sounds/gnome
 @dirrmtry share/pixmaps/faces
-@dirrm share/omf/control-center
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -596,35 +514,6 @@ share/sounds/gnome/default/alerts/sonar.ogg
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/gnome/help/control-center/zh_TW
-@dirrm share/gnome/help/control-center/zh_HK
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/vi
-@dirrm share/gnome/help/control-center/uk
-@dirrm share/gnome/help/control-center/th
-@dirrm share/gnome/help/control-center/te
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/sl
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/pt_BR
-@dirrm share/gnome/help/control-center/pt
-@dirrm share/gnome/help/control-center/pl
-@dirrm share/gnome/help/control-center/pa
-@dirrm share/gnome/help/control-center/oc
-@dirrm share/gnome/help/control-center/ko
-@dirrm share/gnome/help/control-center/ja
-@dirrm share/gnome/help/control-center/it
-@dirrm share/gnome/help/control-center/gl
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/en_GB
-@dirrm share/gnome/help/control-center/el
-@dirrm share/gnome/help/control-center/de
-@dirrm share/gnome/help/control-center/cs
-@dirrm share/gnome/help/control-center/ca@valencia
-@dirrm share/gnome/help/control-center/ca
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
 @dirrm %%DATADIR%%/ui/user-accounts
 %%CUPS%%@dirrm %%DATADIR%%/ui/printers
 @dirrm %%DATADIR%%/ui/datetime