aboutsummaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2010-01-29 05:23:15 +0000
committerCy Schubert <cy@FreeBSD.org>2010-01-29 05:23:15 +0000
commit000510c21178e06e7aaf9109734c48cb898e60b8 (patch)
treed8070d0416e8f58c6fff90470b5f65bd4815753f /comms
parent3efe84fba63bb6480ec52c1370d1c892147203c8 (diff)
downloadports-000510c21178e06e7aaf9109734c48cb898e60b8.tar.gz
ports-000510c21178e06e7aaf9109734c48cb898e60b8.zip
Notes
Diffstat (limited to 'comms')
-rw-r--r--comms/conserver/files/patch-etc-autologin-autologin.c8
-rw-r--r--comms/conserver/files/patch-etc-autologin-machine.h20
2 files changed, 14 insertions, 14 deletions
diff --git a/comms/conserver/files/patch-etc-autologin-autologin.c b/comms/conserver/files/patch-etc-autologin-autologin.c
index ed99ad30f148..e5109dcbcab8 100644
--- a/comms/conserver/files/patch-etc-autologin-autologin.c
+++ b/comms/conserver/files/patch-etc-autologin-autologin.c
@@ -1,5 +1,5 @@
--- etc/autologin/autologin.c.orig 2000-08-02 11:39:42.000000000 -0700
-+++ etc/autologin/autologin.c 2010-01-27 21:58:21.000000000 -0800
++++ etc/autologin/autologin.c 2010-01-28 21:04:23.000000000 -0800
@@ -23,7 +23,15 @@
#include <pwd.h>
#include <grp.h>
@@ -33,7 +33,7 @@
/* NOTREACHED */
}
#endif
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
++#ifdef __FreeBSD_version
+ /* XXX: FreeBSD does not support IUCLC, translate uppercase characters
+ to lowercase */
+ n_tio.c_iflag &= ~(IGNCR);
@@ -41,7 +41,7 @@
n_tio.c_iflag &= ~(IGNCR|IUCLC);
+#endif
n_tio.c_iflag |= ICRNL|IXON|IXANY;
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
++#ifdef __FreeBSD_version
+ /*
+ XXX: FreeBSD does not support OLCUC, translater lowercase
+ to uppercase
@@ -56,7 +56,7 @@
n_tio.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY);
+#endif
n_tio.c_oflag |= OPOST|ONLCR|TAB3;
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
++#ifdef __FreeBSD_version
+ /* XXX: FreeBSD does not support XCASE, with icanon, escape with '\'
+ for uppercase characters */
+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
diff --git a/comms/conserver/files/patch-etc-autologin-machine.h b/comms/conserver/files/patch-etc-autologin-machine.h
index 49af900a4e69..96e622d1cded 100644
--- a/comms/conserver/files/patch-etc-autologin-machine.h
+++ b/comms/conserver/files/patch-etc-autologin-machine.h
@@ -1,5 +1,5 @@
--- etc/autologin/machine.h.orig 2000-08-02 11:39:42.000000000 -0700
-+++ etc/autologin/machine.h 2010-01-27 20:58:40.000000000 -0800
++++ etc/autologin/machine.h 2010-01-28 21:01:18.000000000 -0800
@@ -1,7 +1,6 @@
/* $Id: machine.h,v 2.8 1997/11/10 17:10:34 ksb Exp $
* leverage in liew of L7
@@ -18,7 +18,7 @@
#if !defined(USE_UTENT)
-#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX))
-+#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX))||defined(__FreeBSD_version) && __FreeBSD_version > 900007
++#define USE_UTENT (defined(SUN5)||defined(EPIX)||defined(PARAGON)||defined(IBMR2)||defined(HPUX9)||defined(HPUX10)||defined(LINUX)||(defined(__FreeBSD_version) && (__FreeBSD_version > 900007)))
#endif
#if !defined(NEED_PUTENV)
@@ -27,7 +27,7 @@
#endif
#if !defined(USE_TERMIOS)
-#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX))
-+#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX))||(defined(__FreeBSD_version) && __FreeBSD_version > 900007)
++#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(LINUX)||(defined(__FreeBSD_version) && ((__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007)))
#endif
#if !defined(USE_TCBREAK)
#define USE_TCBREAK (defined(SUN4)||defined(PTX))
@@ -36,7 +36,7 @@
#if !defined(USE_TC)
-#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON))
-+#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON)||(defined(__FreeBSD_version) && __FreeBSD_version > 900007))
++#define USE_TC (defined(EPIX)||defined(IBMR2)||defined(V386)||defined(S81)||defined(PARAGON)||(defined(__FreeBSD_version) && (__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007))
#endif
#if !defined(HAVE_GETUSERATTR)
@@ -45,29 +45,29 @@
#if !defined(USE_IOCTL)
-#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||defined(FREEBSD))
-+#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||(defined(FREEBSD)&&(defined(__FreeBSD_version) && __FreeBSD_version < 900008)))
++#define USE_IOCTL (defined(V386)||defined(S81)||defined(NETBSD)||(defined(FREEBSD)&&(defined(__FreeBSD_version) && (__FreeBSD_version < 800044 || (__FreeBSD_version >= 900000 &&__FreeBSD_version < 900008)))))
#endif
-@@ -127,8 +126,12 @@
+@@ -127,8 +126,11 @@
#if FREEBSD
#include <sys/uio.h>
#include <sys/proc.h>
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
++#if defined(__FreeBSD_version) && ((__FreeBSD_version >= 800044 && __FreeBSD_version < 900000) || __FreeBSD_version > 900007)
+#include <termios.h>
+#else
#include <sys/ioctl_compat.h>
- #define setsid() getpid()
+-#define setsid() getpid()
+#endif
#else
#endif /* NETBSD */
-@@ -148,7 +151,7 @@
+@@ -148,7 +150,7 @@
#if HPUX
#define HAVE_GETSID (defined(HPUX10)||defined(LINUX))
#else
-#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX
-+#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX || defined(__FreeBSD_version) && __FreeBSD_version > 900007
++#if PARAGON || SUNOS || SUN4 || SUN5 || NETBSD || S81 || V386 || IBMR2 || EPIX || FREEBSD
#define HAVE_GETSID 1
#else
#define HAVE_GETSID 0