Update to 2.8.2.

10 files changed, 50 insertions, 66 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 0a50fdd1b243..6dac2f419326 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.1
-PORTREVISION=	2
+PORTVERSION=	2.8.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.8
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index c420e2166db6..e5ac6888440c 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
-SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
+MD5 (gnome2/control-center-2.8.2.tar.bz2) = 898ef25391c0330a31f36812fdc8a02f
+SIZE (gnome2/control-center-2.8.2.tar.bz2) = 2806342
diff --git a/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
index 7607447c4e19..c6b38bd4daa6 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
@@ -1,20 +1,14 @@
---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig	Mon Dec 13 22:37:25 2004
-+++ capplets/default-applications/gnome-default-applications-properties-structs.c	Mon Dec 13 22:45:16 2004
-@@ -9,11 +9,8 @@
-         { N_("Epiphany"), 		"epiphany",	"epiphany %s",		FALSE, FALSE },
-         { N_("Galeon"), 		"galeon",	"galeon %s",		FALSE, FALSE },
-         { N_("Encompass"), 		"encompass",	"encompass %s",		FALSE, FALSE },
--        { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
--        { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
--        { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firebird %s",	FALSE, FALSE },
--        { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
--        { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
-+        { N_("FireFox"),  		"firefox",	"firefox %s",		FALSE, FALSE },
-+        { N_("Mozilla"), 		"mozilla",	"mozilla %s",		FALSE, FALSE },
+--- capplets/default-applications/gnome-default-applications-properties-structs.c.orig	Sun Feb 20 16:18:03 2005
++++ capplets/default-applications/gnome-default-applications-properties-structs.c	Mon Feb 21 15:52:04 2005
+@@ -12,6 +12,7 @@
+         { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
+         { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
+         { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firefox %s",	FALSE, FALSE },
++        { N_("Firebird/FireFox"),  	"firefox",	"firefox %s",	FALSE, FALSE },
+         { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
+         { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
          { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
-         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
-         { N_("W3M Text Browser"),	"w3n",		"w3m %s",		TRUE,  FALSE },
-@@ -40,6 +37,7 @@
+@@ -40,6 +41,7 @@
  	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
  	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
  	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 44a777897908..f97758e10ba0 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Mar 11 03:09:48 2004
-+++ configure	Thu Mar 11 03:12:25 2004
-@@ -21373,6 +21373,7 @@
+--- configure.orig	Mon Feb 21 15:53:01 2005
++++ configure	Mon Feb 21 15:53:01 2005
+@@ -21286,6 +21286,7 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,15 +8,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21461,6 +21462,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+LIBS="-lintl $LIBS"
-  have_ngettext=yes
- fi
- done
-@@ -26257,7 +26259,7 @@
+@@ -26646,7 +26647,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -24,4 +16,4 @@
 +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
  _ACEOF
  
- GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
+ 
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index ddf5788902c0..e93c3fdffeaf 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -38,6 +38,7 @@ libexec/fontilus-context-menu
 libexec/gnome-settings-daemon
 share/gnome/application-registry/fontilus.applications
 share/gnome/application-registry/themus.applications
+share/gnome/applications/gnome-font-viewer.desktop
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/at-properties.desktop
@@ -176,6 +177,7 @@ 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
+share/locale/nso/LC_MESSAGES/control-center-2.0.mo
 share/locale/pa/LC_MESSAGES/control-center-2.0.mo
 share/locale/pl/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt/LC_MESSAGES/control-center-2.0.mo
@@ -196,6 +198,11 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
 share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
+share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
 @dirrm share/gnome/pixmaps/gnomecc-2
 @dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 0a50fdd1b243..6dac2f419326 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.1
-PORTREVISION=	2
+PORTVERSION=	2.8.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.8
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index c420e2166db6..e5ac6888440c 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
-SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
+MD5 (gnome2/control-center-2.8.2.tar.bz2) = 898ef25391c0330a31f36812fdc8a02f
+SIZE (gnome2/control-center-2.8.2.tar.bz2) = 2806342
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
index 7607447c4e19..c6b38bd4daa6 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
@@ -1,20 +1,14 @@
---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig	Mon Dec 13 22:37:25 2004
-+++ capplets/default-applications/gnome-default-applications-properties-structs.c	Mon Dec 13 22:45:16 2004
-@@ -9,11 +9,8 @@
-         { N_("Epiphany"), 		"epiphany",	"epiphany %s",		FALSE, FALSE },
-         { N_("Galeon"), 		"galeon",	"galeon %s",		FALSE, FALSE },
-         { N_("Encompass"), 		"encompass",	"encompass %s",		FALSE, FALSE },
--        { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
--        { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
--        { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firebird %s",	FALSE, FALSE },
--        { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
--        { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
-+        { N_("FireFox"),  		"firefox",	"firefox %s",		FALSE, FALSE },
-+        { N_("Mozilla"), 		"mozilla",	"mozilla %s",		FALSE, FALSE },
+--- capplets/default-applications/gnome-default-applications-properties-structs.c.orig	Sun Feb 20 16:18:03 2005
++++ capplets/default-applications/gnome-default-applications-properties-structs.c	Mon Feb 21 15:52:04 2005
+@@ -12,6 +12,7 @@
+         { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
+         { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
+         { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firefox %s",	FALSE, FALSE },
++        { N_("Firebird/FireFox"),  	"firefox",	"firefox %s",	FALSE, FALSE },
+         { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
+         { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
          { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
-         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
-         { N_("W3M Text Browser"),	"w3n",		"w3m %s",		TRUE,  FALSE },
-@@ -40,6 +37,7 @@
+@@ -40,6 +41,7 @@
  	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
  	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
  	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 44a777897908..f97758e10ba0 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Mar 11 03:09:48 2004
-+++ configure	Thu Mar 11 03:12:25 2004
-@@ -21373,6 +21373,7 @@
+--- configure.orig	Mon Feb 21 15:53:01 2005
++++ configure	Mon Feb 21 15:53:01 2005
+@@ -21286,6 +21286,7 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,15 +8,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21461,6 +21462,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+LIBS="-lintl $LIBS"
-  have_ngettext=yes
- fi
- done
-@@ -26257,7 +26259,7 @@
+@@ -26646,7 +26647,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -24,4 +16,4 @@
 +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
  _ACEOF
  
- GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
+ 
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index ddf5788902c0..e93c3fdffeaf 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -38,6 +38,7 @@ libexec/fontilus-context-menu
 libexec/gnome-settings-daemon
 share/gnome/application-registry/fontilus.applications
 share/gnome/application-registry/themus.applications
+share/gnome/applications/gnome-font-viewer.desktop
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/at-properties.desktop
@@ -176,6 +177,7 @@ 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
+share/locale/nso/LC_MESSAGES/control-center-2.0.mo
 share/locale/pa/LC_MESSAGES/control-center-2.0.mo
 share/locale/pl/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt/LC_MESSAGES/control-center-2.0.mo
@@ -196,6 +198,11 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
 share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
+share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
 @dirrm share/gnome/pixmaps/gnomecc-2
 @dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts