Bug#404111: xterm: FTBFS on GNU/kFreeBSD

2006-12-21 Thread Thomas Dickey
On Thu, Dec 21, 2006 at 09:50:16PM +0100, Petr Salinger wrote:
> Package: xterm
> Severity: important
> Version: 223-1
> Tags: patch
...
> the current version fails to build on GNU/kFreeBSD.
> 
> It needs small tweaks, see attached patch.
> 
> It would also be nice if you can ask upstream
> to include this changes.

thanks

-- 
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net


pgpEEpKA4TFlV.pgp
Description: PGP signature


Bug#404111: xterm: FTBFS on GNU/kFreeBSD

2006-12-21 Thread Petr Salinger

Package: xterm
Severity: important
Version: 223-1
Tags: patch


Hi,


the current version fails to build on GNU/kFreeBSD.

It needs small tweaks, see attached patch.

It would also be nice if you can ask upstream
to include this changes.

Thanks in advance

Petr

only in patch2:
unchanged:
--- xterm-223.orig/aclocal.m4
+++ xterm-223/aclocal.m4
@@ -2276,7 +2276,7 @@
 irix[[56]].*) #(vi
CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
;;
-linux*|gnu*) #(vi
+linux*|gnu*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
 mirbsd*) #(vi
only in patch2:
unchanged:
--- xterm-223.orig/configure
+++ xterm-223/configure
@@ -2827,7 +2827,7 @@
 irix[56].*) #(vi
CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
;;
-linux*|gnu*) #(vi
+linux*|gnu*|k*bsd*-gnu) #(vi
 
 echo "$as_me:2832: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
only in patch2:
unchanged:
--- xterm-223.orig/main.c
+++ xterm-223/main.c
@@ -3449,7 +3449,7 @@
/* make /dev/tty work */
ioctl(ttyfd, TCSETCTTY, 0);
 #endif
-#if defined(__GNU__) && defined(TIOCSCTTY)
+#if ((defined(__GLIBC__) && defined(__FreeBSD_kernel__)) || defined(__GNU__)) 
&& defined(TIOCSCTTY)
/* make /dev/tty work */
ioctl(ttyfd, TIOCSCTTY, 0);
 #endif