diff options
| author | dholland <dholland> | 2010-03-30 00:44:47 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2010-03-30 00:44:47 +0000 |
| commit | 8ee800e1f03780b2ebbd5b8678d7717f2cfab0c2 (patch) | |
| tree | d0c8ea6c4cde8aeb39b7768b107c756a9558e6fc | |
| parent | dd1089eb4d4639f363b41f70cd55a1716f61640d (diff) | |
| download | pkgsrc-8ee800e1f03780b2ebbd5b8678d7717f2cfab0c2.tar.gz | |
Fix emacs20 on -current. (It broke on the terminfo changes because it
can't probe terminfo vs. termcap and needs to be told explicitly in its
config system.) ok agc@. PKGREVISION to 14.
| -rw-r--r-- | editors/emacs20/Makefile | 9 | ||||
| -rw-r--r-- | editors/emacs20/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs20/patches/patch-bf | 24 |
3 files changed, 28 insertions, 9 deletions
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 9ef088c0e2d..451b90e9968 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2010/02/04 06:40:19 dholland Exp $ +# $NetBSD: Makefile,v 1.40 2010/03/30 00:44:47 dholland Exp $ DISTNAME= emacs-20.7 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= editors MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \ ftp://ftp.gnu.org/pub/old-gnu/emacs @@ -53,6 +53,11 @@ CHECK_WRKREF_SKIP+= bin/emacs-20.7 LDFLAGS+= -Wl,-z,nocombreloc .endif +# NetBSD < 5.99.24 uses termcap; afterwards terminfo. Emacs needs to be told. +.if (${OPSYS} == "NetBSD") && !exists(/usr/include/term.h) +CPPFLAGS+=-D__NETBSD_USE_TERMCAP__ +.endif + .if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) CPPFLAGS+= -DDFLY_CRT_USRLIB .endif diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo index f64b1d6309f..46b7be66fc9 100644 --- a/editors/emacs20/distinfo +++ b/editors/emacs20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2010/02/21 12:26:47 wiz Exp $ +$NetBSD: distinfo,v 1.17 2010/03/30 00:44:48 dholland Exp $ SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f @@ -40,7 +40,7 @@ SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167 SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27 SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346 -SHA1 (patch-bf) = 8a55b30ec5992e0408b3693b4f31f7d9e931d731 +SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254 SHA1 (patch-bg) = f76d459f0fbcadb0b7df4991c1d5d244accc0748 SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c diff --git a/editors/emacs20/patches/patch-bf b/editors/emacs20/patches/patch-bf index 4a1c1182528..3c030058b3e 100644 --- a/editors/emacs20/patches/patch-bf +++ b/editors/emacs20/patches/patch-bf @@ -1,8 +1,22 @@ -$NetBSD: patch-bf,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ +$NetBSD: patch-bf,v 1.2 2010/03/30 00:44:48 dholland Exp $ ---- src/s/netbsd.h.orig Sat Apr 11 20:15:19 1998 -+++ src/s/netbsd.h Sat Jan 22 20:22:29 2000 -@@ -57,7 +57,7 @@ +--- src/s/netbsd.h.orig 1998-04-11 18:15:19.000000000 +0000 ++++ src/s/netbsd.h +@@ -38,6 +42,13 @@ + #define NEED_ERRNO + #define SYSV_SYSTEM_DIR + ++/* netbsd uses terminfo as of 5.99.24 - version is checked in pkg makefile */ ++#ifdef __NETBSD_USE_TERMCAP__ ++#undef TERMINFO ++#else ++#define TERMINFO ++#endif ++ + /* Netbsd has POSIX-style pgrp behavior. */ + #undef BSD_PGRPS + +@@ -57,7 +68,7 @@ #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data)) #define N_TRELOFF(x) N_RELOFF(x) #endif @@ -11,7 +25,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ #define HAVE_WAIT_HEADER #define WAIT_USE_INT -@@ -66,11 +66,15 @@ +@@ -66,11 +77,15 @@ #define AMPERSAND_FULL_NAME |