From afaa4085a68c95147ef4afeb494cbfc0e78def28 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 15 Jan 2008 22:30:33 +0000 Subject: Allow GDM to find session executables under LOCALBASE/bin. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10132 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gdm/Makefile | 6 ++++-- x11/gdm/files/patch-daemon_gdm-session-worker.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 x11/gdm/files/patch-daemon_gdm-session-worker.c diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index e7808f0e5..55ec42881 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.93 2008/01/15 05:50:40 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.94 2008/01/15 06:14:44 mezz Exp $ # PORTNAME= gdm PORTVERSION= 2.21.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -70,6 +70,8 @@ post-patch: .endif @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ ${WRKSRC}/data/Makefile.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/daemon/gdm-session-worker.c post-install: .if !defined(PACKAGE_BUILDING) diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c new file mode 100644 index 000000000..67c65fc4c --- /dev/null +++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c @@ -0,0 +1,11 @@ +--- daemon/gdm-session-worker.c.orig 2008-01-15 17:23:12.000000000 -0500 ++++ daemon/gdm-session-worker.c 2008-01-15 17:22:36.000000000 -0500 +@@ -226,7 +226,7 @@ gdm_session_execute (const char *file, + * what to search if PATH is unset. POSIX may, dunno. + */ + +- path = "/bin:/usr/bin:."; ++ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:."; + } + + len = strlen (file) + 1; -- cgit v1.2.3