aboutsummaryrefslogtreecommitdiff
path: root/x11/mrxvt
diff options
context:
space:
mode:
authorGary Jennejohn <gj@FreeBSD.org>2010-01-15 16:37:12 +0000
committerGary Jennejohn <gj@FreeBSD.org>2010-01-15 16:37:12 +0000
commitb432e5aaad5c4a805d2446eb0698fd5c7ec468cb (patch)
tree7af14a85d8baefe72a33977c1b3967aa3749fc8f /x11/mrxvt
parent20c4eaefa27f36b7f5010f8cd02a1b6db7d31744 (diff)
downloadports-b432e5aaad5c4a805d2446eb0698fd5c7ec468cb.tar.gz
ports-b432e5aaad5c4a805d2446eb0698fd5c7ec468cb.zip
Add patch-src-logging.c to fix the "can't parse pts/xx" error.
Bump PORTREVISION.
Notes
Notes: svn path=/head/; revision=247948
Diffstat (limited to 'x11/mrxvt')
-rw-r--r--x11/mrxvt/Makefile2
-rw-r--r--x11/mrxvt/files/patch-src-logging.c25
2 files changed, 26 insertions, 1 deletions
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 9ea0d407a3cd..271d48938842 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrxvt
PORTVERSION= 0.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11/mrxvt/files/patch-src-logging.c b/x11/mrxvt/files/patch-src-logging.c
new file mode 100644
index 000000000000..281cfc5f6478
--- /dev/null
+++ b/x11/mrxvt/files/patch-src-logging.c
@@ -0,0 +1,25 @@
+--- src/logging.c.orig 2010-01-15 17:27:05.000000000 +0100
++++ src/logging.c 2010-01-15 17:29:39.000000000 +0100
+@@ -114,14 +114,22 @@
+ if (!STRNCMP(pty, "/dev/", 5))
+ pty += 5; /* skip /dev/ prefix */
+
++#ifdef PTYS_ARE_OPENPTY
++ if (!STRNCMP(pty, "pts", 3) || !STRNCMP(pty, "tty", 3)) {
++#else
+ if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) {
++#endif
+ 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
++#ifdef PTYS_ARE_OPENPTY
++ else if (!STRNCMP(pty, "pts", 3) || !STRNCMP(pty, "tty", 3)) {
++#else
+ else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
++#endif
+ rxvt_print_error("can't parse tty name \"%s\"", pty);
+ return;
+ }