Fixed compilation problem. Thanks to Bernhard Schmidt <bs@netsrc.de> and Olivier Galibert <galibert@pobox.com>; bug #62632.

4 files changed, 76 insertions, 11 deletions

diff --git a/x11-terms/kterm/ChangeLog b/x11-terms/kterm/ChangeLog
index 22f02a66ae73..0eb38d5be1d6 100644
--- a/x11-terms/kterm/ChangeLog
+++ b/x11-terms/kterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/kterm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.14 2004/10/14 10:08:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.15 2004/10/23 07:58:00 usata Exp $
+
+  23 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> kterm-6.2.0-r3.ebuild:
+  Fixed compilation problem. Thanks to Bernhard Schmidt <bs@netsrc.de> and
+  Olivier Galibert <galibert@pobox.com>; bug #62632.
 
   14 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> kterm-6.2.0-r2.ebuild,
   kterm-6.2.0-r3.ebuild:
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index 99e135a05533..364d62a06770 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5a4448ae35d3029d5fe26a4e9103e639 ChangeLog 2057
-MD5 b4ff557017ea62e193c58704d2cb75fe kterm-6.2.0-r2.ebuild 1629
+MD5 4d7b101ea5e224b2a9901cdc2b444ef1 ChangeLog 2258
+MD5 ebc3032cec848cde9c374b31aa1f7aa3 kterm-6.2.0-r3.ebuild 1698
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 475848cbd321dd481bfc82cabaea12bf kterm-6.2.0-r3.ebuild 1659
-MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r2 200
+MD5 b4ff557017ea62e193c58704d2cb75fe kterm-6.2.0-r2.ebuild 1629
+MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r3 200
 MD5 60f864908bc68079f6edb20c923f280f files/kterm-6.2.0-gentoo.patch 1519
+MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r2 200
 MD5 2456d786b69d21ffb9ac133e8de1718b files/kterm-6.2.0-Xaw3d.patch 937
 MD5 3ba95cde993d406153d9466a73203c4f files/kterm-ad-gentoo.diff 737
-MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r3 200
+MD5 1726f252d396e02078426f66314df803 files/kterm-6.2.0-openpty.patch 1734
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (Darwin)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBblAMVWNWqTUmv+0RAp3cAKC1QBJKvUUvyzrkdEofilAcQwSaVACgibkB
-KLg9Vkhntyqa/UQq94xewBw=
-=bheh
+iD8DBQFBeg2iVWNWqTUmv+0RAp0lAJ4sfCJ1LbzWgLWNc94TkPOuJkhWrACfZcEb
+3/XXWH89zh+/BTk5gyoZ3po=
+=OOA1
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch b/x11-terms/kterm/files/kterm-6.2.0-openpty.patch
new file mode 100644
index 000000000000..ee8bc1814ae0
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-6.2.0-openpty.patch
@@ -0,0 +1,59 @@
+diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile
+--- kterm-orig/Imakefile	2004-10-12 01:23:25.000000000 +0200
++++ kterm-6.2.0/Imakefile	2004-10-12 01:37:59.100764752 +0200
+@@ -23,6 +23,11 @@
+     PUCCPTYDDEF = -DPUCC_PTYD		/* does not need to be setuid */
+          PTYLIB = -lpucc
+ #endif
++#ifdef LinuxArchitecture
++         PTYLIB = -lutil
++#undef InstallXtermSetUID
++#define InstallXtermSetUID 0
++#endif
+ 
+  OSMAJORVERSION = OSMajorVersion
+  OSMINORVERSION = OSMinorVersion
+diff -ru kterm-orig/button.c kterm-6.2.0/button.c
+--- kterm-orig/button.c	1996-07-02 07:01:46.000000000 +0200
++++ kterm-6.2.0/button.c	2004-10-12 01:29:59.420687208 +0200
+@@ -41,8 +41,6 @@
+ #include "error.h"
+ #include "menu.h"
+ 
+-extern char *malloc();
+-
+ extern void DoSecureKeyboard();
+ 
+ #define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0))
+diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c
+--- kterm-orig/charproc.c	2004-10-12 01:23:25.000000000 +0200
++++ kterm-6.2.0/charproc.c	2004-10-12 01:30:29.640093160 +0200
+@@ -102,8 +102,6 @@
+ extern XtAppContext app_con;
+ extern Widget toplevel;
+ extern void exit();
+-extern char *malloc();
+-extern char *realloc();
+ extern fd_set Select_mask;
+ extern fd_set X_mask;
+ extern fd_set pty_mask;
+diff -ru kterm-orig/main.c kterm-6.2.0/main.c
+--- kterm-orig/main.c	2004-10-12 01:23:25.000000000 +0200
++++ kterm-6.2.0/main.c	2004-10-12 01:32:56.697737000 +0200
+@@ -143,6 +143,7 @@
+ #define HAS_UTMP_UT_HOST
+ #define LASTLOG
+ #define WTMP
++#include <pty.h>
+ #endif
+ 
+ #include <sys/ioctl.h>
+@@ -1871,7 +1872,7 @@
+ get_pty (pty)
+     int *pty;
+ {
+-#ifdef __osf__
++#if defined(__osf__) || defined(linux)
+     int tty;
+     return (openpty(pty, &tty, ttydev, NULL, NULL));
+ #endif
diff --git a/x11-terms/kterm/kterm-6.2.0-r3.ebuild b/x11-terms/kterm/kterm-6.2.0-r3.ebuild
index 142aed502c22..68324ab7aabe 100644
--- a/x11-terms/kterm/kterm-6.2.0-r3.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r3.ebuild,v 1.2 2004/10/14 10:08:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r3.ebuild,v 1.3 2004/10/23 07:58:00 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -26,6 +26,7 @@ src_unpack(){
 	cd ${S}
 	epatch ${WORKDIR}/${P}-wpi.patch		# wallpaper patch
 	epatch ${WORKDIR}/${P}.ext02.patch		# JIS 0213 support
+	epatch ${FILESDIR}/${P}-openpty.patch
 	epatch ${FILESDIR}/${P}-gentoo.patch
 	epatch ${FILESDIR}/${PN}-ad-gentoo.diff