aboutsummaryrefslogtreecommitdiff
path: root/x11/rxvt
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2009-03-23 21:08:37 +0000
committerEd Schouten <ed@FreeBSD.org>2009-03-23 21:08:37 +0000
commit810dc2911d13d80cf3eb549e9bc41cfda987ce4c (patch)
tree7a6938850398aca7b146fcaf81ac2e309991aba5 /x11/rxvt
parenta41ca978440f9379b3f3b7be383b9d4fb31eeb2d (diff)
downloadports-810dc2911d13d80cf3eb549e9bc41cfda987ce4c.tar.gz
ports-810dc2911d13d80cf3eb549e9bc41cfda987ce4c.zip
Notes
Diffstat (limited to 'x11/rxvt')
-rw-r--r--x11/rxvt/Makefile3
-rw-r--r--x11/rxvt/files/patch-ad16
-rw-r--r--x11/rxvt/files/patch-grkelot.c26
-rw-r--r--x11/rxvt/files/patch-logging.c12
4 files changed, 49 insertions, 8 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 3534807058ad..44c52d1aad50 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -95,6 +95,9 @@ CONFIGURE_ARGS+= --enable-xim
CONFIGURE_ARGS+= --enable-xterm-scroll
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|getpt()|posix_openpt(0)|' ${WRKSRC}/configure
+
post-install:
@${CHMOD} 4711 ${PREFIX}/bin/rxvt
diff --git a/x11/rxvt/files/patch-ad b/x11/rxvt/files/patch-ad
index eb7db3a2dc0b..fa962bd1fd41 100644
--- a/x11/rxvt/files/patch-ad
+++ b/x11/rxvt/files/patch-ad
@@ -1,14 +1,14 @@
--- src/command.c.orig Thu Nov 1 22:18:35 2001
+++ src/command.c Mon Oct 10 00:29:07 2005
-@@ -322,7 +322,7 @@
- ttydev = tty_name;
+@@ -254,7 +254,7 @@
+ extern char *ptsname();
- # define PTYCHAR1 "pqrstuvwxyz"
--# define PTYCHAR2 "0123456789abcdef"
-+# define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv"
- for (c1 = PTYCHAR1; *c1; c1++) {
- ptydev[len] = ttydev[len] = *c1;
- for (c2 = PTYCHAR2; *c2; c2++) {
+ # ifdef PTYS_ARE_GETPT
+- if ((fd = getpt()) >= 0) {
++ if ((fd = posix_openpt(O_RDWR)) >= 0) {
+ # else
+ if ((fd = open("/dev/ptmx", O_RDWR)) >= 0) {
+ # endif
@@ -519,6 +519,9 @@
# ifdef VEOL2
FOO(VEOL2, "VEOL2");
diff --git a/x11/rxvt/files/patch-grkelot.c b/x11/rxvt/files/patch-grkelot.c
new file mode 100644
index 000000000000..c5824b44e0a1
--- /dev/null
+++ b/x11/rxvt/files/patch-grkelot.c
@@ -0,0 +1,26 @@
+--- src/grkelot.c
++++ src/grkelot.c
+@@ -80,10 +80,6 @@
+ #define MAX_SWITCHER 2U /* per state */
+ #define MAX_VAL 256 /* for temp allocation */
+
+-typedef unsigned char u_char;
+-typedef unsigned int u_int;
+-typedef unsigned long u_long;
+-
+ typedef struct s_xlat {
+ u_int first, last;
+ u_int *pval; /* array of translated values */
+@@ -158,9 +154,9 @@
+
+ #define NUM_XLAT_TYPES (sizeof(xlat_type) / sizeof(xlat_type[0]))
+
+-static void kstate_add_xlat(char *str);
+-static void kstate_add_switcher(char *str);
+-static void kstate_set_life(char *str);
++void kstate_add_xlat(char *str);
++void kstate_add_switcher(char *str);
++void kstate_set_life(char *str);
+
+ /* --- Functions ------------- */
+ /* INTPROTO */
diff --git a/x11/rxvt/files/patch-logging.c b/x11/rxvt/files/patch-logging.c
new file mode 100644
index 000000000000..63bc9440d194
--- /dev/null
+++ b/x11/rxvt/files/patch-logging.c
@@ -0,0 +1,12 @@
+--- src/logging.c
++++ src/logging.c
+@@ -131,6 +131,9 @@
+ STRNCPY(ut_id, (pty + 3), sizeof(ut_id));
+ else
+ #ifndef USE_SYSV_UTMP
++ if (!strncmp(pty, "pts/", 4))
++ STRNCPY(ut_id, (pty + 4), sizeof(ut_id));
++ else
+ {
+ print_error("can't parse tty name \"%s\"", pty);
+ ut_id[0] = '\0'; /* entry not made */