Update to 2.13.3.

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

8 files changed, 82 insertions, 94 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 748144441..dbf4332e2 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.98 2006/01/16 23:44:59 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.99 2006/01/20 02:56:15 ahze Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.13.2
+PORTVERSION=	2.13.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.13
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 7f5dacd13..5ed00167e 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.13.2.tar.bz2) = fd89a1eb8c1384084f29b0da6acdecb3
-SHA256 (gnome2/gnome-applets-2.13.2.tar.bz2) = 09842acbe41df819128f455229651f21ae5fca2d26f2afb78a73ab6eeb713c94
-SIZE (gnome2/gnome-applets-2.13.2.tar.bz2) = 6256211
+MD5 (gnome2/gnome-applets-2.13.3.tar.bz2) = a21a38a13cafbf4bcd841210f3dbc228
+SHA256 (gnome2/gnome-applets-2.13.3.tar.bz2) = 8e5ae242aef144ded58aa3ec3b9162493d202b59ca7c4e62127a329b8ffb4c0d
+SIZE (gnome2/gnome-applets-2.13.3.tar.bz2) = 6290222
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 7fb8274f4..f0f89b96c 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Dec 14 14:55:44 2005
-+++ configure	Wed Dec 14 14:56:40 2005
-@@ -24392,8 +24392,7 @@
+--- configure.orig	Tue Jan 31 15:15:51 2006
++++ configure	Tue Jan 31 15:15:51 2006
+@@ -23356,8 +23356,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,7 +10,7 @@
    GNOMELOCALEDIR="$ac_define_dir"
  
  
-@@ -26423,7 +26422,7 @@
+@@ -25387,7 +25386,7 @@
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -19,16 +19,7 @@
            if  -n "${OS_SYS}" ; then
  	       ACPIINC="-I${OS_SYS}"
  	   else
-@@ -26726,7 +26725,7 @@
-   APPLET_MIXER_FALSE=
- fi
- 
--if test x"$P_MIXER" == x"mixer"; then
-+if test x"$P_MIXER" = x"mixer"; then
- 	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -27354,7 +27353,7 @@
+@@ -26442,7 +26441,7 @@
  fi
  
  
@@ -37,17 +28,17 @@
    { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
  echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
  else
-@@ -27520,6 +27519,9 @@
- echo "${ECHO_T}yes" >&6
+@@ -26606,6 +26605,9 @@
+       *linux*)
           build_cpufreq_applet=yes
  	 ;;
 +      i386-*-freebsd*|amd64-*-freebsd*)
 +         build_cpufreq_applet=yes
 +	 ;;
        *)
-          echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
- 	 build_cpufreq_applet=no
-@@ -27995,7 +27997,7 @@
+          { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
+ echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
+@@ -27082,7 +27084,7 @@
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
  
@@ -56,7 +47,7 @@
  
  pixmapsdir="${datadir}/pixmaps"
  
-@@ -28009,8 +28011,7 @@
+@@ -27096,8 +27098,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -66,7 +57,7 @@
    GNOME_ICONDIR="$ac_define_dir"
  
  
-@@ -28022,8 +28023,7 @@
+@@ -27109,8 +27110,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -76,7 +67,7 @@
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
  
-@@ -28035,8 +28035,7 @@
+@@ -27122,8 +27122,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -86,7 +77,7 @@
    GNOME_GLADEDIR="$ac_define_dir"
  
  
-@@ -28048,8 +28047,7 @@
+@@ -27135,8 +27134,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -96,7 +87,7 @@
    DATADIR="$ac_define_dir"
  
  
-@@ -28061,8 +28059,7 @@
+@@ -27148,8 +27146,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -106,7 +97,7 @@
    SYSCONFDIR="$ac_define_dir"
  
  
-@@ -28074,8 +28071,7 @@
+@@ -27161,8 +27158,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -116,7 +107,7 @@
    LIBDIR="$ac_define_dir"
  
  
-@@ -28087,8 +28083,7 @@
+@@ -27174,8 +27170,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index a9703cced..cafb0075b 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -721,6 +721,7 @@ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
@@ -757,22 +758,24 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@unexec /bin/rmdir %D/share/locale/zh_HK/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/zh_HK 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/ky/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/ky 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/gnome/pixmaps/stickynotes
 %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
 @dirrm share/gnome/pixmaps/accessx-status-applet
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 748144441..dbf4332e2 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.98 2006/01/16 23:44:59 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.99 2006/01/20 02:56:15 ahze Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.13.2
+PORTVERSION=	2.13.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.13
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 7f5dacd13..5ed00167e 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.13.2.tar.bz2) = fd89a1eb8c1384084f29b0da6acdecb3
-SHA256 (gnome2/gnome-applets-2.13.2.tar.bz2) = 09842acbe41df819128f455229651f21ae5fca2d26f2afb78a73ab6eeb713c94
-SIZE (gnome2/gnome-applets-2.13.2.tar.bz2) = 6256211
+MD5 (gnome2/gnome-applets-2.13.3.tar.bz2) = a21a38a13cafbf4bcd841210f3dbc228
+SHA256 (gnome2/gnome-applets-2.13.3.tar.bz2) = 8e5ae242aef144ded58aa3ec3b9162493d202b59ca7c4e62127a329b8ffb4c0d
+SIZE (gnome2/gnome-applets-2.13.3.tar.bz2) = 6290222
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 7fb8274f4..f0f89b96c 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Dec 14 14:55:44 2005
-+++ configure	Wed Dec 14 14:56:40 2005
-@@ -24392,8 +24392,7 @@
+--- configure.orig	Tue Jan 31 15:15:51 2006
++++ configure	Tue Jan 31 15:15:51 2006
+@@ -23356,8 +23356,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,7 +10,7 @@
    GNOMELOCALEDIR="$ac_define_dir"
  
  
-@@ -26423,7 +26422,7 @@
+@@ -25387,7 +25386,7 @@
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -19,16 +19,7 @@
            if  -n "${OS_SYS}" ; then
  	       ACPIINC="-I${OS_SYS}"
  	   else
-@@ -26726,7 +26725,7 @@
-   APPLET_MIXER_FALSE=
- fi
- 
--if test x"$P_MIXER" == x"mixer"; then
-+if test x"$P_MIXER" = x"mixer"; then
- 	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -27354,7 +27353,7 @@
+@@ -26442,7 +26441,7 @@
  fi
  
  
@@ -37,17 +28,17 @@
    { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
  echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
  else
-@@ -27520,6 +27519,9 @@
- echo "${ECHO_T}yes" >&6
+@@ -26606,6 +26605,9 @@
+       *linux*)
           build_cpufreq_applet=yes
  	 ;;
 +      i386-*-freebsd*|amd64-*-freebsd*)
 +         build_cpufreq_applet=yes
 +	 ;;
        *)
-          echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
- 	 build_cpufreq_applet=no
-@@ -27995,7 +27997,7 @@
+          { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
+ echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
+@@ -27082,7 +27084,7 @@
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
  
@@ -56,7 +47,7 @@
  
  pixmapsdir="${datadir}/pixmaps"
  
-@@ -28009,8 +28011,7 @@
+@@ -27096,8 +27098,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -66,7 +57,7 @@
    GNOME_ICONDIR="$ac_define_dir"
  
  
-@@ -28022,8 +28023,7 @@
+@@ -27109,8 +27110,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -76,7 +67,7 @@
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
  
-@@ -28035,8 +28035,7 @@
+@@ -27122,8 +27122,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -86,7 +77,7 @@
    GNOME_GLADEDIR="$ac_define_dir"
  
  
-@@ -28048,8 +28047,7 @@
+@@ -27135,8 +27134,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -96,7 +87,7 @@
    DATADIR="$ac_define_dir"
  
  
-@@ -28061,8 +28059,7 @@
+@@ -27148,8 +27146,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -106,7 +97,7 @@
    SYSCONFDIR="$ac_define_dir"
  
  
-@@ -28074,8 +28071,7 @@
+@@ -27161,8 +27158,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -116,7 +107,7 @@
    LIBDIR="$ac_define_dir"
  
  
-@@ -28087,8 +28083,7 @@
+@@ -27174,8 +27170,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index a9703cced..cafb0075b 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -721,6 +721,7 @@ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
@@ -757,22 +758,24 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@unexec /bin/rmdir %D/share/locale/zh_HK/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/zh_HK 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/ky/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/ky 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/gnome/pixmaps/stickynotes
 %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
 @dirrm share/gnome/pixmaps/accessx-status-applet