summaryrefslogtreecommitdiffstats
path: root/x11/gdm
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-10-16 07:25:04 +0000
committersobomax <sobomax@FreeBSD.org>2001-10-16 07:25:04 +0000
commitb4f7dcaee522863f7fd220d0336159555e8c1953 (patch)
tree209793a698a01f32253741aed06a4caf5cef4bad /x11/gdm
parentd2bb1d488b37b1ebfe7b02f88993e2f7bc9c2200 (diff)
downloadFreeBSD-ports-b4f7dcaee522863f7fd220d0336159555e8c1953.zip
FreeBSD-ports-b4f7dcaee522863f7fd220d0336159555e8c1953.tar.gz
Fix several incompatibilities with FreeBSD. This makes gdm working, at least
on my 5-CURRENT with XFree86-3.3.6. PR: 31309 Submitted by: Heath Nielson <heath@cs.byu.edu>
Diffstat (limited to 'x11/gdm')
-rw-r--r--x11/gdm/Makefile1
-rw-r--r--x11/gdm/files/patch-ar19
-rw-r--r--x11/gdm/files/patch-daemon::slave.c17
3 files changed, 37 insertions, 0 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 825c078..de5bdcd 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdm
PORTVERSION= 2.2.4.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gdm
diff --git a/x11/gdm/files/patch-ar b/x11/gdm/files/patch-ar
new file mode 100644
index 0000000..b0b8c03
--- /dev/null
+++ b/x11/gdm/files/patch-ar
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- daemon/gdm-net.c.orig Sun Aug 26 04:56:37 2001
++++ daemon/gdm-net.c Tue Oct 16 09:35:36 2001
+@@ -238,11 +243,11 @@
+ return NULL;
+ }
+
++ bzero(&addr, sizeof(addr));
+ strcpy (addr.sun_path, sockname);
+ addr.sun_family = AF_UNIX;
+ if (bind (fd,
+- (struct sockaddr *) &addr, strlen (addr.sun_path) +
+- sizeof (addr.sun_family)) < 0) {
++ (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ gdm_error (_("%s: Could not bind socket"),
+ "gdm_connection_open_unix");
+ close (fd);
diff --git a/x11/gdm/files/patch-daemon::slave.c b/x11/gdm/files/patch-daemon::slave.c
new file mode 100644
index 0000000..d2eda7d
--- /dev/null
+++ b/x11/gdm/files/patch-daemon::slave.c
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- daemon/slave.c 2001/10/16 06:36:10 1.1
++++ daemon/slave.c 2001/10/16 06:38:57
+@@ -1088,7 +1088,10 @@
+ /* this is again informal only, if the greeter does time out it will
+ * not actually login a user if it's not enabled for this display */
+ if (d->timed_login_ok) {
+- ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
++ if (ParsedTimedLogin == NULL)
++ ve_setenv ("GDM_TIMED_LOGIN_OK", "", TRUE);
++ else
++ ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
+ } else {
+ ve_unsetenv ("GDM_TIMED_LOGIN_OK");
+ }
OpenPOWER on IntegriCloud