pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/uemacs Pass -Wall. Fix a number of minor bugs ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/937493704650
branches: trunk
changeset: 603686:937493704650
user: dholland <dholland%pkgsrc.org@localhost>
date: Thu May 10 20:53:30 2012 +0000
description:
Pass -Wall. Fix a number of minor bugs and possibly some major ones.
Should also fix clang build. PKGREVISION++
diffstat:
editors/uemacs/Makefile | 4 +-
editors/uemacs/distinfo | 38 +-
editors/uemacs/patches/patch-ab | 14 +-
editors/uemacs/patches/patch-ac | 228 ++++++++++++-
editors/uemacs/patches/patch-ad | 62 ++-
editors/uemacs/patches/patch-ag | 91 ++++-
editors/uemacs/patches/patch-h_ebind_h | 507 ++++++++++++++++++++++++++++
editors/uemacs/patches/patch-h_eproto_h | 303 ++++++++++++++++
editors/uemacs/patches/patch-h_evar_h | 113 ++++++
editors/uemacs/patches/patch-src_abbrev_c | 24 +
editors/uemacs/patches/patch-src_basic_c | 159 ++++++++
editors/uemacs/patches/patch-src_buffer_c | 114 ++++++
editors/uemacs/patches/patch-src_crypt_c | 15 +
editors/uemacs/patches/patch-src_display_c | 78 ++++
editors/uemacs/patches/patch-src_dolock_c | 15 +
editors/uemacs/patches/patch-src_eval_c | 125 ++++++
editors/uemacs/patches/patch-src_exec_c | 147 ++++++++
editors/uemacs/patches/patch-src_file_c | 179 +++++++++
editors/uemacs/patches/patch-src_fileio_c | 58 +++
editors/uemacs/patches/patch-src_input_c | 115 ++++++
editors/uemacs/patches/patch-src_isearch_c | 49 ++
editors/uemacs/patches/patch-src_keyboard_c | 47 ++
editors/uemacs/patches/patch-src_line_c | 101 +++++
editors/uemacs/patches/patch-src_main_c | 173 +++++++++
editors/uemacs/patches/patch-src_mouse_c | 88 ++++
editors/uemacs/patches/patch-src_random_c | 318 +++++++++++++++++
editors/uemacs/patches/patch-src_region_c | 97 +++++
editors/uemacs/patches/patch-src_replace_c | 38 ++
editors/uemacs/patches/patch-src_screen_c | 70 +++
editors/uemacs/patches/patch-src_search_c | 62 +++
editors/uemacs/patches/patch-src_tags_c | 70 +++
editors/uemacs/patches/patch-src_undo_c | 33 +
editors/uemacs/patches/patch-src_window_c | 194 ++++++++++
editors/uemacs/patches/patch-src_word_c | 124 ++++++
34 files changed, 3810 insertions(+), 43 deletions(-)
diffs (truncated from 4065 to 300 lines):
diff -r 8de2cfd5d088 -r 937493704650 editors/uemacs/Makefile
--- a/editors/uemacs/Makefile Thu May 10 19:01:08 2012 +0000
+++ b/editors/uemacs/Makefile Thu May 10 20:53:30 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/29 19:59:12 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2012/05/10 20:53:30 dholland Exp $
DISTNAME= ue400dev
PKGNAME= uemacs-4.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors
MASTER_SITES= ftp://aquest.com/pub/uemacs400/disk2/
EXTRACT_SUFX= .zip
diff -r 8de2cfd5d088 -r 937493704650 editors/uemacs/distinfo
--- a/editors/uemacs/distinfo Thu May 10 19:01:08 2012 +0000
+++ b/editors/uemacs/distinfo Thu May 10 20:53:30 2012 +0000
@@ -1,12 +1,40 @@
-$NetBSD: distinfo,v 1.6 2010/01/29 19:59:12 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/05/10 20:53:30 dholland Exp $
SHA1 (ue400dev.zip) = edbb0261cdaa1803d9f7dc7debfd4a9df3a668eb
RMD160 (ue400dev.zip) = 75bc1b1e11035ed24d33ec4c6afad43880d5985f
Size (ue400dev.zip) = 1179949 bytes
SHA1 (patch-aa) = 2e81eaf2d4b09baf8a54daa675d85d9bae68fb4b
-SHA1 (patch-ab) = 996e5f094b26991ba111f635a9a02d05188628aa
-SHA1 (patch-ac) = f7aaa2514f74987a68da726a397d58089fc2d82e
-SHA1 (patch-ad) = 977e0ca09cc53ba4bb90936dd5e34a460d0ea4e8
+SHA1 (patch-ab) = bef63275aa8a88b12ce47fd568059360e1e972c8
+SHA1 (patch-ac) = beeba5d9686f6009248437f3eb0fd10e8b72057b
+SHA1 (patch-ad) = 493eb3bf0c24d91d55f532029a0aa5d2ad5abe44
SHA1 (patch-ae) = 40998fe8f82a65cbfdabc849ee68a04aac9ef821
SHA1 (patch-af) = 80050d29e3f3e43116f86ea9a4d93c68d9500556
-SHA1 (patch-ag) = c584a8c41f5d7bccd3ef7b3bcf07d202938ae54e
+SHA1 (patch-ag) = 2f6e1bd24888f02083fba88d73bdcc5672cb3aab
+SHA1 (patch-h_ebind_h) = fd262c8559f86a923c4ca4d6ee237229c21e15c3
+SHA1 (patch-h_eproto_h) = 20abd7755c63292cc87197a4de31d69491f973a8
+SHA1 (patch-h_evar_h) = 3491307028a9249a159abb3d92394dbdb475c289
+SHA1 (patch-src_abbrev_c) = 9252165a1a60f4984ba7e68ace5ab1e3b9aba5ff
+SHA1 (patch-src_basic_c) = 9c46f2526102342c2c0b13f7febfb04913245a58
+SHA1 (patch-src_buffer_c) = a2589f58e8adf6a227be33a3c97560b01a0f6af6
+SHA1 (patch-src_crypt_c) = 5e76bada1614497596675026465a448fe2ea7779
+SHA1 (patch-src_display_c) = aad3a3e1e08eb60faf8fddda248b5d5e81cc3c96
+SHA1 (patch-src_dolock_c) = 76065c2713b521d4e82f1ee9c261ff392e254428
+SHA1 (patch-src_eval_c) = fe624ff82f021eee53de21f4682bd28872703a37
+SHA1 (patch-src_exec_c) = 27238fd0b2948cbaff2ee83d2cc1547d7554d3c2
+SHA1 (patch-src_file_c) = f62c778b710e2bd61e762514bbc3136ff8f7b201
+SHA1 (patch-src_fileio_c) = ee5034687a031a5d69e31ef6126fe7e34adcf8a3
+SHA1 (patch-src_input_c) = 53e4c06eaef9dfcdb2bbe52c54338fbaa2fa0de9
+SHA1 (patch-src_isearch_c) = 23405d0dd9a82d874df41714fdfa1c79bff90e24
+SHA1 (patch-src_keyboard_c) = 607aecf64f0ed212f642e25671c995f83373bc88
+SHA1 (patch-src_line_c) = 50943baedce5c4cb41a4d155cf2713cd33f4734d
+SHA1 (patch-src_main_c) = 7f6ad81de9646e0d358739fdaf58005927687b06
+SHA1 (patch-src_mouse_c) = 49c0d8ff5da8f171d2e784ba9a38951a2d95ef3c
+SHA1 (patch-src_random_c) = 76bedf9bafbf17fa47608ffc0a2ecb301580ef36
+SHA1 (patch-src_region_c) = 0290a4f2146bfb21eef233f91347f98e24b5d309
+SHA1 (patch-src_replace_c) = 373766f5fed7086a3bb3da4ae660575a501f591c
+SHA1 (patch-src_screen_c) = c41c79986005d1f6318f9f3fc0a7493477224038
+SHA1 (patch-src_search_c) = de8b5f5f9728d5d7ec93dffd4bedf05e9011de2f
+SHA1 (patch-src_tags_c) = 9651f05b94f293af2ad7490cca7667ce91f5cce2
+SHA1 (patch-src_undo_c) = fb8a3aae42e5c820178333f635edce21c91a5064
+SHA1 (patch-src_window_c) = 438b0007009d5dcb423d7627d77cc41a7288a715
+SHA1 (patch-src_word_c) = 462e5e6c053a1f7f97627c6e273403dd7876f546
diff -r 8de2cfd5d088 -r 937493704650 editors/uemacs/patches/patch-ab
--- a/editors/uemacs/patches/patch-ab Thu May 10 19:01:08 2012 +0000
+++ b/editors/uemacs/patches/patch-ab Thu May 10 20:53:30 2012 +0000
@@ -1,7 +1,9 @@
-$NetBSD: patch-ab,v 1.4 2004/02/13 23:49:12 snj Exp $
+$NetBSD: patch-ab,v 1.5 2012/05/10 20:53:30 dholland Exp $
---- netbsd/estruct.h.orig Wed Mar 25 14:21:05 1998
-+++ netbsd/estruct.h Wed Mar 25 14:25:34 1998
+Configure for pkgsrc. Fix some of the conditionals for a C89+ world.
+
+--- netbsd/estruct.h.orig 2012-05-10 18:13:41.000000000 +0000
++++ netbsd/estruct.h
@@ -0,0 +1,1254 @@
+/* ESTRUCT: Structure and preprocesser defined for
+ MicroEMACS 4.00
@@ -169,7 +171,7 @@
+#define NOISY 1 /* Use a fancy BELL if it exists */
+#define CTAGS 1 /* include vi-like tagging? */
+#define SPEECH 0 /* spoken EMACS, for the sight impared [not ready] */
-+#define VARARG 0 /* use varargs.h for mlwrite() */
++#define VARARG 1 /* use stdarg.h for mlwrite() */
+
+#if XVT
+#undef COLOR
@@ -237,7 +239,7 @@
+
+/* Prototypes in use? */
+
-+#if MSC || TURBO || IC || VMS || GCC || ZTC
++#if __STDC__ || MSC || TURBO || IC || VMS || GCC || ZTC
+#define PROTO 1
+#else
+#define PROTO 0
@@ -496,7 +498,7 @@
+#endif
+
+#if VARARG
-+#if (GCC == 0) && (USG || AIX || AUX || BSD || FREEBSD || SUN || XENIX || HPUX8 || HPUX9 || AVIION || MPE)
++#if (GCC == 0) && (__STDC__ == 0) && (USG || AIX || AUX || BSD || FREEBSD || SUN || XENIX || HPUX8 || HPUX9 || AVIION || MPE)
+#define VARG 1
+#define SARG 0
+#include <varargs.h>
diff -r 8de2cfd5d088 -r 937493704650 editors/uemacs/patches/patch-ac
--- a/editors/uemacs/patches/patch-ac Thu May 10 19:01:08 2012 +0000
+++ b/editors/uemacs/patches/patch-ac Thu May 10 20:53:30 2012 +0000
@@ -1,18 +1,178 @@
-$NetBSD: patch-ac,v 1.2 2000/03/23 22:08:52 tron Exp $
+$NetBSD: patch-ac,v 1.3 2012/05/10 20:53:30 dholland Exp $
+
+- use standard headers
+- avoid implicit int
+- look in $PREFIX/share/uemacs for data files
+- const correctness required by existing const declarations
+- suppress false initialization warning seen with gcc 4.1
---- src/bind.c.orig Sun Nov 19 03:09:20 1995
-+++ src/bind.c Wed Mar 25 15:00:37 1998
-@@ -634,7 +634,8 @@
- register char *sp; /* pointer into path spec */
+--- src/bind.c.orig 1995-11-19 08:09:20.000000000 +0000
++++ src/bind.c
+@@ -5,13 +5,14 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
+ #include "estruct.h"
+ #include "eproto.h"
+ #include "edef.h"
+ #include "elang.h"
+ #include "epath.h"
+
+-PASCAL NEAR help(f, n) /* give me some help!!!!
++PASCAL NEAR int help(f, n) /* give me some help!!!!
+ bring up a fake buffer and read the help file
+ into it with view mode */
+
+@@ -19,7 +20,10 @@ int f,n; /* prefix flag and argument */
+
+ {
+ register BUFFER *bp; /* buffer pointer to help */
+- char *fname; /* file name of help file */
++ CONST char *fname; /* file name of help file */
++
++ /* required by gcc 4.1 */
++ fname = NULL;
+
+ /* first check if we are already here */
+ bp = bfind("emacs.hlp", FALSE, BFINVS);
+@@ -51,7 +55,7 @@ int f,n; /* prefix flag and argument */
+ return(TRUE);
+ }
+
+-PASCAL NEAR deskey(f, n) /* describe the command for a certain key */
++PASCAL NEAR int deskey(f, n) /* describe the command for a certain key */
+
+ int f,n; /* prefix flag and argument */
+
+@@ -81,7 +85,7 @@ int f,n; /* prefix flag and argument */
+
+ /* bindtokey: add a new key to the key binding table */
+
+-PASCAL NEAR bindtokey(f, n)
++PASCAL NEAR int bindtokey(f, n)
+
+ int f, n; /* command arguments [IGNORED] */
+
+@@ -180,7 +184,7 @@ int f, n; /* command arguments [IGNORED]
+
+ /* macrotokey: Bind a key to a macro in the key binding table */
+
+-PASCAL NEAR macrotokey(f, n)
++PASCAL NEAR int macrotokey(f, n)
+
+ int f, n; /* command arguments [IGNORED] */
+
+@@ -258,7 +262,7 @@ int f, n; /* command arguments [IGNORED]
+
+ /* unbindkey: delete a key from the key binding table */
+
+-PASCAL NEAR unbindkey(f, n)
++PASCAL NEAR int unbindkey(f, n)
+
+ int f, n; /* command arguments [IGNORED] */
+
+@@ -286,7 +290,7 @@ int f, n; /* command arguments [IGNORED]
+ return(TRUE);
+ }
+
+-PASCAL NEAR unbindchar(c)
++PASCAL NEAR int unbindchar(c)
+
+ int c; /* command key to unbind */
+
+@@ -359,7 +363,7 @@ BUFFER *bp; /* buffer to unbind all keys
+ into it with view mode
+ */
+
+-PASCAL NEAR desbind(f, n)
++PASCAL NEAR int desbind(f, n)
+
+ int f,n; /* prefix flag and argument */
+
+@@ -367,7 +371,7 @@ int f,n; /* prefix flag and argument */
+ return(buildlist(TRUE, ""));
+ }
+
+-PASCAL NEAR apro(f, n) /* Apropos (List functions that match a substring) */
++PASCAL NEAR int apro(f, n) /* Apropos (List functions that match a substring) */
+
+ int f,n; /* prefix flag and argument */
+
+@@ -383,7 +387,7 @@ int f,n; /* prefix flag and argument */
+ return(buildlist(FALSE, mstring));
+ }
+
+-PASCAL NEAR buildlist(type, mstring) /* build a binding list (limited or full) */
++PASCAL NEAR int buildlist(type, mstring) /* build a binding list (limited or full) */
+
+ int type; /* true = full list, false = partial list */
+ char *mstring; /* match string if a partial list */
+@@ -519,7 +523,7 @@ bfail: /* and on to the next buffer */
+ return(TRUE);
+ }
+
+-PASCAL NEAR strinc(source, sub) /* does source include sub? */
++PASCAL NEAR int strinc(source, sub) /* does source include sub? */
+
+ char *source; /* string to search in */
+ char *sub; /* substring to look for */
+@@ -579,12 +583,12 @@ int mflag; /* going for a meta sequence?
+
+ /* execute the startup file */
+
+-PASCAL NEAR startup(sfname)
++PASCAL NEAR int startup(sfname)
+
+ char *sfname; /* name of startup file (null if default) */
+
+ {
+- char *fname; /* resulting file name to execute */
++ CONST char *fname; /* resulting file name to execute */
+ char name[NSTRING]; /* name with extention */
+
+ /* look up the startup file */
+@@ -623,29 +627,31 @@ char *sfname; /* name of startup file (n
+ directories in table from EPATH.H
+ */
+
+-char *PASCAL NEAR flook(fname, hflag)
++CONST char *PASCAL NEAR flook(fname, hflag)
+
+-char *fname; /* base file name to search for */
++CONST char *fname; /* base file name to search for */
+ int hflag; /* Look in the HOME environment variable first? */
+
+ {
+ register char *home; /* path to home directory */
+ register char *path; /* environmental PATH variable */
+- register char *sp; /* pointer into path spec */
++ register CONST char *sp1; /* pointer into path spec */
++ register char *sp2; /* pointer into path spec */
register int i; /* index */
static char fspec[NFILEN]; /* full path spec to search */
-
+ char patha[NFILEN];
+
/* if we have an absolute path.. check only there! */
- sp = fname;
- while (*sp) {
-@@ -689,9 +690,11 @@
+- sp = fname;
+- while (*sp) {
+- if (*sp == ':' || *sp == '\\' || *sp == '/') {
++ sp1 = fname;
++ while (*sp1) {
++ if (*sp1 == ':' || *sp1 == '\\' || *sp1 == '/') {
+ if (ffropen(fname) == FIOSUC) {
+ ffclose();
+ return(fname);
+ } else
+ return(NULL);
+ }
+- ++sp;
++ ++sp1;
+ }
+
+ #if ENVFUNC
+@@ -689,25 +695,27 @@ int hflag; /* Look in the HOME environme
#if OS2
path = getenv("DPATH");
#else
@@ -25,3 +185,55 @@
if (path != NULL)
while (*path) {
Home |
Main Index |
Thread Index |
Old Index