[50372] trunk/dports/gnome/gdm
devans at macports.org
devans at macports.org
Wed Apr 29 15:03:28 PDT 2009
Revision: 50372
http://trac.macports.org/changeset/50372
Author: devans at macports.org
Date: 2009-04-29 15:03:27 -0700 (Wed, 29 Apr 2009)
Log Message:
-----------
gdm: update to version 2.26.1, take maintainership openmaintainer, remove references to x11prefix, ensure appropriate X11 configuration paths, patch configure to select xorg-server as default server before system versions if it exists, add mode line.
Modified Paths:
--------------
trunk/dports/gnome/gdm/Portfile
Added Paths:
-----------
trunk/dports/gnome/gdm/files/patch-configure.diff
trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff
trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- trunk/dports/gnome/gdm/Portfile 2009-04-29 21:58:25 UTC (rev 50371)
+++ trunk/dports/gnome/gdm/Portfile 2009-04-29 22:03:27 UTC (rev 50372)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
# TODO: figure out how to make PAM happy without blowing a large hole
@@ -6,40 +7,55 @@
PortSystem 1.0
name gdm
-version 2.24.1
-set branch [join [lrange [split ${version} .] 0 1] .]
+version 2.26.1
+set branch [join [lrange [split ${version} .] 0 1] .]
description The Gnome Display Manager is a re-implementation of the well known xdm program.
long_description \
The Gnome Display Manager is a re-implementation of the well \
known xdm program. It displays a X11-based graphical login screen.
-maintainers nomaintainer
+maintainers devans openmaintainer
categories gnome
platforms darwin
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-checksums md5 31139d7a79096463b127b4790058b056 \
- sha1 efc93353ce4ba18aec7c45a69768937b31c0d5f8 \
- rmd160 dfae04847795160a1870d271fe0a3e514bc32960
-depends_build \
- port:gzip \
- port:p5-xml-parser \
- port:pkgconfig \
- port:gnome-doc-utils
-depends_lib \
- port:dbus-glib \
- port:gconf \
- port:gtk2 \
- port:gnome-panel \
- port:libglade2 \
- port:libxklavier
+checksums md5 c2c15f8b741962f278fa7e790aaa9a2b \
+ sha1 7c0b665c1235b903b58e5bfff8678e435529ff6c \
+ rmd160 abba568b616d5837f6aeedf3d2759a349df66c9e
+
+depends_build port:gzip \
+ port:p5-xml-parser \
+ port:pkgconfig \
+ port:gnome-doc-utils
+
+depends_lib port:dbus-glib \
+ port:gconf \
+ port:gtk2 \
+ port:gnome-panel \
+ port:libglade2 \
+ port:libxklavier
+
use_bzip2 yes
-patchfiles fink-gdm.diff fgetpwent.diff
+patchfiles patch-fink-gdm-modified.diff \
+ patch-configure.diff \
+ patch-daemon-gdm-display-access-file.c.diff \
+ fgetpwent.diff
-configure.args --mandir=${prefix}/share/man --disable-scrollkeeper
-configure.cppflags-append "-I${x11prefix}/include"
-configure.ldflags-append "-lresolv"
+post-patch {
+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
+}
+configure.args --mandir=${prefix}/share/man \
+ --without-selinux \
+ --disable-scrollkeeper
+
+configure.ldflags-append "-lresolv"
+
+if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
+ configure.args-append --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib
+}
+
startupitem.create yes
startupitem.name gdm
startupitem.init XDG_DATA_DIRS=${prefix}/share
Added: trunk/dports/gnome/gdm/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-configure.diff (rev 0)
+++ trunk/dports/gnome/gdm/files/patch-configure.diff 2009-04-29 22:03:27 UTC (rev 50372)
@@ -0,0 +1,24 @@
+--- configure.orig 2009-04-14 07:21:25.000000000 -0700
++++ configure 2009-04-29 13:58:55.000000000 -0700
+@@ -26751,6 +26751,7 @@
+ fi
+
+
++ac_pam_includes="/usr/include"
+ if test "x$have_pam" = "xyes"; then
+ pam_appl_h="$ac_pam_includes/security/pam_appl.h"
+ { $as_echo "$as_me:$LINENO: checking for const pam_message" >&5
+@@ -31182,7 +31183,12 @@
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/X11/bin/Xserver; then
++if test -x @MP_PREFIX@/bin/Xquartz; then
++ X_PATH="@MP_PREFIX@/bin"
++ X_SERVER_PATH="@MP_PREFIX@/bin"
++ X_SERVER="@MP_PREFIX@/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /usr/X11/bin/Xserver; then
+ X_PATH="/usr/X11/bin"
+ X_SERVER_PATH="/usr/X11/bin"
+ X_SERVER="/usr/X11/bin/Xserver"
Added: trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff (rev 0)
+++ trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff 2009-04-29 22:03:27 UTC (rev 50372)
@@ -0,0 +1,13 @@
+--- daemon/gdm-display-access-file.c.orig 2009-04-29 14:30:54.000000000 -0700
++++ daemon/gdm-display-access-file.c 2009-04-29 14:32:16.000000000 -0700
+@@ -56,6 +56,10 @@
+ #define O_BINARY 0
+ #endif
+
++#ifndef HOST_NAME_MAX
++#define HOST_NAME_MAX 256
++#endif
++
+ static void gdm_display_access_file_finalize (GObject * object);
+
+ enum
Added: trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff (rev 0)
+++ trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2009-04-29 22:03:27 UTC (rev 50372)
@@ -0,0 +1,117 @@
+diff -Nurd -x'*~' gdm-2.24.1.orig/common/gdm-signal-handler.c gdm-2.24.1/common/gdm-signal-handler.c
+--- common/gdm-signal-handler.c 2008-11-18 17:38:43.000000000 -0500
++++ common/gdm-signal-handler.c 2009-01-20 16:53:43.000000000 -0500
+@@ -27,7 +27,9 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
++#if HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <syslog.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -160,6 +162,7 @@
+ static void
+ fallback_get_backtrace (void)
+ {
++#ifdef HAVE_EXECINFO_H
+ void * frames[64];
+ size_t size;
+ char ** strings;
+@@ -173,9 +176,10 @@
+ }
+ free (strings);
+ syslog (LOG_CRIT, "******************* END **********************************");
+- } else {
+- g_warning ("GDM crashed, but symbols couldn't be retrieved.");
++ return;
+ }
++#endif
++ g_warning ("GDM crashed, but symbols couldn't be retrieved.");
+ }
+
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-record.c gdm-2.24.1/daemon/gdm-session-record.c
+--- daemon/gdm-session-record.c 2008-11-18 17:38:44.000000000 -0500
++++ daemon/gdm-session-record.c 2009-01-20 16:29:30.000000000 -0500
+@@ -322,8 +322,10 @@
+ #elif defined(HAVE_UT_UT_TIME)
+ u->ut_time = session_record.ut_time;
+ #endif
++#ifdef HAVE_UT_UT_EXIT_E_TERMINATION
+ u->ut_exit.e_termination = 0;
+ u->ut_exit.e_exit = 0;
++#endif
+
+ pututxline (u);
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-worker.c gdm-2.24.1/daemon/gdm-session-worker.c
+--- daemon/gdm-session-worker.c 2008-11-18 17:38:44.000000000 -0500
++++ daemon/gdm-session-worker.c 2009-01-20 22:14:05.000000000 -0500
+@@ -32,7 +32,7 @@
+ #include <grp.h>
+ #include <pwd.h>
+
+-#include <security/pam_appl.h>
++#include <pam/pam_appl.h>
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.24.1/daemon/gdm-xdmcp-display-factory.c
+--- daemon/gdm-xdmcp-display-factory.c 2008-11-18 17:38:44.000000000 -0500
++++ daemon/gdm-xdmcp-display-factory.c 2009-01-20 22:48:05.000000000 -0500
+@@ -368,7 +368,7 @@
+ if (ai->ai_flags & AI_NUMERICHOST) {
+ g_string_append (str, "numhost ");
+ }
+- if (ai->ai_flags & AI_NUMERICSERV) {
++ if (ai->ai_flags & NI_NUMERICSERV) {
+ g_string_append (str, "numserv ");
+ }
+ if (ai->ai_flags & AI_V4MAPPED) {
+@@ -600,20 +597,22 @@
+ return TRUE;
+ }
+
++#ifdef HAVE_TCPWRAPPERS
++
++/*
++ * Avoids a warning, my tcpd.h file doesn't include this prototype, even
++ * though the library does include the function and the manpage mentions it
++ */
++extern int hosts_ctl (char *daemon,
++ char *client_name,
++ char *client_addr,
++ char *client_user);
++#endif
++
+ static gboolean
+ gdm_xdmcp_host_allow (GdmAddress *address)
+ {
+ #ifdef HAVE_TCPWRAPPERS
+-
+- /*
+- * Avoids a warning, my tcpd.h file doesn't include this prototype, even
+- * though the library does include the function and the manpage mentions it
+- */
+- extern int hosts_ctl (char *daemon,
+- char *client_name,
+- char *client_addr,
+- char *client_user);
+-
+ char *client;
+ char *host;
+ gboolean ret;
+diff -Nurd -x'*~' gdm-2.24.1.orig/gui/simple-greeter/gdm-greeter-login-window.c gdm-2.24.1/gui/simple-greeter/gdm-greeter-login-window.c
+--- gui/simple-greeter/gdm-greeter-login-window.c 2008-11-18 17:49:12.000000000 -0500
++++ gui/simple-greeter/gdm-greeter-login-window.c 2009-01-20 22:14:20.000000000 -0500
+@@ -68,7 +68,7 @@
+ #include "gdm-user-chooser-widget.h"
+
+ #ifdef HAVE_PAM
+-#include <security/pam_appl.h>
++#include <pam/pam_appl.h>
+ #define PW_ENTRY_SIZE PAM_MAX_RESP_SIZE
+ #else
+ #define PW_ENTRY_SIZE GDM_MAX_PASS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090429/3dcd942f/attachment.html>
More information about the macports-changes
mailing list