diff options
Diffstat (limited to 'sysutils/screen')
-rw-r--r-- | sysutils/screen/files/patch-ad | 42 | ||||
-rw-r--r-- | sysutils/screen/files/patch-os.h | 14 | ||||
-rw-r--r-- | sysutils/screen/files/patch-process.c | 11 | ||||
-rw-r--r-- | sysutils/screen/files/patch-screen.c | 11 | ||||
-rw-r--r-- | sysutils/screen/files/patch-tty.sh | 25 | ||||
-rw-r--r-- | sysutils/screen/files/patch-utmp.c | 42 |
6 files changed, 123 insertions, 22 deletions
diff --git a/sysutils/screen/files/patch-ad b/sysutils/screen/files/patch-ad index c728253fd1aa..524a04209f12 100644 --- a/sysutils/screen/files/patch-ad +++ b/sysutils/screen/files/patch-ad @@ -1,5 +1,5 @@ ---- configure.orig Fri Dec 5 15:46:53 2003 -+++ configure Sat Mar 4 10:18:24 2006 +--- configure.orig 2003-12-05 05:46:53.000000000 -0800 ++++ configure 2010-01-26 22:18:47.000000000 -0800 @@ -4746,48 +4746,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 @@ -68,7 +68,16 @@ } _ACEOF rm -f conftest$ac_exeext -@@ -5314,18 +5271,15 @@ +@@ -5011,7 +4968,7 @@ + { echo "$as_me:$LINENO: checking for SVR4 ptys..." >&5 + echo "$as_me: checking for SVR4 ptys..." >&6;} + sysvr4ptys= +-if test -c /dev/ptmx ; then ++if test -c /nonexistent ; then + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -5314,19 +5271,16 @@ fi rm -f conftest* @@ -86,8 +95,31 @@ -#define PTYRANGE1 "$p1" +#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" _ACEOF -- --fi +-fi +- # Check whether --with-pty-mode or --without-pty-mode was given. + if test "${with_pty_mode+set}" = set; then +@@ -5581,6 +5535,10 @@ + #ifdef __hpux + #define pututline _pututline + #endif ++#ifdef __FreeBSD_cc_version ++#define pututline pututxline ++#define getutent getutxent ++#endif + + int + main () +@@ -5633,6 +5591,10 @@ + #ifdef __hpux + #define pututline _pututline + #endif ++#ifdef __FreeBSD_cc_version ++#define pututline pututxline ++#define getutent getutxent ++#endif + + int + main () diff --git a/sysutils/screen/files/patch-os.h b/sysutils/screen/files/patch-os.h index 9103b278fa7d..8e047de01269 100644 --- a/sysutils/screen/files/patch-os.h +++ b/sysutils/screen/files/patch-os.h @@ -1,5 +1,5 @@ ---- os.h.orig Tue Jan 8 07:42:33 2002 -+++ os.h Tue Sep 9 17:39:58 2003 +--- os.h.orig 2002-01-08 07:42:33.000000000 -0800 ++++ os.h 2010-01-26 21:20:44.000000000 -0800 @@ -161,7 +161,7 @@ # define setregid(rgid, egid) setresgid(rgid, egid, -1) #endif @@ -9,3 +9,13 @@ # define USE_SETEUID #endif +@@ -262,7 +262,9 @@ + #if defined(UTMPOK) || defined(BUGGYGETLOGIN) + # if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) + # include <utmpx.h> ++#ifndef __FreeBSD_version + # define UTMPFILE UTMPX_FILE ++#endif + # define utmp utmpx + # define getutent getutxent + # define getutid getutxid diff --git a/sysutils/screen/files/patch-process.c b/sysutils/screen/files/patch-process.c new file mode 100644 index 000000000000..54d92dc90bb4 --- /dev/null +++ b/sysutils/screen/files/patch-process.c @@ -0,0 +1,11 @@ +--- process.c.orig 2003-09-18 05:53:54.000000000 -0700 ++++ process.c 2010-01-26 21:27:17.000000000 -0800 +@@ -37,7 +37,7 @@ + #include "config.h" + + /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */ +-#ifdef SVR4 ++#if defined(SVR4) && !defined(__FreeBSD_cc_version) + # include <sys/stropts.h> + #endif + diff --git a/sysutils/screen/files/patch-screen.c b/sysutils/screen/files/patch-screen.c new file mode 100644 index 000000000000..77a87424f31a --- /dev/null +++ b/sysutils/screen/files/patch-screen.c @@ -0,0 +1,11 @@ +--- screen.c.orig 2003-09-08 07:26:41.000000000 -0700 ++++ screen.c 2010-01-26 15:51:49.000000000 -0800 +@@ -50,7 +50,7 @@ + + #include "config.h" + +-#ifdef SVR4 ++#if defined(SVR4) && !defined(__FreeBSD_cc_version) + # include <sys/stropts.h> + #endif + diff --git a/sysutils/screen/files/patch-tty.sh b/sysutils/screen/files/patch-tty.sh index 766a75c87ca3..54da31b05d9c 100644 --- a/sysutils/screen/files/patch-tty.sh +++ b/sysutils/screen/files/patch-tty.sh @@ -1,14 +1,15 @@ -From 01fbf99748f536519605087d5937761790fc6ded Mon Sep 17 00:00:00 2001 -From: Micah Cowan <micah@cowan.name> -Date: Thu, 07 Aug 2008 08:27:12 +0000 -Subject: Set termios' VERASE to DEL, for vte's autodetect feature. - ---- -diff --git a/src/tty.sh b/src/tty.sh -index b16ff03..374bb97 100644 ---- tty.sh -+++ tty.sh -@@ -562,7 +562,9 @@ XIF{VDISCARD} np->tio.c_cc[VDISCARD] = VDISABLE; +--- tty.sh.orig 2003-09-08 07:24:25.000000000 -0700 ++++ tty.sh 2010-01-26 15:56:56.000000000 -0800 +@@ -76,7 +76,7 @@ + #endif + + #include "config.h" +-#ifdef SVR4 ++#if defined(SVR4) && !defined(__FreeBSD_cc_version) + #include <sys/stropts.h> /* for I_POP */ + #endif + +@@ -562,7 +562,9 @@ XIF{VLNEXT} np->tio.c_cc[VLNEXT] = VDISABLE; XIF{VSTATUS} np->tio.c_cc[VSTATUS] = VDISABLE; XIF{VSUSP} np->tio.c_cc[VSUSP] = VDISABLE; @@ -19,5 +20,3 @@ index b16ff03..374bb97 100644 XIF{VKILL} np->tio.c_cc[VKILL] = VDISABLE; # ifdef HPUX_LTCHARS_HACK np->m_ltchars.t_suspc = VDISABLE; --- -cgit v0.8.2 diff --git a/sysutils/screen/files/patch-utmp.c b/sysutils/screen/files/patch-utmp.c index 9bbb95fe3d48..bbd7d9d3afe4 100644 --- a/sysutils/screen/files/patch-utmp.c +++ b/sysutils/screen/files/patch-utmp.c @@ -1,5 +1,5 @@ --- utmp.c.orig 2003-09-08 07:27:17.000000000 -0700 -+++ utmp.c 2009-12-21 15:10:06.000000000 -0800 ++++ utmp.c 2010-01-26 22:27:46.000000000 -0800 @@ -21,6 +21,9 @@ **************************************************************** */ @@ -24,7 +24,37 @@ -@@ -726,9 +734,12 @@ +@@ -590,9 +598,11 @@ + { + u->ut_type = DEAD_PROCESS; + #if !defined(linux) || defined(EMPTY) ++#ifndef __FreeBSD__ + u->ut_exit.e_termination = 0; + u->ut_exit.e_exit = 0; + #endif ++#endif + #if !defined(sun) || !defined(SVR4) + u->ut_user[0] = 0; /* for Digital UNIX, kilbi@rad.rwth-aachen.de */ + #endif +@@ -618,7 +628,9 @@ + #endif /* sgi */ + strncpy(u->ut_line, line, sizeof(u->ut_line)); + u->ut_pid = pid; ++#ifndef __FreeBSD__ + (void)time((time_t *)&u->ut_time); ++#endif + } + + static slot_t +@@ -630,6 +642,7 @@ + + + #else /* GETUTENT */ ++#if defined(__FreeBSD_version) && __FreeBSD_version < 900008 + + /********************************************************************* + * +@@ -726,9 +739,12 @@ char *line, *user; int pid; { @@ -38,3 +68,11 @@ } static slot_t +@@ -759,6 +775,7 @@ + return slot; + } + ++#endif /* __FreeBSD_version */ + #endif /* GETUTENT */ + + |