diff options
| author | dholland <dholland> | 2011-08-01 05:44:26 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-08-01 05:44:26 +0000 |
| commit | eaed8fb0689e45be5a2ee3c672388092b8d1baba (patch) | |
| tree | 5a83038971fbd1554902fe0489eebc9cbec46d07 /editors | |
| parent | a13aeacac1149e2bb4c6077d0ff209d734de1376 (diff) | |
| download | pkgsrc-eaed8fb0689e45be5a2ee3c672388092b8d1baba.tar.gz | |
Fix broken build with clang.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs20/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs20/patches/patch-cg | 15 | ||||
| -rw-r--r-- | editors/ex/distinfo | 3 | ||||
| -rw-r--r-- | editors/ex/patches/patch-exrecover_c | 23 |
4 files changed, 42 insertions, 2 deletions
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo index 46b7be66fc9..a9405a1db51 100644 --- a/editors/emacs20/distinfo +++ b/editors/emacs20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2010/03/30 00:44:48 dholland Exp $ +$NetBSD: distinfo,v 1.18 2011/08/01 05:44:26 dholland Exp $ SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f @@ -67,3 +67,4 @@ SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2 SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e +SHA1 (patch-cg) = b2bd4cbff399922e44ad54459255ffb1d61e1bd4 diff --git a/editors/emacs20/patches/patch-cg b/editors/emacs20/patches/patch-cg new file mode 100644 index 00000000000..5b0fba0b9c3 --- /dev/null +++ b/editors/emacs20/patches/patch-cg @@ -0,0 +1,15 @@ +$NetBSD: patch-cg,v 1.1 2011/08/01 05:44:26 dholland Exp $ + +Fix illegal C, caught by clang. + +--- src/eval.c~ 2000-05-02 13:33:57.000000000 +0000 ++++ src/eval.c +@@ -2090,7 +2090,7 @@ run_hook_with_args (nargs, args, cond) + /* If we are dying or still initializing, + don't do anything--it would probably crash if we tried. */ + if (NILP (Vrun_hooks)) +- return; ++ return Qnil; + + sym = args[0]; + val = find_symbol_value (sym); diff --git a/editors/ex/distinfo b/editors/ex/distinfo index a154e75f63e..666602b364f 100644 --- a/editors/ex/distinfo +++ b/editors/ex/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2010/01/31 21:24:03 joerg Exp $ +$NetBSD: distinfo,v 1.14 2011/08/01 05:47:40 dholland Exp $ SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09 RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 8902846a518fbf214725a801293610ebe12c143b SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e SHA1 (patch-ac) = 0401448724a4aba59b4aeb07a4cb00982bb52d98 SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954 +SHA1 (patch-exrecover_c) = f5fd1bff1f1e8229170415081815531d86e482da diff --git a/editors/ex/patches/patch-exrecover_c b/editors/ex/patches/patch-exrecover_c new file mode 100644 index 00000000000..2b114aae0c9 --- /dev/null +++ b/editors/ex/patches/patch-exrecover_c @@ -0,0 +1,23 @@ +$NetBSD: patch-exrecover_c,v 1.1 2011/08/01 05:47:40 dholland Exp $ + +Fix illegal C caught by clang. + +--- exrecover.c~ 2002-04-07 12:02:27.000000000 +0000 ++++ exrecover.c +@@ -198,7 +198,7 @@ char *getblock __P((line, int)); + int blkio __P((bloc, char *, ssize_t (*) __P((int, void *, size_t)))); + char *poolsbrk __P((intptr_t)); + int error __P((char *str, ...)); +-int listfiles __P((char *)); ++void listfiles __P((char *)); + int enter __P((struct svfile *, char *, int)); + int qucmp __P((struct svfile *, struct svfile *)); + int findtmp __P((char *)); +@@ -384,6 +384,7 @@ error(char *str, ...) + exit(1); + } + ++void + listfiles(dirname) + char *dirname; + { |