diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-12-27 17:48:29 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-12-27 17:48:29 +0000 |
| commit | a7bc3c7969b5c0ad6ecc981fc372893b25d4bee2 (patch) | |
| tree | 9e01789e69a2e2c2a72ccd219517571e1958de7b /editors/emacs22 | |
| parent | c479f7b5cb95406049a785b9ac9a3538ec3121c2 (diff) | |
| download | pkgsrc-a7bc3c7969b5c0ad6ecc981fc372893b25d4bee2.tar.gz | |
Bump PKGREVISION.
Meke NetBSD use openpty() like emacs24.
This fixes gnupg error invoked from mail/mew when decrypting.
Diffstat (limited to 'editors/emacs22')
| -rw-r--r-- | editors/emacs22/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs22/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs22/patches/patch-xx | 41 |
3 files changed, 42 insertions, 7 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index 68eaac31d37..9526df93dc4 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.30 2012/12/17 18:39:06 markd Exp $ +# $NetBSD: Makefile,v 1.31 2012/12/27 17:48:29 ryoon Exp $ PKGNAME?= ${DISTNAME} COMMENT?= GNU editing macros (editor) DISTNAME= emacs-22.3 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo index 8eaaa557631..3f8a69e920e 100644 --- a/editors/emacs22/distinfo +++ b/editors/emacs22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2012/01/09 06:30:20 skrll Exp $ +$NetBSD: distinfo,v 1.13 2012/12/27 17:48:29 ryoon Exp $ SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 @@ -25,4 +25,4 @@ SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1 SHA1 (patch-ax) = 4a9a795fd08eedcd83c1c92ede566fd63f365bec SHA1 (patch-ba) = 066f6e0f1f69e1e477820589d9b9de4a4a168148 SHA1 (patch-src_alloc_c) = 72055017f43d1526a90fdb3a02b6c317f488399d -SHA1 (patch-xx) = 3b66bbad50cef9d248a6f1d49b9d31150e14d6e1 +SHA1 (patch-xx) = fe52a07d10e8347a721e20611b527c0d626cde3e diff --git a/editors/emacs22/patches/patch-xx b/editors/emacs22/patches/patch-xx index 28545f1b633..fc94cc34867 100644 --- a/editors/emacs22/patches/patch-xx +++ b/editors/emacs22/patches/patch-xx @@ -1,12 +1,24 @@ -$NetBSD: patch-xx,v 1.1.1.1 2009/08/05 10:30:29 minskim Exp $ +$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. ---- src/s/netbsd.h.orig 2008-10-10 10:35:49.000000000 +0900 +* make NetBSD use openpty(), like on emacs24 + +--- src/s/netbsd.h.orig 2008-01-08 04:10:59.000000000 +0000 +++ src/s/netbsd.h -@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */ +@@ -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__ @@ -19,3 +31,26 @@ pkgsrc. /* 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) */ |