Sun Jul 23 05:22:38 2017 UTC ()
Roll a couple bits into the jumbo patch, one from patch-aj, another
mentioned in passing in PR 43091. Bump PKGREVISION again, to 24.


(dholland)
diff -r1.58 -r1.59 pkgsrc/editors/emacs20/Makefile
diff -r1.36 -r1.37 pkgsrc/editors/emacs20/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-aj
cvs diff -r1.58 -r1.59 pkgsrc/editors/emacs20/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/Makefile 2017/07/23 05:11:42 1.58
+++ pkgsrc/editors/emacs20/Makefile 2017/07/23 05:22:38 1.59
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.58 2017/07/23 05:11:42 dholland Exp $ 1# $NetBSD: Makefile,v 1.59 2017/07/23 05:22:38 dholland Exp $
2 2
3DISTNAME= emacs-20.7 3DISTNAME= emacs-20.7
4PKGNAME= ${DISTNAME:S/emacs/emacs20/} 4PKGNAME= ${DISTNAME:S/emacs/emacs20/}
5PKGREVISION= 23 5PKGREVISION= 24
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ 7MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/
8MASTER_SITES+= ftp://ftp.gnu.org/pub/old-gnu/emacs 8MASTER_SITES+= ftp://ftp.gnu.org/pub/old-gnu/emacs
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX} 10DISTFILES+= ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX}
11SITES.${DISTNAME}-mule-4.1b-elc.tar.gz= ${MASTER_SITE_LOCAL} 11SITES.${DISTNAME}-mule-4.1b-elc.tar.gz= ${MASTER_SITE_LOCAL}
12 12
13# Mule enhancement (back port) patch by Satoshi Yatagawa 13# Mule enhancement (back port) patch by Satoshi Yatagawa
14SITES.emacs-20.7-mule-4.1b.patch= \ 14SITES.emacs-20.7-mule-4.1b.patch= \
15 http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/ 15 http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/
16PATCHFILES= emacs-20.7-mule-4.1b.patch 16PATCHFILES= emacs-20.7-mule-4.1b.patch
17# XIM fix patch by Seiichiro Inoue 17# XIM fix patch by Seiichiro Inoue
18SITES.emacs20-xim-20000713.diff= \ 18SITES.emacs20-xim-20000713.diff= \
19 http://home.catv.ne.jp/pp/ginoue/software/emacs-xim/ 19 http://home.catv.ne.jp/pp/ginoue/software/emacs-xim/
20PATCHFILES+= emacs20-xim-20000713.diff 20PATCHFILES+= emacs20-xim-20000713.diff
21 21
22# dholland's jumbo patch 22# dholland's jumbo patch
23PATCHFILES+= emacs20-jumbo-patch-20121210.gz 23PATCHFILES+= emacs20-jumbo-patch-20170723.gz
24SITES.emacs20-jumbo-patch-20121210.gz=\ 24SITES.emacs20-jumbo-patch-20170723.gz=\
25 http://www.NetBSD.org/~dholland/patchkits/emacs20/ 25 http://www.NetBSD.org/~dholland/patchkits/emacs20/
26 26
27PATCH_DIST_STRIP= -p1 27PATCH_DIST_STRIP= -p1
28 28
29MAINTAINER= dholland@NetBSD.org 29MAINTAINER= dholland@NetBSD.org
30HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 30HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
31COMMENT= GNU editing macros (editor) 31COMMENT= GNU editing macros (editor)
32 32
33BROKEN_ON_PLATFORM= Darwin-*-* DragonFly-*-* 33BROKEN_ON_PLATFORM= Darwin-*-* DragonFly-*-*
34 34
35CONFLICTS= mule-[0-9]* 35CONFLICTS= mule-[0-9]*
36 36
37GNU_CONFIGURE= yes 37GNU_CONFIGURE= yes
cvs diff -r1.36 -r1.37 pkgsrc/editors/emacs20/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/distinfo 2017/07/23 05:11:42 1.36
+++ pkgsrc/editors/emacs20/distinfo 2017/07/23 05:22:38 1.37
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1$NetBSD: distinfo,v 1.36 2017/07/23 05:11:42 dholland Exp $ 1$NetBSD: distinfo,v 1.37 2017/07/23 05:22:38 dholland Exp $
2 2
3SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff 3SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
4RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f 4RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
5SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4 5SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4
6Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes 6Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
7SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb 7SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
8RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500 8RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500
9SHA512 (emacs-20.7-mule-4.1b.patch) = e3bb0da53c1db47b5ffbc467f5e1047896cda69b814abbbc77837f9b4ea76cb933040b22a31ee87d40c8bd66a804a1fdeb5d54f648ec040558cc4b79bc6f2368 9SHA512 (emacs-20.7-mule-4.1b.patch) = e3bb0da53c1db47b5ffbc467f5e1047896cda69b814abbbc77837f9b4ea76cb933040b22a31ee87d40c8bd66a804a1fdeb5d54f648ec040558cc4b79bc6f2368
10Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes 10Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
11SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452 11SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
12RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270 12RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
13SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a 13SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a
14Size (emacs-20.7.tar.gz) = 15043428 bytes 14Size (emacs-20.7.tar.gz) = 15043428 bytes
15SHA1 (emacs20-jumbo-patch-20121210.gz) = 8a403fafe381178e7a982f68e9878f9d4746203f 15SHA1 (emacs20-jumbo-patch-20170723.gz) = 3121c48d3b60b16fa7f27e8d39394f78eb9c58a3
16RMD160 (emacs20-jumbo-patch-20121210.gz) = d5e74b66bcbb517477a720ce3b4ba393d06fb3bb 16RMD160 (emacs20-jumbo-patch-20170723.gz) = 0600bdc0fa3a21351a7d12af3835bf3ed0096a48
17SHA512 (emacs20-jumbo-patch-20121210.gz) = 68de907f12bd5bca6f95fc484af830a48c311e200ec4f9fd4a496841b82250be94e95157cb4622caccb05d3fbcf5b7e3a92b3741a574071b069530da5f386a7d 17SHA512 (emacs20-jumbo-patch-20170723.gz) = b54b8a88c8c938cddcc4011a548f739458b143581a0e32f813d2b69ceeba95b068613ccea9495924d3207e43707184249726e13f7699cf6f0bb3f9345af29749
18Size (emacs20-jumbo-patch-20121210.gz) = 2252 bytes 18Size (emacs20-jumbo-patch-20170723.gz) = 2463 bytes
19SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670 19SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
20RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da 20RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
21SHA512 (emacs20-xim-20000713.diff) = d6d3fb483db830ddcf07f6325901fb7faca1e112129f27036328eb4a6a53851a53318a31830a751525b9e0898256c6c9bfe5c3c333401d44a6dcbad44ba3c7a8 21SHA512 (emacs20-xim-20000713.diff) = d6d3fb483db830ddcf07f6325901fb7faca1e112129f27036328eb4a6a53851a53318a31830a751525b9e0898256c6c9bfe5c3c333401d44a6dcbad44ba3c7a8
22Size (emacs20-xim-20000713.diff) = 21296 bytes 22Size (emacs20-xim-20000713.diff) = 21296 bytes
23SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d 23SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
24SHA1 (patch-ab) = cf63cb6481eb5862855f066a358821cf57bb6aa1 24SHA1 (patch-ab) = cf63cb6481eb5862855f066a358821cf57bb6aa1
25SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885 25SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
26SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6 26SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
27SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34 27SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
28SHA1 (patch-af) = 4f252a923a8164ee7523a338f1d1b5d87006ea72 28SHA1 (patch-af) = 4f252a923a8164ee7523a338f1d1b5d87006ea72
29SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9 29SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
30SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455 30SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455
31SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d 31SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d
32SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256 32SHA1 (patch-aj) = d4962f6054c6fa9e8e7313b0cf670c6524370a56
33SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c 33SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c
34SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec 34SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
35SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3 35SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
36SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193 36SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193
37SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2 37SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
38SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc 38SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
39SHA1 (patch-az) = a53cdfdb21e773986c9ffd2fd46e3331471ea892 39SHA1 (patch-az) = a53cdfdb21e773986c9ffd2fd46e3331471ea892
40SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f 40SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f
41SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167 41SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
42SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27 42SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
43SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346 43SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
44SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254 44SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
45SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8 45SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-aj 2006/01/04 17:00:32 1.2
+++ pkgsrc/editors/emacs20/patches/patch-aj 2017/07/23 05:22:38 1.3
@@ -1,44 +1,36 @@ @@ -1,44 +1,36 @@
1$NetBSD: patch-aj,v 1.2 2006/01/04 17:00:32 joerg Exp $ 1$NetBSD: patch-aj,v 1.3 2017/07/23 05:22:38 dholland Exp $
2 2
3--- src/process.c.orig 2000-05-23 19:10:16.000000000 +0000 3--- src/process.c.orig 2000-05-23 19:10:16.000000000 +0000
4+++ src/process.c 4+++ src/process.c
5@@ -1,7 +1,18 @@ 5@@ -1,7 +1,18 @@
6+/* 6+/*
7+ * Locally hacked process.c to add ipv6 support. -wsr 7+ * Locally hacked process.c to add ipv6 support. -wsr
8+ * 8+ *
9+ * The configure.in file should define "HAVE_GETADDRINFO" if it is found  9+ * The configure.in file should define "HAVE_GETADDRINFO" if it is found
10+ * in libc. 10+ * in libc.
11+ *  11+ *
12+ */ 12+ */
13+ 13+
14 /* Asynchronous subprocess control for GNU Emacs. 14 /* Asynchronous subprocess control for GNU Emacs.
15 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 1998 15 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 1998
16 Free Software Foundation, Inc. 16 Free Software Foundation, Inc.
17  17
18+ ipv6 changes are 18+ ipv6 changes are
19+ Copyright (C) 1999 Wolfgang S. Rupprecht 19+ Copyright (C) 1999 Wolfgang S. Rupprecht
20+ 20+
21 This file is part of GNU Emacs. 21 This file is part of GNU Emacs.
22  22
23 GNU Emacs is free software; you can redistribute it and/or modify 23 GNU Emacs is free software; you can redistribute it and/or modify
24@@ -147,7 +158,6 @@ Lisp_Object Qlast_nonmenu_event; 
25  
26 #include "syswait.h" 
27  
28-extern int errno; 
29 extern char *strerror (); 
30 #ifdef VMS 
31 extern char *sys_errlist[]; 
32@@ -1810,15 +1820,21 @@ Fourth arg SERVICE is name of the servic 24@@ -1810,15 +1820,21 @@ Fourth arg SERVICE is name of the servic
33 { 25 {
34 Lisp_Object proc; 26 Lisp_Object proc;
35 register int i; 27 register int i;
36+#ifdef HAVE_GETADDRINFO 28+#ifdef HAVE_GETADDRINFO
37+ struct addrinfo hints, *res, *lres; 29+ struct addrinfo hints, *res, *lres;
38+ int ret = 0; 30+ int ret = 0;
39+ int xerrno = 0; 31+ int xerrno = 0;
40+ char *portstring, portbuf [128]; 32+ char *portstring, portbuf [128];
41+#else /* HAVE_GETADDRINFO */ 33+#else /* HAVE_GETADDRINFO */
42 struct sockaddr_in address; 34 struct sockaddr_in address;
43 struct servent *svc_info; 35 struct servent *svc_info;
44 struct hostent *host_info_ptr, host_info; 36 struct hostent *host_info_ptr, host_info;