diff options
| author | tron <tron> | 2003-08-09 08:32:13 +0000 |
|---|---|---|
| committer | tron <tron> | 2003-08-09 08:32:13 +0000 |
| commit | 80e0a90aaf7c5f1fb86c9c5052110e75b5e0ab80 (patch) | |
| tree | ac91d18fbef0b44d822a75060314df4508b471f5 /x11 | |
| parent | b7f2abd5c539eb8bdcf37827b637a8a81c6158f8 (diff) | |
| download | pkgsrc-80e0a90aaf7c5f1fb86c9c5052110e75b5e0ab80.tar.gz | |
Don't invoke screen locking program with standard output or standard error
closed. Bump package revision to reflect this change.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xautolock/Makefile | 3 | ||||
| -rw-r--r-- | x11/xautolock/distinfo | 4 | ||||
| -rw-r--r-- | x11/xautolock/patches/patch-aa | 35 |
3 files changed, 34 insertions, 8 deletions
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile index b43d39db711..7b6cc065062 100644 --- a/x11/xautolock/Makefile +++ b/x11/xautolock/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 22:56:51 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/08/09 08:32:13 tron Exp $ DISTNAME= xautolock-pl15 PKGNAME= xautolock-1.15 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} EXTRACT_SUFX= .tgz diff --git a/x11/xautolock/distinfo b/x11/xautolock/distinfo index 538ab8ea9db..cdc9a6eea23 100644 --- a/x11/xautolock/distinfo +++ b/x11/xautolock/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2003/07/25 14:09:41 tron Exp $ +$NetBSD: distinfo,v 1.4 2003/08/09 08:32:14 tron Exp $ SHA1 (xautolock-pl15.tgz) = 5bc632141a4cf76fb6453921f34c2f493a1ff08d Size (xautolock-pl15.tgz) = 39240 bytes -SHA1 (patch-aa) = 5f7090a0d9b434da9ec07e651db7214b312b61df +SHA1 (patch-aa) = 1213abeb844c22752c5cda040e7228f1526fa9eb SHA1 (patch-ab) = 1299556b89466018de5553febe4bed8df8eab09d diff --git a/x11/xautolock/patches/patch-aa b/x11/xautolock/patches/patch-aa index 2e010b0eefc..caef73f4364 100644 --- a/x11/xautolock/patches/patch-aa +++ b/x11/xautolock/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 1999/04/05 22:46:28 mjl Exp $ +$NetBSD: patch-aa,v 1.4 2003/08/09 08:32:15 tron Exp $ ---- xautolock.c.orig Thu Mar 11 23:43:25 1999 -+++ xautolock.c Tue Apr 6 00:06:02 1999 +--- xautolock.c.orig 1999-03-11 23:43:25.000000000 +0100 ++++ xautolock.c 2003-08-09 10:29:28.000000000 +0200 @@ -297,6 +297,8 @@ * with vroot.h, because it needs to know the real root window. */ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 1999/04/05 22:46:28 mjl Exp $ #if defined(hpux) || defined (__hpux) #ifndef _HPUX_SOURCE #define _HPUX_SOURCE -@@ -368,7 +370,10 @@ +@@ -368,7 +370,11 @@ #endif /* !NOSTDHDRS */ #if !defined (apollo) && !defined (VMS) @@ -19,10 +19,11 @@ $NetBSD: patch-aa,v 1.3 1999/04/05 22:46:28 mjl Exp $ #include <malloc.h> +#endif /* !BSD */ + ++#include <fcntl.h> #include <unistd.h> #endif /* !apollo && !VMS */ -@@ -2028,7 +2033,9 @@ +@@ -2028,7 +2034,9 @@ #else /* VMS */ if (locker_pid) { @@ -33,3 +34,27 @@ $NetBSD: patch-aa,v 1.3 1999/04/05 22:46:28 mjl Exp $ union wait status; /* childs process status */ #else /* !UTEKV && !SYSV && !SVR4 */ int status = 0; /* childs process status */ +@@ -2762,8 +2770,23 @@ + + CheckConnectionAndSendMessage (d); + ++#if !defined (apollo) && !defined (VMS) ++ if (close_out || close_err) ++ { ++ Int devnull; ++ ++ devnull = open("/dev/null", O_WRONLY, 0); ++ if (devnull >= 0) ++ { ++ if (close_out) (Void) dup2(devnull, fileno(stdout)); ++ if (close_err) (Void) dup2(devnull, fileno(stderr)); ++ (Void) close(devnull); ++ } ++ } ++#else + if (close_out) (Void) fclose (stdout); + if (close_err) (Void) fclose (stderr); ++#endif + + (Void) XSetErrorHandler ((XErrorHandler) CatchFalseAlarm); + |