5 files changed, 26 insertions, 83 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 7030776e333b..79415cb3df72 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.6.1
-PORTREVISION=	3
+PORTVERSION=	2.8.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.6
+MASTER_SITE_SUBDIR=	sources/control-center/2.8
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,11 +25,18 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
 		gstreamerplugins
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
+		apps_gnome_settings_daemon_keybindings.schemas \
+		apps_gnome_settings_daemon_screensaver.schemas \
+		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard_xkb.schemas \
+		fontilus.schemas themus.schemas
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 32f5ad00952e..c420e2166db6 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143
-SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807
+MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
+SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
new file mode 100644
index 000000000000..f66b82c9ffd1
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Thu Oct 14 15:44:21 2004
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Thu Oct 14 15:44:38 2004
+@@ -813,7 +813,7 @@
+ 		do_mail_action (acme);
+ 		break;
+ 	case SLEEP_KEY:
+-		do_sleep_action ("apm", "xset dpms force off");
++		do_sleep_action ("zzz", "xset dpms force off");
+ 		break;
+ 	case SCREENSAVER_KEY:
+ 		execute ("xscreensaver-command -lock", FALSE);
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
deleted file mode 100644
index 49efbb5decf5..000000000000
--- a/sysutils/gnome-control-center/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Thu May  1 11:30:14 2003
-+++ ltmain.sh	Mon Aug 11 14:38:46 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 6676dfd5a3fa..ddf5788902c0 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-background-properties
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-file-types-properties
 bin/gnome-font-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
@@ -12,34 +11,13 @@ bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/themus-theme-applier
 bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
 bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_font_rendering.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/fontilus.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/themus.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
+bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
@@ -66,7 +44,6 @@ share/gnome/control-center-2.0/capplets/at-properties.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
 share/gnome/control-center-2.0/capplets/default-applications.desktop
 share/gnome/control-center-2.0/capplets/display-properties.desktop
-share/gnome/control-center-2.0/capplets/file-types.desktop
 share/gnome/control-center-2.0/capplets/font-properties.desktop
 share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
 share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop
@@ -80,7 +57,6 @@ share/gnome/control-center-2.0/icons/display-capplet.png
 share/gnome/control-center-2.0/interfaces/acme.glade
 share/gnome/control-center-2.0/interfaces/apply-font.glade
 share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
-share/gnome/control-center-2.0/interfaces/file-types-properties.glade
 share/gnome/control-center-2.0/interfaces/font-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
@@ -163,6 +139,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/bs/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
 share/locale/cy/LC_MESSAGES/control-center-2.0.mo
@@ -195,6 +172,7 @@ share/locale/mk/LC_MESSAGES/control-center-2.0.mo
 share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
+share/locale/nb/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
 share/locale/no/LC_MESSAGES/control-center-2.0.mo
@@ -225,6 +203,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
 @dirrm share/gnome/control-center-2.0/icons
-@dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0