diff options
| author | dholland <dholland@pkgsrc.org> | 2017-07-23 05:22:38 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2017-07-23 05:22:38 +0000 |
| commit | 58febb087c0cb33cfc33226a4ef7e61a243ecff6 (patch) | |
| tree | dc2bff9e110bb25b3b4157ac0d58db2fb09d2744 /editors | |
| parent | 1c8b208daa509a05ebc3cb43cee3452620298dd7 (diff) | |
| download | pkgsrc-58febb087c0cb33cfc33226a4ef7e61a243ecff6.tar.gz | |
Roll a couple bits into the jumbo patch, one from patch-aj, another
mentioned in passing in PR 43091. Bump PKGREVISION again, to 24.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs20/Makefile | 8 | ||||
| -rw-r--r-- | editors/emacs20/distinfo | 12 | ||||
| -rw-r--r-- | editors/emacs20/patches/patch-aj | 10 |
3 files changed, 11 insertions, 19 deletions
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 19d475dc57d..e3350cb2072 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.58 2017/07/23 05:11:42 dholland Exp $ +# $NetBSD: Makefile,v 1.59 2017/07/23 05:22:38 dholland Exp $ DISTNAME= emacs-20.7 PKGNAME= ${DISTNAME:S/emacs/emacs20/} -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= editors MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ MASTER_SITES+= ftp://ftp.gnu.org/pub/old-gnu/emacs @@ -20,8 +20,8 @@ SITES.emacs20-xim-20000713.diff= \ PATCHFILES+= emacs20-xim-20000713.diff # dholland's jumbo patch -PATCHFILES+= emacs20-jumbo-patch-20121210.gz -SITES.emacs20-jumbo-patch-20121210.gz=\ +PATCHFILES+= emacs20-jumbo-patch-20170723.gz +SITES.emacs20-jumbo-patch-20170723.gz=\ http://www.NetBSD.org/~dholland/patchkits/emacs20/ PATCH_DIST_STRIP= -p1 diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo index e18a466db9e..9ed95884442 100644 --- a/editors/emacs20/distinfo +++ b/editors/emacs20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2017/07/23 05:11:42 dholland Exp $ +$NetBSD: distinfo,v 1.37 2017/07/23 05:22:38 dholland Exp $ SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f @@ -12,10 +12,10 @@ SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270 SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a Size (emacs-20.7.tar.gz) = 15043428 bytes -SHA1 (emacs20-jumbo-patch-20121210.gz) = 8a403fafe381178e7a982f68e9878f9d4746203f -RMD160 (emacs20-jumbo-patch-20121210.gz) = d5e74b66bcbb517477a720ce3b4ba393d06fb3bb -SHA512 (emacs20-jumbo-patch-20121210.gz) = 68de907f12bd5bca6f95fc484af830a48c311e200ec4f9fd4a496841b82250be94e95157cb4622caccb05d3fbcf5b7e3a92b3741a574071b069530da5f386a7d -Size (emacs20-jumbo-patch-20121210.gz) = 2252 bytes +SHA1 (emacs20-jumbo-patch-20170723.gz) = 3121c48d3b60b16fa7f27e8d39394f78eb9c58a3 +RMD160 (emacs20-jumbo-patch-20170723.gz) = 0600bdc0fa3a21351a7d12af3835bf3ed0096a48 +SHA512 (emacs20-jumbo-patch-20170723.gz) = b54b8a88c8c938cddcc4011a548f739458b143581a0e32f813d2b69ceeba95b068613ccea9495924d3207e43707184249726e13f7699cf6f0bb3f9345af29749 +Size (emacs20-jumbo-patch-20170723.gz) = 2463 bytes SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da SHA512 (emacs20-xim-20000713.diff) = d6d3fb483db830ddcf07f6325901fb7faca1e112129f27036328eb4a6a53851a53318a31830a751525b9e0898256c6c9bfe5c3c333401d44a6dcbad44ba3c7a8 @@ -29,7 +29,7 @@ SHA1 (patch-af) = 4f252a923a8164ee7523a338f1d1b5d87006ea72 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9 SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455 SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d -SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256 +SHA1 (patch-aj) = d4962f6054c6fa9e8e7313b0cf670c6524370a56 SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3 diff --git a/editors/emacs20/patches/patch-aj b/editors/emacs20/patches/patch-aj index 51970f4438a..47c779c4c89 100644 --- a/editors/emacs20/patches/patch-aj +++ b/editors/emacs20/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.2 2006/01/04 17:00:32 joerg Exp $ +$NetBSD: patch-aj,v 1.3 2017/07/23 05:22:38 dholland Exp $ --- src/process.c.orig 2000-05-23 19:10:16.000000000 +0000 +++ src/process.c @@ -21,14 +21,6 @@ $NetBSD: patch-aj,v 1.2 2006/01/04 17:00:32 joerg Exp $ This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify -@@ -147,7 +158,6 @@ Lisp_Object Qlast_nonmenu_event; - - #include "syswait.h" - --extern int errno; - extern char *strerror (); - #ifdef VMS - extern char *sys_errlist[]; @@ -1810,15 +1820,21 @@ Fourth arg SERVICE is name of the servic { Lisp_Object proc; |