Fix PATH in xflock4 so it can find xlock and gnome-screensaver. Regen patches.

ok landry
This commit is contained in:
stsp 2012-05-22 10:03:03 +00:00
parent 7bc29b5cce
commit b955caaede
3 changed files with 22 additions and 5 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.57 2012/04/30 12:55:58 landry Exp $
# $OpenBSD: Makefile,v 1.58 2012/05/22 10:03:03 stsp Exp $
COMMENT= Xfce4 session manager
XFCE_PROJECT= xfce4-session
REVISION= 0
SHARED_LIBS += xfsm-4.6 1.0 # .0.0
@ -39,4 +40,7 @@ FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session \
conffilesdir=${PREFIX}/share/examples/xfce4-session \
autostartdir=${PREFIX}/share/examples/xfce4-session
post-install:
${SUBST_CMD} ${PREFIX}/bin/xflock4
.include <bsd.port.mk>

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-scripts_xflock4,v 1.1 2012/05/22 10:03:06 stsp Exp $
http://bugzilla.xfce.org/show_bug.cgi?id=8830
--- scripts/xflock4.orig Sat Apr 28 22:43:27 2012
+++ scripts/xflock4 Tue May 22 10:50:08 2012
@@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
export PATH
# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xfsm-shutdown-helper_main_c,v 1.2 2007/05/08 14:14:03 steven Exp $
--- xfsm-shutdown-helper/main.c.orig Sun Apr 1 14:19:19 2007
+++ xfsm-shutdown-helper/main.c Sun Apr 1 14:19:34 2007
@@ -58,7 +58,7 @@
$OpenBSD: patch-xfsm-shutdown-helper_main_c,v 1.3 2012/05/22 10:03:07 stsp Exp $
--- xfsm-shutdown-helper/main.c.orig Sat Apr 28 22:43:29 2012
+++ xfsm-shutdown-helper/main.c Mon May 21 20:20:56 2012
@@ -59,7 +59,7 @@
#endif
#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)