summaryrefslogtreecommitdiff
path: root/editors/emacs22/patches/patch-xx
blob: fc94cc3486772a906cd49be82e997d9536e5cbac (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
$NetBSD: patch-xx,v 1.2 2012/12/27 17:48:29 ryoon Exp $

Following breaks gtk option as prefers /usr/X11R6 libs to those in /usr/pkg,
and is not needed as these get set in enough other places - at least for
pkgsrc.

* make NetBSD use openpty(), like on emacs24

--- src/s/netbsd.h.orig	2008-01-08 04:10:59.000000000 +0000
+++ src/s/netbsd.h
@@ -52,8 +52,7 @@ Boston, MA 02110-1301, USA.  */
 #define NO_TERMIO
 
 #define LIBS_DEBUG
-/* -lutil is not needed for NetBSD >0.9.  */
-/* #define LIBS_SYSTEM -lutil */
+#define LIBS_SYSTEM -lutil
 #define LIBS_TERMCAP -ltermcap
 
 #define NEED_ERRNO
@@ -102,12 +101,6 @@ Boston, MA 02110-1301, USA.  */
 #define AMPERSAND_FULL_NAME
 
 #ifdef __ELF__
-/* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-   says where to find X windows at run time.  We convert it to a -rpath option
-   which is what OSF1 uses.  */
-#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib
-
 /* The following is needed to make `configure' find Xpm, Xaw3d and
    image include and library files if using /usr/bin/gcc.  That
    compiler seems to be modified to not find headers in
@@ -164,5 +157,22 @@ Boston, MA 02110-1301, USA.  */
 
 #define POSIX_SIGNALS	1
 
+#define HAVE_PTYS
+#define PTY_ITERATION           for (i = 0; i < 1; i++) /* ick */
+#define PTY_NAME_SPRINTF        /* none */
+#define PTY_TTY_NAME_SPRINTF    /* none */
+#define PTY_OPEN                                        \
+  do                                                    \
+    {                                                   \
+      int dummy;                                        \
+      SIGMASKTYPE mask;                                 \
+      mask = sigblock (sigmask (SIGCHLD));              \
+      if (-1 == openpty (&fd, &dummy, pty_name, 0, 0))  \
+        fd = -1;                                        \
+      sigsetmask (mask);                                \
+      emacs_close (dummy);                              \
+    }                                                   \
+  while (0)
+
 /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
    (do not change this comment) */