Tue Dec 11 04:54:49 2012 UTC ()
Shift some of the more basic patches to a distfile patch.
PKGREVISION -> 16.


(dholland)
diff -r1.44 -r1.45 pkgsrc/editors/emacs20/Makefile
diff -r1.24 -r1.25 pkgsrc/editors/emacs20/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-ah
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-ai
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-bp
diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-bs
diff -r1.2 -r0 pkgsrc/editors/emacs20/patches/patch-an
diff -r1.2 -r0 pkgsrc/editors/emacs20/patches/patch-bq
diff -r1.2 -r0 pkgsrc/editors/emacs20/patches/patch-bz
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-ap
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-aq
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-ar
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-as
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-at
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-au
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-bu
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-bv
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-bw
diff -r1.1 -r0 pkgsrc/editors/emacs20/patches/patch-by
diff -r1.1.1.1 -r0 pkgsrc/editors/emacs20/patches/patch-bk
diff -r1.1.1.1 -r0 pkgsrc/editors/emacs20/patches/patch-bn
diff -r1.1.1.1 -r0 pkgsrc/editors/emacs20/patches/patch-bo
cvs diff -r1.44 -r1.45 pkgsrc/editors/emacs20/Makefile (expand / switch to unified diff)

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

--- pkgsrc/editors/emacs20/distinfo 2012/03/05 07:29:36 1.24
+++ pkgsrc/editors/emacs20/distinfo 2012/12/11 04:54:43 1.25
@@ -1,69 +1,56 @@ @@ -1,69 +1,56 @@
1$NetBSD: distinfo,v 1.24 2012/03/05 07:29:36 dholland Exp $ 1$NetBSD: distinfo,v 1.25 2012/12/11 04:54:43 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
5Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes 5Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
6SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb 6SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
7RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500 7RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500
8Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes 8Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
9SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452 9SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
10RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270 10RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
11Size (emacs-20.7.tar.gz) = 15043428 bytes 11Size (emacs-20.7.tar.gz) = 15043428 bytes
 12SHA1 (emacs20-jumbo-patch-20121210.gz) = 8a403fafe381178e7a982f68e9878f9d4746203f
 13RMD160 (emacs20-jumbo-patch-20121210.gz) = d5e74b66bcbb517477a720ce3b4ba393d06fb3bb
 14Size (emacs20-jumbo-patch-20121210.gz) = 2252 bytes
12SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670 15SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
13RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da 16RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
14Size (emacs20-xim-20000713.diff) = 21296 bytes 17Size (emacs20-xim-20000713.diff) = 21296 bytes
15SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d 18SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
16SHA1 (patch-ab) = ef808bd29242e1a2471103d9b66cbec56a0368b9 19SHA1 (patch-ab) = ef808bd29242e1a2471103d9b66cbec56a0368b9
17SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885 20SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
18SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6 21SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
19SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34 22SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
20SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca 23SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca
21SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9 24SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
22SHA1 (patch-ah) = 451954e31fd60e7f85d22eb02a2949818d5e5e4e 25SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455
23SHA1 (patch-ai) = 36a90bc66633618569c32fd38552ead1fc8958ac 26SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d
24SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256 27SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256
25SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c 28SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c
26SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec 29SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
27SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3 30SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
28SHA1 (patch-an) = 59cffa7847fe84bc29a44d3b0e4c2eb09719126f 
29SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193 31SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193
30SHA1 (patch-ap) = f0453313569cd000af36230bc193ab777db80974 
31SHA1 (patch-aq) = 17897dc84bc40f6e5229b6c833f87066d9e065ed 
32SHA1 (patch-ar) = 0c04e0dd0e0e91099404ba47a01c1a556884773a 
33SHA1 (patch-as) = d098417b487676fdc958feb0d7b5977226efe9df 
34SHA1 (patch-at) = 8d0b76a7ff397796ecc8ee5e588a11968415a164 
35SHA1 (patch-au) = 9d416d2dcd2e5a2ef3a73f0841196ac86efea3c0 
36SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2 32SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
37SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc 33SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
38SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e 34SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e
39SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f 35SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f
40SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167 36SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
41SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27 37SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
42SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346 38SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
43SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254 39SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
44SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8 40SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8
45SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a 41SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
46SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c 42SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c
47SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2 43SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
48SHA1 (patch-bk) = 7582e915a5bd9778259961e7fa842d5cdce3e85c 
49SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13 44SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
50SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54 45SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54
51SHA1 (patch-bn) = 247c04ae1accf3bc6b07b22767eb3cf2cdb55013 46SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91
52SHA1 (patch-bo) = f9b8b73af91a445dbf50f9e862b84c7abc2b730e 
53SHA1 (patch-bp) = 9091134cf50e17ce58976c3193666e716345a124 
54SHA1 (patch-bq) = 5d8cf584bb6d83df975a339c262902da1d35776e 
55SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e 47SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
56SHA1 (patch-bs) = 7cf879039f93d92c2cc43a9cce74dac114f622aa 48SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a
57SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92 49SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
58SHA1 (patch-bu) = 99374b0ca8402f6971c5a56c4e2ed0bc9ba8667e 
59SHA1 (patch-bv) = fa51f5ad5152c344e83f056a3c565129a9b7a1ef 
60SHA1 (patch-bw) = 5de9f12d129b2f13a1d9c1702c7a889cd6b922f4 
61SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b 50SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
62SHA1 (patch-by) = a383206a32e902c448a1b529cf1eefc485f5beab 
63SHA1 (patch-bz) = c395a2acb2aa1e2c1582f6bb46a32bcfa4661b85 
64SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d 51SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
65SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b 52SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
66SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb 53SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
67SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2 54SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2
68SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e 55SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
69SHA1 (patch-cg) = b2bd4cbff399922e44ad54459255ffb1d61e1bd4 56SHA1 (patch-cg) = b2bd4cbff399922e44ad54459255ffb1d61e1bd4
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-ah 2006/01/04 17:00:32 1.2
+++ pkgsrc/editors/emacs20/patches/patch-ah 2012/12/11 04:54:43 1.3
@@ -1,28 +1,17 @@ @@ -1,28 +1,17 @@
1$NetBSD: patch-ah,v 1.2 2006/01/04 17:00:32 joerg Exp $ 1$NetBSD: patch-ah,v 1.3 2012/12/11 04:54:43 dholland Exp $
2 2
3--- src/fileio.c.orig 2000-05-16 11:02:13.000000000 +0000 3--- src/fileio.c.orig 2000-05-16 11:02:13.000000000 +0000
4+++ src/fileio.c 4+++ src/fileio.c
5@@ -61,10 +61,6 @@ Boston, MA 02111-1307, USA. */ 
6  
7 #include <errno.h> 
8  
9-#ifndef vax11c 
10-extern int errno; 
11-#endif 
12- 
13 extern char *strerror (); 
14  
15 #ifdef APOLLO 
16@@ -3252,8 +3248,11 @@ The value is an integer.") 5@@ -3252,8 +3248,11 @@ The value is an integer.")
17 return value; 6 return value;
18 } 7 }
19  8
20-#ifdef unix 9-#ifdef unix
21+#ifdef __NetBSD__ 10+#ifdef __NetBSD__
22+#define unix 42 11+#define unix 42
23+#endif 12+#endif
24  13
25+#ifdef unix 14+#ifdef unix
26 DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "", 15 DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
27 "Tell Unix to finish all pending disk updates.") 16 "Tell Unix to finish all pending disk updates.")
28 () 17 ()
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-ai 2006/01/04 17:00:32 1.2
+++ pkgsrc/editors/emacs20/patches/patch-ai 2012/12/11 04:54:43 1.3
@@ -1,26 +1,17 @@ @@ -1,26 +1,17 @@
1$NetBSD: patch-ai,v 1.2 2006/01/04 17:00:32 joerg Exp $ 1$NetBSD: patch-ai,v 1.3 2012/12/11 04:54:43 dholland Exp $
2 2
3--- src/sysdep.c.orig 2000-05-24 13:59:14.000000000 +0000 3--- src/sysdep.c.orig 2000-05-24 13:59:14.000000000 +0000
4+++ src/sysdep.c 4+++ src/sysdep.c
5@@ -104,8 +104,6 @@ extern unsigned start __asm__ ("start"); 
6 #endif 
7 #endif 
8  
9-extern int errno; 
10- 
11 #ifdef VMS 
12 #include <rms.h> 
13 #include <ttdef.h> 
14@@ -2134,6 +2132,7 @@ unrequest_sigio () 5@@ -2134,6 +2132,7 @@ unrequest_sigio ()
15 * 6 *
16 */ 7 */
17  8
18+#if !(defined (__NetBSD__) && defined (__ELF__)) 9+#if !(defined (__NetBSD__) && defined (__ELF__))
19 #ifndef HAVE_TEXT_START 10 #ifndef HAVE_TEXT_START
20 char * 11 char *
21 start_of_text () 12 start_of_text ()
22@@ -2151,6 +2150,7 @@ start_of_text () 13@@ -2151,6 +2150,7 @@ start_of_text ()
23 #endif /* TEXT_START */ 14 #endif /* TEXT_START */
24 } 15 }
25 #endif /* not HAVE_TEXT_START */ 16 #endif /* not HAVE_TEXT_START */
26+#endif 17+#endif
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-bp (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-bp 2008/04/05 21:29:14 1.2
+++ pkgsrc/editors/emacs20/patches/patch-bp 2012/12/11 04:54:47 1.3
@@ -1,24 +1,13 @@ @@ -1,24 +1,13 @@
1$NetBSD: patch-bp,v 1.2 2008/04/05 21:29:14 kristerw Exp $ 1$NetBSD: patch-bp,v 1.3 2012/12/11 04:54:47 dholland Exp $
2 2
3--- lwlib/lwlib.c.orig 1998-04-06 12:24:33.000000000 +0200 3--- lwlib/lwlib.c.orig 1998-04-06 12:24:33.000000000 +0200
4+++ lwlib/lwlib.c 2008-04-04 21:33:16.000000000 +0200 4+++ lwlib/lwlib.c 2008-04-04 21:33:16.000000000 +0200
5@@ -29,10 +29,8 @@ 
6 #include "lwlib-utils.h" 
7 #include <X11/StringDefs.h> 
8  
9-#ifdef __osf__ 
10 #include <string.h> 
11 #include <stdlib.h> 
12-#endif 
13 extern long *xmalloc(); 
14  
15 #if defined (USE_LUCID) 
16@@ -1302,7 +1300,7 @@ 5@@ -1302,7 +1300,7 @@
17 XtVaSetValues (widget_to_invert, 6 XtVaSetValues (widget_to_invert,
18 XtNforeground, background, 7 XtNforeground, background,
19 XtNbackground, foreground, 8 XtNbackground, foreground,
20- 0); 9- 0);
21+ NULL); 10+ NULL);
22 } 11 }
23  12
24 void 13 void
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs20/patches/patch-bs (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-bs 2008/04/05 21:29:14 1.2
+++ pkgsrc/editors/emacs20/patches/patch-bs 2012/12/11 04:54:47 1.3
@@ -1,21 +1,13 @@ @@ -1,21 +1,13 @@
1$NetBSD: patch-bs,v 1.2 2008/04/05 21:29:14 kristerw Exp $ 1$NetBSD: patch-bs,v 1.3 2012/12/11 04:54:47 dholland Exp $
2 2
3--- src/xmenu.c.orig 1998-12-28 23:15:47.000000000 +0100 3--- src/xmenu.c.orig 1998-12-28 23:15:47.000000000 +0100
4+++ src/xmenu.c 2008-04-02 22:40:18.000000000 +0200 4+++ src/xmenu.c 2008-04-02 22:40:18.000000000 +0200
5@@ -35,6 +35,7 @@ 
6 #include <config.h> 
7  
8 #include <stdio.h> 
9+#include <stdlib.h> 
10 #include "lisp.h" 
11 #include "termhooks.h" 
12 #include "frame.h" 
13@@ -1500,7 +1501,7 @@ 5@@ -1500,7 +1501,7 @@
14 { 6 {
15 XtManageChild (x->menubar_widget); 7 XtManageChild (x->menubar_widget);
16 XtMapWidget (x->menubar_widget); 8 XtMapWidget (x->menubar_widget);
17- XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0); 9- XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0);
18+ XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, NULL); 10+ XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, NULL);
19 } 11 }
20  12
21 /* Re-manage the text-area widget, and then thrash the sizes. */ 13 /* Re-manage the text-area widget, and then thrash the sizes. */
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-an
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bq
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bz
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-ap
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-aq
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-ar
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-as
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-at
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-au
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bu
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bv
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bw
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-by
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bk
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bn
File Deleted: pkgsrc/editors/emacs20/patches/Attic/patch-bo