[71926] trunk/dports/x11/xterm

[jeremyhu at macports.org]

Revision: 71926
          http://trac.macports.org/changeset/71926
Author:   jeremyhu at macports.org
Date:     2010-09-27 10:01:59 -0700 (Mon, 27 Sep 2010)
Log Message:
-----------
xterm: Buildfix for new libX11 and pull in some patches from Apple

Modified Paths:
--------------
    trunk/dports/x11/xterm/Portfile

Added Paths:
-----------
    trunk/dports/x11/xterm/files/
    trunk/dports/x11/xterm/files/PR-7191532.patch
    trunk/dports/x11/xterm/files/xterm-nohide-pointer.patch
    trunk/dports/x11/xterm/files/xutf8.patch

Modified: trunk/dports/x11/xterm/Portfile
===================================================================
--- trunk/dports/x11/xterm/Portfile	2010-09-27 15:46:32 UTC (rev 71925)
+++ trunk/dports/x11/xterm/Portfile	2010-09-27 17:01:59 UTC (rev 71926)
@@ -4,6 +4,7 @@
 
 name                xterm
 version             262
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu openmaintainer
@@ -32,6 +33,10 @@
 	port:xorg-libXaw \
 	port:Xft2
 
+patchfiles PR-7191532.patch  xterm-nohide-pointer.patch  xutf8.patch
+
+patch.pre_args -p1
+
 configure.args      --mandir=${prefix}/share/man --enable-luit \
                     --enable-logging --enable-wide-chars \
                     --enable-256-color --enable-load-vt-fonts \

Added: trunk/dports/x11/xterm/files/PR-7191532.patch
===================================================================
--- trunk/dports/x11/xterm/files/PR-7191532.patch	                        (rev 0)
+++ trunk/dports/x11/xterm/files/PR-7191532.patch	2010-09-27 17:01:59 UTC (rev 71926)
@@ -0,0 +1,12 @@
+diff -Naurp xterm-248.orig/main.h xterm-248/main.h
+--- xterm-248.orig/main.h	2009-03-28 10:39:51.000000000 -0700
++++ xterm-248/main.h	2009-09-16 14:40:45.000000000 -0700
+@@ -138,7 +138,7 @@
+ #endif
+ 
+ #ifndef DEF_PTY_STTY_SIZE
+-#if defined(linux) || defined(__APPLE__)
++#if defined(linux)
+ #define DEF_PTY_STTY_SIZE	False
+ #else
+ #define DEF_PTY_STTY_SIZE	True

Added: trunk/dports/x11/xterm/files/xterm-nohide-pointer.patch
===================================================================
--- trunk/dports/x11/xterm/files/xterm-nohide-pointer.patch	                        (rev 0)
+++ trunk/dports/x11/xterm/files/xterm-nohide-pointer.patch	2010-09-27 17:01:59 UTC (rev 71926)
@@ -0,0 +1,12 @@
+diff -Naurp xterm-235.orig/input.c xterm-235/input.c
+--- xterm-235.orig/input.c	2008-04-21 17:21:32.000000000 -0700
++++ xterm-235/input.c	2008-04-21 17:23:10.000000000 -0700
+@@ -1342,7 +1342,7 @@ Input(XtermWidget xw,
+     if (key && !TEK4014_ACTIVE(xw))
+ 	AdjustAfterInput(xw);
+ 
+-    xtermShowPointer(xw, False);
++//    xtermShowPointer(xw, False);
+     return;
+ }
+ 

Added: trunk/dports/x11/xterm/files/xutf8.patch
===================================================================
--- trunk/dports/x11/xterm/files/xutf8.patch	                        (rev 0)
+++ trunk/dports/x11/xterm/files/xutf8.patch	2010-09-27 17:01:59 UTC (rev 71926)
@@ -0,0 +1,14 @@
+diff -Naurp xterm-261.orig/xutf8.h xterm-261/xutf8.h
+--- xterm-261.orig/xutf8.h	2001-06-18 12:09:28.000000000 -0700
++++ xterm-261/xutf8.h	2010-09-27 09:46:58.000000000 -0700
+@@ -21,9 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
+ THE SOFTWARE.
+ */
+ 
+-#ifndef _XLIB_H_
+-#error Please include <X11/Xlib.h> before "xutf8.h"
+-#endif
++#include <X11/Xlib.h>
+ 
+ #ifndef X_HAVE_UTF8_STRING
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100927/906f05b8/attachment.html>