pkg/30256: x11/xterm build problem on DragonFly [patch]

[joerg%leaf.dragonflybsd.org@localhost]

>Number:         30256
>Category:       pkg
>Synopsis:       x11/xterm build problem on DragonFly [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue May 17 14:13:00 +0000 2005
>Originator:     Jörg Sonnenberger
>Release:        pkgsrc-HEAD [DragonFly 1.3]
>Organization:
>Environment:
DragonFly britannica.bec.de 1.3.1-DEVELOPMENT DragonFly 1.3.1-DEVELOPMENT #15: 
Tue May 17 13:31:47 2005     
joerg%britannica.bec.de@localhost:/home/joerg/wd/DragonFly/world/src/sys/compile/TURTLE
  i386

>Description:
x11/xterm fails to compile with system GCC 3.4.3, patch fixes that.
>How-To-Repeat:
build on dragonfly with system GCC 3.4.3
>Fix:
Index: x11/xterm/distinfo
===================================================================
RCS file: /home/joerg/wd/repository/netbsd/pkgsrc/x11/xterm/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- x11/xterm/distinfo  23 Feb 2005 17:36:25 -0000      1.13
+++ x11/xterm/distinfo  14 May 2005 12:04:12 -0000
@@ -3,3 +3,5 @@
 SHA1 (xterm-200.tgz) = e30103d92a269c3dd25a2ebbbfb2c6d395ab84ce
 RMD160 (xterm-200.tgz) = 1645ed28912f8e9d36b5ca7416ab7d9cb899e6aa
 Size (xterm-200.tgz) = 697480 bytes
+SHA1 (patch-aa) = a20e878d2a472f02cf8d5f4eecf0d6d6424ae79f
+SHA1 (patch-ab) = d36b3ec681b32762513bfa19286b3c2d76dd1b13
Index: x11/xterm/patches/patch-aa
===================================================================
RCS file: x11/xterm/patches/patch-aa
diff -N x11/xterm/patches/patch-aa
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/xterm/patches/patch-aa  1 May 2005 10:23:35 -0000
@@ -0,0 +1,11 @@
+--- ../xterm-194.orig/ptyx.h   2004-07-28 02:53:26.000000000 +0200
++++ ptyx.h     2004-08-10 12:59:41.000000000 +0200
+@@ -200,7 +200,7 @@
+ #ifdef __hpux
+ #define       PTYCHAR2        "fedcba9876543210"
+ #else /* !__hpux */
+-#ifdef __FreeBSD__
++#if defined(__DragonFly__) || defined(__FreeBSD__)
+ #define       PTYCHAR2        "0123456789abcdefghijklmnopqrstuv"
+ #else /* !__FreeBSD__ */
+ #define       PTYCHAR2        "0123456789abcdef"
Index: x11/xterm/patches/patch-ab
===================================================================
RCS file: x11/xterm/patches/patch-ab
diff -N x11/xterm/patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/xterm/patches/patch-ab  10 Apr 2005 13:13:51 -0000
@@ -0,0 +1,11 @@
+--- xterm_io.h.orig    2005-04-10 17:12:48.000000000 +0200
++++ xterm_io.h 2005-04-10 17:12:22.000000000 +0200
+@@ -58,7 +58,7 @@
+ #define USE_SYSV_TERMIO
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || 
defined(__INTERIX) || defined(__APPLE__)
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || 
defined(__OpenBSD__) || defined(__INTERIX) || defined(__APPLE__)
+ #ifndef USE_POSIX_TERMIOS
+ #define USE_POSIX_TERMIOS
+ #endif