Use openpty() from libutil on *BSD (patch from Peter Bex).

Declare proper POSIX version for fcntl.h *at functions.

6 files changed, 70 insertions, 7 deletions

diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index d26e7a04f1b..b5e13de3452 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 23:01:26 adam Exp $
+# $NetBSD: Makefile,v 1.10 2012/11/26 16:56:15 martin Exp $
 
-PKGREVISION=	3
+PKGREVISION=	4
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo
index d58e986aded..bb90d575123 100644
--- a/editors/emacs24/distinfo
+++ b/editors/emacs24/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.6 2012/10/03 21:32:42 marino Exp $
+$NetBSD: distinfo,v 1.7 2012/11/26 16:56:15 martin Exp $
 
 SHA1 (emacs-24.2.tar.gz) = 5fc4fe7797f821f2021ac415a81f5f190c52c0b2
 RMD160 (emacs-24.2.tar.gz) = 26f6c2b671ed7f160875d62e47c89afec085110f
 Size (emacs-24.2.tar.gz) = 51471017 bytes
-SHA1 (patch-aa) = e8e2e174a87c6d052af3fde2907f29f76d3554bd
-SHA1 (patch-ab) = ca3fb1ee6652f6a33758bc07cf93a7eeff2afcd2
+SHA1 (patch-aa) = ea9f7acf0142c7ae169da9674fa16e6492b30479
+SHA1 (patch-ab) = 8687278fcc8f8ae072c72681ae05ce1f12481cba
 SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac
 SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313
+SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29
+SHA1 (patch-src-s-bsd--common.h) = bea4405e7cbe0a71b41f8ea52030eeb629d95a40
diff --git a/editors/emacs24/patches/patch-aa b/editors/emacs24/patches/patch-aa
index 42b3dafbd51..c3fd99bf4b8 100644
--- a/editors/emacs24/patches/patch-aa
+++ b/editors/emacs24/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2012/10/03 21:32:42 marino Exp $
+$NetBSD: patch-aa,v 1.4 2012/11/26 16:56:16 martin Exp $
 
 Add DragonFly
 
@@ -19,6 +19,15 @@ Add DragonFly
  
    ## OpenBSD ports
    *-*-openbsd* )
+@@ -955,7 +955,7 @@
+   ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
+   aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
+ 
+-  freebsd) LIBS_SYSTEM="-lutil" ;;
++  freebsd|netbsd|openbsd) LIBS_SYSTEM="-lutil" ;;
+ 
+   hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
+ 
 @@ -999,6 +1007,11 @@ case $opsys in
      LIB_MATH=
      START_FILES='pre-crt0.o'
diff --git a/editors/emacs24/patches/patch-ab b/editors/emacs24/patches/patch-ab
index f918185a5f5..990fb7db2b6 100644
--- a/editors/emacs24/patches/patch-ab
+++ b/editors/emacs24/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2012/10/03 21:32:42 marino Exp $
+$NetBSD: patch-ab,v 1.4 2012/11/26 16:56:16 martin Exp $
 
 Add DragonFly
 
@@ -20,6 +20,15 @@ Add DragonFly
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
+@@ -7854,7 +7854,7 @@
+   ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
+   aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
+ 
+-  freebsd) LIBS_SYSTEM="-lutil" ;;
++  freebsd|netbsd|openbsd) LIBS_SYSTEM="-lutil" ;;
+ 
+   hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
+ 
 @@ -8095,6 +8104,11 @@ case $opsys in
      LIB_MATH=
      START_FILES='pre-crt0.o'
diff --git a/editors/emacs24/patches/patch-lib-careadlinkat.h b/editors/emacs24/patches/patch-lib-careadlinkat.h
new file mode 100644
index 00000000000..53014e43d79
--- /dev/null
+++ b/editors/emacs24/patches/patch-lib-careadlinkat.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib-careadlinkat.h,v 1.1 2012/11/26 16:56:16 martin Exp $
+
+# the *at functions are only available for newer POSIX versions
+
+--- lib/careadlinkat.h.orig	2012-08-23 07:33:42.000000000 +0200
++++ lib/careadlinkat.h	2012-11-26 17:22:41.000000000 +0100
+@@ -20,6 +20,7 @@
+ #ifndef _GL_CAREADLINKAT_H
+ #define _GL_CAREADLINKAT_H
+ 
++#define _POSIX_C_SOURCE	200809L
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
diff --git a/editors/emacs24/patches/patch-src-s-bsd--common.h b/editors/emacs24/patches/patch-src-s-bsd--common.h
new file mode 100644
index 00000000000..25ebbc7d9a6
--- /dev/null
+++ b/editors/emacs24/patches/patch-src-s-bsd--common.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-src-s-bsd--common.h,v 1.1 2012/11/26 16:56:16 martin Exp $
+
+# make NetBSD use openpty(), like MacOS
+
+--- src/s/bsd-common.h.orig	2012-11-14 22:04:22.000000000 +0100
++++ src/s/bsd-common.h	2012-11-14 22:23:22.000000000 +0100
+@@ -59,6 +59,21 @@
+ 
+ /* Define HAVE_PTYS if the system supports pty devices.  */
+ #define HAVE_PTYS
++/* Run only once.  We need a `for'-loop because the code uses `continue'.  */
++#define PTY_ITERATION	int i; for (i = 0; i < 1; i++)
++#define PTY_NAME_SPRINTF	/* none */
++#define PTY_TTY_NAME_SPRINTF	/* none */
++
++#define PTY_OPEN						\
++  do								\
++    {								\
++      int slave;						\
++      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)	\
++	fd = -1;						\
++      else							\
++	emacs_close (slave);					\
++    }								\
++  while (0)
+ 
+ /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
+ #define HAVE_SOCKETS
+