From 00c795fb595620ba5cbb3c5143ea79b57cb00542 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 27 Jun 2008 13:09:35 +0000
Subject: [PATCH] It looks like I pulled the diff against the non-clean source.

Approved by:	philip (mentor, implicit)
---
 x11/kdelibs3/files/patch-kdecore-kpty.cpp | 7 ++++---
 x11/kdelibs4/files/patch-kdecore-kpty.cpp | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/x11/kdelibs3/files/patch-kdecore-kpty.cpp b/x11/kdelibs3/files/patch-kdecore-kpty.cpp
index 1ac88614386d..ec773d0c07c1 100644
--- a/x11/kdelibs3/files/patch-kdecore-kpty.cpp
+++ b/x11/kdelibs3/files/patch-kdecore-kpty.cpp
@@ -1,12 +1,13 @@
 --- kdecore/kpty.cpp
 +++ kdecore/kpty.cpp
-@@ -127,9 +127,15 @@
+@@ -127,10 +127,15 @@
  #include <kdebug.h>
  #include <kstandarddirs.h>	// locate
  
 -// not defined on HP-UX for example
--#undef CTRL
--#define CTRL(x) ((x) & 037)
+-#ifndef CTRL
+-# define CTRL(x) ((x) & 037)
+-#endif
 +#ifndef CINTR
 +#define CINTR	0x03
 +#endif
diff --git a/x11/kdelibs4/files/patch-kdecore-kpty.cpp b/x11/kdelibs4/files/patch-kdecore-kpty.cpp
index 1ac88614386d..ec773d0c07c1 100644
--- a/x11/kdelibs4/files/patch-kdecore-kpty.cpp
+++ b/x11/kdelibs4/files/patch-kdecore-kpty.cpp
@@ -1,12 +1,13 @@
 --- kdecore/kpty.cpp
 +++ kdecore/kpty.cpp
-@@ -127,9 +127,15 @@
+@@ -127,10 +127,15 @@
  #include <kdebug.h>
  #include <kstandarddirs.h>	// locate
  
 -// not defined on HP-UX for example
--#undef CTRL
--#define CTRL(x) ((x) & 037)
+-#ifndef CTRL
+-# define CTRL(x) ((x) & 037)
+-#endif
 +#ifndef CINTR
 +#define CINTR	0x03
 +#endif