Update to 2.21.4

Remove the log limit option. Wasn't patchable to begin with and couldn't
find out how to fix it otherwise.


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

14 files changed, 35 insertions, 265 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 3eeb6b981..fb8b3436c 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.87 2007/11/23 06:47:21 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.88 2007/12/13 17:42:48 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.21.2
-PORTREVISION=	2
+PORTVERSION=	2.21.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 version of xdm display manager
 
-BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+		${LOCALBASE}/libdata/pkgconfig/check.pc:${PORTSDIR}/devel/check
 LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
 
@@ -33,6 +33,7 @@ USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 		gnomeprefix
+GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -43,8 +44,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNOME_LOCALSTATEDIR=	/var
 
-OPTIONS=	IPV6 "Enable IPv6 support" on \
-		LOG_LIMIT "Limit ~/.xsession-errors size" on
+OPTIONS=	IPV6 "Enable IPv6 support" on
 
 .include <bsd.port.pre.mk>
 
@@ -60,10 +60,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITHOUT_LOG_LIMIT)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-daemon_slave.c
-.endif
-
 post-patch:
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 48d458d87..0b78bb82b 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.21.2.tar.bz2) = a9727544b7bc780a1171d968e39c2a23
-SHA256 (gnome2/gdm-2.21.2.tar.bz2) = c59bdd72d0b44aefe4a63a7f74b420483df29ae3166eb4b8c14139019231c815
-SIZE (gnome2/gdm-2.21.2.tar.bz2) = 2293224
+MD5 (gnome2/gdm-2.21.4.tar.bz2) = 2fe013e31f44bd383c1f6f31a3977034
+SHA256 (gnome2/gdm-2.21.4.tar.bz2) = a50e1dbc6b3f5ab07b503a8b3550cd33ee6e114d66103e365b77bdf73ec02675
+SIZE (gnome2/gdm-2.21.4.tar.bz2) = 2276677
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
deleted file mode 100644
index b493dcd80..000000000
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- daemon/slave.c.orig	2007-09-17 10:45:50.000000000 -0400
-+++ daemon/slave.c	2007-09-25 13:42:06.000000000 -0400
-@@ -373,8 +373,7 @@
- 			break;
- 		}
- 
--		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES ||
--			       got_xfsz_signal)
-+		if G_UNLIKELY (got_xfsz_signal)
- 			continue;
- 
- 		/* write until we succeed in writing something */
-@@ -397,13 +396,6 @@
- 
- 		d->xsession_errors_bytes += r;
- 
--		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
--			       ! got_xfsz_signal) {
--			VE_IGNORE_EINTR (write (d->xsession_errors_fd,
--						"\n...Too much output, ignoring rest...\n",
--						strlen ("\n...Too much output, ignoring rest...\n")));
--		}
--
- 		/* there wasn't more then buf available, so no need to try reading
- 		 * again, unless we really want to */
- 		if (r < sizeof (buf) && ! read_until_eof)
diff --git a/x11/gdm/files/patch-common_gdm-common-unknown-origin.h b/x11/gdm/files/patch-common_gdm-common-unknown-origin.h
deleted file mode 100644
index 5fa774125..000000000
--- a/x11/gdm/files/patch-common_gdm-common-unknown-origin.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/gdm-common-unknown-origin.h.orig	2007-11-02 15:08:43.000000000 -0400
-+++ common/gdm-common-unknown-origin.h	2007-11-02 15:09:07.000000000 -0400
-@@ -22,6 +22,7 @@
- #ifndef _GDM_COMMON_UNKNOWN_H
- #define _GDM_COMMON_UNKNOWN_H
- 
-+#include <sys/stat.h>
- #include <stdio.h>
- #include <errno.h>
- #include <glib.h>
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index 88cba46f2..000000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,83 +0,0 @@
---- configure.orig	2007-11-02 15:05:24.000000000 -0400
-+++ configure	2007-11-02 20:46:02.000000000 -0400
-@@ -29317,22 +27620,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_util_login=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
- echo "${ECHO_T}$ac_cv_lib_util_login" >&6; }
- if test $ac_cv_lib_util_login = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
--_ACEOF
- 
--  LIBS="-lutil $LIBS"
-+		   cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGIN 1
-+_ACEOF
- 
-+		   	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
- 
--
- { echo "$as_me:$LINENO: checking for logout in -lutil" >&5
- echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_logout+set}" = set; then
-@@ -29404,22 +27690,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_util_logout=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
- echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; }
- if test $ac_cv_lib_util_logout = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
--_ACEOF
- 
--  LIBS="-lutil $LIBS"
-+		   cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGOUT 1
-+_ACEOF
- 
-+		   	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
- 
--
- { echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
- echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_logwtmp+set}" = set; then
-@@ -29491,19 +27760,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_util_logwtmp=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
- echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; }
- if test $ac_cv_lib_util_logwtmp = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
--_ACEOF
- 
--  LIBS="-lutil $LIBS"
-+		   cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGWTMP 1
-+_ACEOF
- 
-+		   	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
- 
- 
diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c
index 551d6a1e7..e57350568 100644
--- a/x11/gdm/files/patch-daemon-gdm-server.c
+++ b/x11/gdm/files/patch-daemon-gdm-server.c
@@ -1,14 +1,6 @@
---- daemon/gdm-server.c.orig	2007-11-09 10:40:03.000000000 -0500
-+++ daemon/gdm-server.c	2007-12-13 12:35:56.000000000 -0500
-@@ -32,6 +32,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <signal.h>
-+#include <sys/resource.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -43,6 +44,10 @@
+--- daemon/gdm-server.c.orig	2007-11-19 22:53:12.000000000 +0100
++++ daemon/gdm-server.c	2007-12-25 11:56:07.000000000 +0100
+@@ -44,6 +44,10 @@
  #include "gdm-common.h"
  #include "gdm-signal-handler.h"
  
@@ -19,15 +11,15 @@
  #include "gdm-server.h"
  
  extern char **environ;
-@@ -76,6 +81,7 @@ struct GdmServerPrivate
+@@ -77,6 +81,7 @@
          char    *parent_display_name;
          char    *parent_auth_file;
          char    *chosen_hostname;
-+	char    *vt;
++        char    *vt;
  
          guint    child_watch_id;
  };
-@@ -662,7 +668,7 @@ gdm_server_start (GdmServer *server)
+@@ -663,7 +668,7 @@
          gboolean res;
  
          /* fork X server process */
@@ -36,35 +28,36 @@
  
          return res;
  }
-@@ -889,12 +895,32 @@ static void
+@@ -890,12 +895,33 @@
  gdm_server_init (GdmServer *server)
  {
  
-+	int vt;
-+	gboolean has_vt;
-+	GdmSettings *settings = NULL;
++        int vt;
++        gboolean has_vt;
++        GdmSettings *settings = NULL;
          server->priv = GDM_SERVER_GET_PRIVATE (server);
  
-+	settings = gdm_settings_new ();
-+	if (settings == NULL) {
-+		g_assert ("Unable to initialize settings");
-+	}
 +
-+	if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
-+		g_assert ("Unable to initialize settings");
-+	}
++        settings = gdm_settings_new();
++        if (settings == NULL) {
++                g_assert ("Unable to initialize settings");
++        }
++
++        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
++                g_assert ("Unable to initialize settings");
++        }
 +
-+	has_vt = gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
++        has_vt =  gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
 +
-+	g_object_unref (settings);
++        g_object_unref (settings);
 +
          server->priv->pid = -1;
          server->priv->command = g_strdup (X_SERVER " -br -verbose");
          server->priv->log_dir = g_strdup (LOGDIR);
  
-+	if (has_vt) {
-+		server->priv->vt = g_strdup_printf ("vt %d", vt);
-+	}
++        if (has_vt) {
++                server->priv->vt = g_strdup_printf ("vt %d", vt);
++        }
 +
          add_ready_handler (server);
  }
diff --git a/x11/gdm/files/patch-daemon_gdm-greeter-session-worker-job.c b/x11/gdm/files/patch-daemon_gdm-greeter-session-worker-job.c
deleted file mode 100644
index 7d2823294..000000000
--- a/x11/gdm/files/patch-daemon_gdm-greeter-session-worker-job.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/gdm-session-worker-job.c.orig	2007-11-01 10:00:45.085195185 -0400
-+++ daemon/gdm-session-worker-job.c	2007-11-01 10:01:33.067624236 -0400
-@@ -31,6 +31,7 @@
- #include <ctype.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
diff --git a/x11/gdm/files/patch-daemon_gdm-greeter-session.c b/x11/gdm/files/patch-daemon_gdm-greeter-session.c
deleted file mode 100644
index 6e2d09950..000000000
--- a/x11/gdm/files/patch-daemon_gdm-greeter-session.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/gdm-greeter-session.c.orig	2007-11-01 09:53:22.605462146 -0400
-+++ daemon/gdm-greeter-session.c	2007-11-01 09:53:41.764236795 -0400
-@@ -31,6 +31,7 @@
- #include <ctype.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
diff --git a/x11/gdm/files/patch-daemon_gdm-session-record.c b/x11/gdm/files/patch-daemon_gdm-session-record.c
deleted file mode 100644
index d41db6e34..000000000
--- a/x11/gdm/files/patch-daemon_gdm-session-record.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- daemon/gdm-session-record.c.orig	2007-10-30 14:54:03.000000000 -0400
-+++ daemon/gdm-session-record.c	2007-11-08 15:29:41.000000000 -0500
-@@ -85,7 +85,7 @@ record_set_username (UTMP       *u,
-                  u->ut_user);
- #elif defined(HAVE_UT_UT_NAME)
-         strncpy (u->ut_name,
--                 username
-+                 username,
-                  sizeof (u->ut_name));
-         g_debug ("using ut_name %.*s",
-                  (int) sizeof (u->ut_name),
-@@ -228,7 +228,7 @@ gdm_session_record_login (GPid          
-         updwtmpx (GDM_NEW_SESSION_RECORDS_FILE, &session_record);
- #elif defined(HAVE_UPDWTMP)
-         updwtmp (GDM_NEW_SESSION_RECORDS_FILE, &session_record);
--#elif defined(HAVE_LOGWTMP) && defined(HAVE_UT_UT_HOST) && !defined(HAVE_LOGIN)
-+#elif defined(HAVE_LOGWTMP) && defined(HAVE_UT_UT_HOST)
- #if defined(HAVE_UT_UT_USER)
-         logwtmp (session_record.ut_line, session_record.ut_user, session_record.ut_host);
- #elif defined(HAVE_UT_UT_NAME)
-@@ -261,6 +261,8 @@ gdm_session_record_login (GPid          
-                 g_debug ("Adding new utmp record");
-                 pututxline (&session_record);
-         }
-+#elif defined(HAVE_LOGIN)
-+	login (&session_record);
- #endif
- }
- 
-@@ -296,7 +298,7 @@ gdm_session_record_logout (GPid         
- #elif defined (HAVE_UPDWTMP)
-         updwtmp (GDM_NEW_SESSION_RECORDS_FILE, &session_record);
- #elif defined(HAVE_LOGWTMP)
--        logwtmp (record.ut_line, "", "");
-+        logwtmp (session_record.ut_line, "", "");
- #endif
- 
-         /* Handle utmp */
diff --git a/x11/gdm/files/patch-daemon_gdm-slave-proxy.c b/x11/gdm/files/patch-daemon_gdm-slave-proxy.c
deleted file mode 100644
index 5225ebfe3..000000000
--- a/x11/gdm/files/patch-daemon_gdm-slave-proxy.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/gdm-slave-proxy.c.orig	2007-11-01 10:14:43.925210606 -0400
-+++ daemon/gdm-slave-proxy.c	2007-11-01 10:14:57.116053855 -0400
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
diff --git a/x11/gdm/files/patch-daemon_gdm_main.c b/x11/gdm/files/patch-daemon_gdm_main.c
deleted file mode 100644
index 3fa5fc5a3..000000000
--- a/x11/gdm/files/patch-daemon_gdm_main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- daemon/main.c.orig	2007-11-01 10:12:55.277503425 -0400
-+++ daemon/main.c	2007-11-01 10:13:20.572202611 -0400
-@@ -30,8 +30,9 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <grp.h>
--#include <wait.h>
-+#include <sys/wait.h>
- #include <locale.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
diff --git a/x11/gdm/files/patch-gui_settings-daemon_plugins_xsettings_gdm-xsettings-manager.c b/x11/gdm/files/patch-gui_settings-daemon_plugins_xsettings_gdm-xsettings-manager.c
deleted file mode 100644
index 204eac84f..000000000
--- a/x11/gdm/files/patch-gui_settings-daemon_plugins_xsettings_gdm-xsettings-manager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/settings-daemon/plugins/xsettings/gdm-xsettings-manager.c.orig	2007-11-06 15:06:39.000000000 -0500
-+++ gui/settings-daemon/plugins/xsettings/gdm-xsettings-manager.c	2007-11-06 15:07:16.000000000 -0500
-@@ -21,6 +21,8 @@
- 
- #include "config.h"
- 
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
deleted file mode 100644
index 5b8f2c541..000000000
--- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-chooser/gdm-host-chooser-widget.c.orig	2007-11-02 20:25:18.000000000 -0400
-+++ gui/simple-chooser/gdm-host-chooser-widget.c	2007-11-02 20:26:16.000000000 -0400
-@@ -26,6 +26,8 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 23453cc54..aa3c3b272 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -95,6 +95,7 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
 share/locale/ru/LC_MESSAGES/gdm.mo
 share/locale/rw/LC_MESSAGES/gdm.mo
+share/locale/si/LC_MESSAGES/gdm.mo
 share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sq/LC_MESSAGES/gdm.mo
@@ -165,6 +166,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES