Update to 2.5.4.

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

8 files changed, 48 insertions, 14 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 723004a8b..90eb6e680 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.5.3
+PORTVERSION=	2.5.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.5
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index e11f37ec6..492cf24ba 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.5.3.tar.bz2) = fd8606c9e7328683b7fc79e1ec0e11fc
-SIZE (gnome2/control-center-2.5.3.tar.bz2) = 1588068
+MD5 (gnome2/control-center-2.5.4.tar.bz2) = b18499feb4dc74894b882bbe4d9b2ea2
+SIZE (gnome2/control-center-2.5.4.tar.bz2) = 2347989
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 283bdb126..820e1fc4b 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,22 @@
---- configure.orig	Tue Dec 30 15:29:25 2003
-+++ configure	Tue Dec 30 16:00:39 2003
-@@ -25519,7 +25519,7 @@
+--- configure.orig	Thu Mar 11 03:09:48 2004
++++ configure	Thu Mar 11 03:12:25 2004
+@@ -21373,6 +21373,7 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   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
+@@ -25595,7 +25597,7 @@
  if test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else
@@ -9,7 +25,7 @@
  fi
  prefix="$glib_save_prefix"
  exec_prefix="$glib_save_exec_prefix"
-@@ -25791,7 +25791,7 @@
+@@ -26257,7 +26259,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 65fefb471..a890e140b 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -178,6 +178,7 @@ share/locale/cy/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
 share/locale/de/LC_MESSAGES/control-center-2.0.mo
 share/locale/el/LC_MESSAGES/control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
 share/locale/es/LC_MESSAGES/control-center-2.0.mo
 share/locale/et/LC_MESSAGES/control-center-2.0.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 723004a8b..90eb6e680 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.5.3
+PORTVERSION=	2.5.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.5
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index e11f37ec6..492cf24ba 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.5.3.tar.bz2) = fd8606c9e7328683b7fc79e1ec0e11fc
-SIZE (gnome2/control-center-2.5.3.tar.bz2) = 1588068
+MD5 (gnome2/control-center-2.5.4.tar.bz2) = b18499feb4dc74894b882bbe4d9b2ea2
+SIZE (gnome2/control-center-2.5.4.tar.bz2) = 2347989
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 283bdb126..820e1fc4b 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,22 @@
---- configure.orig	Tue Dec 30 15:29:25 2003
-+++ configure	Tue Dec 30 16:00:39 2003
-@@ -25519,7 +25519,7 @@
+--- configure.orig	Thu Mar 11 03:09:48 2004
++++ configure	Thu Mar 11 03:12:25 2004
+@@ -21373,6 +21373,7 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   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
+@@ -25595,7 +25597,7 @@
  if test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else
@@ -9,7 +25,7 @@
  fi
  prefix="$glib_save_prefix"
  exec_prefix="$glib_save_exec_prefix"
-@@ -25791,7 +25791,7 @@
+@@ -26257,7 +26259,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 65fefb471..a890e140b 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -178,6 +178,7 @@ share/locale/cy/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
 share/locale/de/LC_MESSAGES/control-center-2.0.mo
 share/locale/el/LC_MESSAGES/control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
 share/locale/es/LC_MESSAGES/control-center-2.0.mo
 share/locale/et/LC_MESSAGES/control-center-2.0.mo