diff options
| author | christos <christos@pkgsrc.org> | 2005-01-16 22:00:26 +0000 |
|---|---|---|
| committer | christos <christos@pkgsrc.org> | 2005-01-16 22:00:26 +0000 |
| commit | 10b151bed5d5c801a50fef6096d7d09405549402 (patch) | |
| tree | 481d3e05674296cfe33b92a31e9f52693e07195f | |
| parent | 717b7907dfcde82bcff8b044a10fffae81b4b4df (diff) | |
| download | pkgsrc-10b151bed5d5c801a50fef6096d7d09405549402.tar.gz | |
If we have UTMPPID or not is unrelated to pty names. Remove wrong test.
| -rw-r--r-- | x11/rxvt/Makefile | 4 | ||||
| -rw-r--r-- | x11/rxvt/distinfo | 3 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-ak | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 4a5e288ee98..420ca3319e6 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.42 2004/04/24 21:34:46 snj Exp $ +# $NetBSD: Makefile,v 1.43 2005/01/16 22:00:26 christos Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # DISTNAME= rxvt-2.7.10 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \ ftp://mason.primenet.com.au/pub/rxvt/ diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo index 468e93691a5..affd3002633 100644 --- a/x11/rxvt/distinfo +++ b/x11/rxvt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2004/09/15 18:29:20 minskim Exp $ +$NetBSD: distinfo,v 1.17 2005/01/16 22:00:26 christos Exp $ SHA1 (rxvt-2.7.10.tar.bz2) = 16eae23c3227e28e5e7a53a58eaa3226affe65f9 Size (rxvt-2.7.10.tar.bz2) = 493199 bytes @@ -12,3 +12,4 @@ SHA1 (patch-ag) = 11019ed97892c8bd8834c56433573719892336c4 SHA1 (patch-ah) = 5e6fcf6b4b4fe1111b97d0b916501ab5855a755a SHA1 (patch-ai) = 0f3e800efc5b87243208de9fb9fafe9abde73201 SHA1 (patch-aj) = 43ca25f034e6160f3a3dabbf1488df31cdecf95b +SHA1 (patch-ak) = 8479f911e93eb6434a3b575bfbb1082591d01510 diff --git a/x11/rxvt/patches/patch-ak b/x11/rxvt/patches/patch-ak new file mode 100644 index 00000000000..3cfee7e89bf --- /dev/null +++ b/x11/rxvt/patches/patch-ak @@ -0,0 +1,25 @@ +$NeBSD$ + +--- src/logging.c.orig 2005-01-16 16:33:20.000000000 -0500 ++++ src/logging.c 2005-01-16 16:55:25.000000000 -0500 +@@ -66,9 +66,7 @@ + #ifdef HAVE_STRUCT_UTMPX + struct utmpx *utx = &(r->h->utx); + #endif +-#ifdef HAVE_UTMP_PID + int i; +-#endif + char ut_id[5]; + struct passwd *pwent = getpwuid(getuid()); + +@@ -78,10 +76,8 @@ + if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) { + STRNCPY(ut_id, (pty + 3), sizeof(ut_id)); + } +-#ifdef HAVE_UTMP_PID + else if (sscanf(pty, "pts/%d", &i) == 1) + sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ +-#endif + else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) { + rxvt_print_error("can't parse tty name \"%s\"", pty); + return; |