Update to 2.14.1.

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

6 files changed, 129 insertions, 29 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 6de0ff084..4d73cbdcd 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.24 2006/03/29 20:58:03 marcus Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.25 2006/04/10 21:37:33 mezz Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.14.0
-PORTREVISION=	2
+PORTVERSION=	2.14.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 869b3e624..9484663ec 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.14.0.tar.bz2) = 1f82485c4e8cd8ca2f1523a91a624eff
-SHA256 (gnome2/gdm-2.14.0.tar.bz2) = 32a88d7583cbd59beba2c6c8b3f4a6b52a55acd4a3b03c5a32e15fa8e38edfbe
-SIZE (gnome2/gdm-2.14.0.tar.bz2) = 2997013
+MD5 (gnome2/gdm-2.14.1.tar.bz2) = 5bafb764f36d7caf5d2217de0b6ceba5
+SHA256 (gnome2/gdm-2.14.1.tar.bz2) = 8c1c538ed99bc0195097b8f1db7fa2393c73d63613f372a30e28eebd3273229d
+SIZE (gnome2/gdm-2.14.1.tar.bz2) = 3029446
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 83db19d0f..43e2c566c 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -1,6 +1,6 @@
---- config/gdm.conf.in.orig	Tue Dec 20 21:22:36 2005
-+++ config/gdm.conf.in	Thu Jan  5 16:54:11 2006
-@@ -154,11 +154,11 @@
+--- config/gdm.conf.in.orig	Fri Apr  7 15:47:20 2006
++++ config/gdm.conf.in	Wed Apr 12 01:53:30 2006
+@@ -156,11 +156,11 @@ StandardXServer=@X_SERVER@
  #FlexiReapDelayMinutes=5
  # The X nest command.
  Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
@@ -15,12 +15,12 @@
  # Should double login be treated with a warning (and possibility to change VT's
  # on Linux and FreeBSD systems for console logins)
  #DoubleLoginWarning=true
-@@ -277,7 +277,7 @@
+@@ -283,7 +283,7 @@ Enable=false
  # The specific gtkrc file we use.  It should be the full path to the gtkrc that
  # we need.  Unless you need a specific gtkrc that doesn't correspond to a
  # specific theme, then just use the GtkTheme key.
--#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+-#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
++#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
  
  # The GTK+ theme to use for the GUI.
  #GtkTheme=Default
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index ba9d46921..ae54f1460 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -9,21 +9,6 @@
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
-@@ -32119,12 +32121,12 @@ GDM_OLD_CONF="$sysconfdir/gdm/gdm.conf"
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GDM_CUSTOM_CONF "$GDM_CUSTOM_CONF"
-+#define GDM_CUSTOM_CONF "`eval echo $GDM_CUSTOM_CONF`"
- _ACEOF
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GDM_OLD_CONF "$GDM_OLD_CONF"
-+#define GDM_OLD_CONF "`eval echo $GDM_OLD_CONF`"
- _ACEOF
- 
- 
 @@ -32415,6 +32417,13 @@ case "$host" in
          XSESSION_SHELL=/bin/ksh
          SOUND_PROGRAM=/usr/bin/audioplay
diff --git a/x11/gdm/files/patch-gui_greeter_gdmthemetester.in b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
new file mode 100644
index 000000000..988efc3fb
--- /dev/null
+++ b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
@@ -0,0 +1,112 @@
+--- gui/greeter/gdmthemetester.in.orig	Wed Apr 12 01:57:25 2006
++++ gui/greeter/gdmthemetester.in	Wed Apr 12 01:57:12 2006
+@@ -0,0 +1,109 @@
++#!/bin/sh
++
++gdmwhich () {
++  COMMAND="$1"
++  OUTPUT=
++  IFS=:
++  for dir in $PATH
++  do
++    if test -x "$dir/$COMMAND" ; then
++      if test "x$OUTPUT" = "x" ; then
++        OUTPUT="$dir/$COMMAND"
++      fi
++    fi
++  done
++  IFS=$OLD_IFS
++  echo "$OUTPUT"
++}
++
++echo
++echo "GDM Theme Tester"
++echo
++echo "Be sure to test all the environments:"
++echo " console, console-timed, flexi, remote-flexi, xdmcp"
++echo "Also be sure to test using caps lock"
++echo
++
++XNEST=`gdmwhich Xnest`
++GDMXNEST=`gdmwhich gdmXnest`
++GDMGREETER="@libexecdir@/gdmgreeter"
++
++if [ x$XNEST = x ]; then
++	echo "ERROR: Xnest not found"
++        echo ""
++	exit 1
++fi
++
++if [ x$GDMXNEST = x ]; then
++	echo "ERROR: gdmXnest not found"
++        echo ""
++	exit 1
++fi
++
++if [ x$GDMGREETER = x ]; then
++	echo "ERROR: gdmgreeter not found"
++        echo ""
++	exit 1
++fi
++
++USAGE="
++Usage: $0 <environment> <theme>
++<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
++<theme> is either the path of the theme or the name of an installed theme
++
++If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
++you can test the greeter at that resolution
++"
++if [ "$#" != 2 ]; then
++	echo "$USAGE"
++	exit 1
++fi
++
++GDM_THEME="$2"
++DOING_GDM_DEVELOPMENT=yes
++GDM_PARENT_DISPLAY="$DISPLAY"
++export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY
++
++case $1 in
++console)
++	GDM_IS_LOCAL=yes
++	export GDM_IS_LOCAL
++	;;
++console-timed)
++	GDM_IS_LOCAL=yes
++	GDM_FAKE_TIMED=yes
++	export GDM_IS_LOCAL GDM_FAKE_TIMED
++	;;
++flexi)
++	GDM_IS_LOCAL=yes
++	GDM_FLEXI_SERVER=yes
++	export GDM_IS_LOCAL GDM_FLEXI_SERVER
++	;;
++remote-flexi)
++	GDM_FLEXI_SERVER=yes
++	export GDM_FLEXI_SERVER
++	;;
++xdmcp)
++	;;
++*)
++	echo "$USAGE"
++	exit 1
++	;;
++esac
++
++if [ "x$XNESTSIZE" = x ] ; then
++  eval `gdmXnest -b`
++else
++  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
++fi
++export DISPLAY
++
++if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
++	echo "ERROR: Can't start the Xnest server"
++	exit 1
++fi
++
++# This may not be necessary
++sleep 1
++
++@libexecdir@/gdmgreeter
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 290ac843e..40a658a4d 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -57,13 +57,13 @@ share/gnome/gdm/themes/circles/options.png
 share/gnome/gdm/themes/circles/screenshot.png
 share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
 share/gnome/gdm/themes/happygnome-list/background.svg
-share/gnome/gdm/themes/happygnome-list/gnome-logo.png
+share/gnome/gdm/themes/happygnome-list/gnome-logo.svg
 share/gnome/gdm/themes/happygnome-list/happygnome.xml
 share/gnome/gdm/themes/happygnome-list/options.png
 share/gnome/gdm/themes/happygnome-list/screenshot.png
 share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
 share/gnome/gdm/themes/happygnome/background.svg
-share/gnome/gdm/themes/happygnome/gnome-logo.png
+share/gnome/gdm/themes/happygnome/gnome-logo.svg
 share/gnome/gdm/themes/happygnome/happygnome.xml
 share/gnome/gdm/themes/happygnome/options.png
 share/gnome/gdm/themes/happygnome/screenshot.png
@@ -161,6 +161,7 @@ share/locale/cs/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
 share/locale/da/LC_MESSAGES/gdm.mo
 share/locale/de/LC_MESSAGES/gdm.mo
+share/locale/dz/LC_MESSAGES/gdm.mo
 share/locale/el/LC_MESSAGES/gdm.mo
 share/locale/en_CA/LC_MESSAGES/gdm.mo
 share/locale/en_GB/LC_MESSAGES/gdm.mo
@@ -181,6 +182,7 @@ share/locale/id/LC_MESSAGES/gdm.mo
 share/locale/is/LC_MESSAGES/gdm.mo
 share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
+share/locale/ka/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
@@ -235,6 +237,8 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/xsessions
 @dirrm share/gnome/omf/gdm
 @dirrm share/gnome/help/gdm/zh_TW/figures