From 5c8ffe5fa0582cd149f2da73bf44e1ba1ee34819 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 29 Aug 2017 18:36:09 +0200 Subject: [PATCH] nano: remove old patchsets and recipes. --- app-editors/nano/nano-2.2.6.recipe | 56 ----- app-editors/nano/patches/nano-2.2.6.patchset | 22 -- app-editors/nano/patches/nano-2.8.5.patchset | 218 ------------------- 3 files changed, 296 deletions(-) delete mode 100644 app-editors/nano/nano-2.2.6.recipe delete mode 100644 app-editors/nano/patches/nano-2.2.6.patchset delete mode 100644 app-editors/nano/patches/nano-2.8.5.patchset diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe deleted file mode 100644 index 021895e6d..000000000 --- a/app-editors/nano/nano-2.2.6.recipe +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY="GNU Pico clone with more functionality under the GPL license" -DESCRIPTION="nano is a simple text editor for Unix-like computing systems \ -or operating environments using a command line interface. It emulates the \ -Pico text editor, part of the Pine email client, and also provides additional \ -functionality. Features include: -- Customizable key bindings -- 'soft' line wrapping -- Full undo/redo support -- Pager support (reading from stdin) -- Warnings for un-writable files -- More syntax highlighting samples (Fortran, objC, OCaml, Makefiles)" -HOMEPAGE="http://www.nano-editor.org/" -COPYRIGHT="1999-2010 Free Software Foundation, Inc." -LICENSE="GNU GPL v3" -REVISION="3" -SOURCE_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" -CHECKSUM_SHA256="be68e133b5e81df41873d32c517b3e5950770c00fc5f4dd23810cd635abce67a" -PATCHES="nano-2.2.6.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - nano = $portVersion compat >= 2 - cmd:nano = $portVersion compat >= 2 - cmd:rnano = $portVersion compat >= 2 - " -REQUIRES=" - haiku - cmd:groff - lib:libncurses - " - -BUILD_REQUIRES=" - haiku_devel - devel:libncurses - " -BUILD_PREREQUIRES=" - cmd:autoreconf - cmd:gcc - cmd:groff - cmd:ld - cmd:libtoolize - cmd:make - " - -BUILD() -{ - autoreconf - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install -} diff --git a/app-editors/nano/patches/nano-2.2.6.patchset b/app-editors/nano/patches/nano-2.2.6.patchset deleted file mode 100644 index eb3f5435b..000000000 --- a/app-editors/nano/patches/nano-2.2.6.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 46be39445685504279a76f9eb09a961708d7e497 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Sun, 16 Jun 2013 22:50:15 +0200 -Subject: doc/Makefile.am: use docdir instead of hard-coded path - - -diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am -index fbcdce8..2d7ad47 100644 ---- a/doc/man/Makefile.am -+++ b/doc/man/Makefile.am -@@ -19,7 +19,7 @@ endif - nano_man_mans = nano.1 nanorc.5 rnano.1 - if GROFF_HTML - htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html --htmlmandir = $(datadir)/nano/man-html -+htmlmandir = $(docdir) - nano_built_sources = nano.1.html nanorc.5.html rnano.1.html - - nano.1.html: nano.1 --- -1.7.5 - diff --git a/app-editors/nano/patches/nano-2.8.5.patchset b/app-editors/nano/patches/nano-2.8.5.patchset deleted file mode 100644 index 463312be7..000000000 --- a/app-editors/nano/patches/nano-2.8.5.patchset +++ /dev/null @@ -1,218 +0,0 @@ -From ee92b9e1bec330fcf0cb7f080576054d76e0c61b Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 21 Dec 2016 22:21:56 +0000 -Subject: gcc2 patch - - -diff --git a/lib/glob.c b/lib/glob.c -index 2986add..11adb74 100644 ---- a/lib/glob.c -+++ b/lib/glob.c -@@ -189,8 +189,10 @@ convert_dirent (const struct dirent *source) - struct readdir_result result = { NULL, }; - return result; - } -+ { - struct readdir_result result = READDIR_RESULT_INITIALIZER (source); - return result; -+ } - } - - #ifndef COMPILE_GLOB64 -diff --git a/src/files.c b/src/files.c -index a90c249..535c38c 100644 ---- a/src/files.c -+++ b/src/files.c -@@ -1987,6 +1987,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, - if (method == OVERWRITE && !tmp) { - /* If we must set the filename, and it changed, adjust things. */ - if (!nonamechange && strcmp(openfile->filename, realname) != 0) { -+ char *newname; - #ifndef DISABLE_COLOR - char *oldname = openfile->syntax ? openfile->syntax->name : ""; - filestruct *line = openfile->fileage; -@@ -1998,7 +1999,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, - color_update(); - color_init(); - -- char *newname = openfile->syntax ? openfile->syntax->name : ""; -+ newname = openfile->syntax ? openfile->syntax->name : ""; - - /* If the syntax changed, discard and recompute the multidata. */ - if (strcmp(oldname, newname) != 0) { -@@ -2470,6 +2471,7 @@ char **username_tab_completion(const char *buf, size_t *num_matches, - *num_matches = 0; - - #ifdef HAVE_PWD_H -+ { - const struct passwd *userdata; - - while ((userdata = getpwent()) != NULL) { -@@ -2492,6 +2494,7 @@ char **username_tab_completion(const char *buf, size_t *num_matches, - } - } - endpwent(); -+ } - #endif - - return matches; -diff --git a/src/rcfile.c b/src/rcfile.c -index c8bb4e0..8cdf0d6 100644 ---- a/src/rcfile.c -+++ b/src/rcfile.c -@@ -878,6 +878,8 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage) - /* Parse and store the name given after a linter/formatter command. */ - void pick_up_name(const char *kind, char *ptr, char **storage) - { -+ char* p; -+ char* q; - assert(ptr != NULL); - - if (!opensyntax) { -@@ -898,8 +900,8 @@ void pick_up_name(const char *kind, char *ptr, char **storage) - *storage = NULL; - else if (*ptr == '"') { - *storage = mallocstrcpy(NULL, ++ptr); -- char* q = *storage; -- char* p = *storage; -+ q = *storage; -+ p = *storage; - /* Snip out the backslashes of escaped characters. */ - while (*p != '"') { - if (*p == '\0') { -diff --git a/src/text.c b/src/text.c -index 251a3e6..702b474 100644 ---- a/src/text.c -+++ b/src/text.c -@@ -653,11 +653,13 @@ void undo_cut(undo *u) - /* Redo a cut, or undo an uncut. */ - void redo_cut(undo *u) - { -+ filestruct *oldcutbuffer, *oldcutbottom; -+ - /* If we cut the magicline, we may as well not crash. :/ */ - if (!u->cutbuffer) - return; - -- filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom; -+ oldcutbuffer = cutbuffer; oldcutbottom = cutbottom; - cutbuffer = cutbottom = NULL; - - goto_line_posx(u->lineno, u->begin); -@@ -679,6 +681,7 @@ void do_undo(void) - undo *u = openfile->current_undo; - filestruct *f, *t = NULL; - char *data, *undidmsg = NULL; -+ filestruct *oldcutbuffer, *oldcutbottom; - - if (!u) { - statusbar(_("Nothing in undo buffer!")); -@@ -767,6 +770,7 @@ void do_undo(void) - break; - } - undidmsg = _("line break"); -+ { - size_t from_x = (u->begin == 0) ? 0 : u->mark_begin_x; - size_t to_x = (u->begin == 0) ? u->mark_begin_x : u->begin; - f->data = charealloc(f->data, strlen(f->data) + -@@ -774,6 +778,7 @@ void do_undo(void) - strcat(f->data, &u->strdata[from_x]); - unlink_node(f->next); - goto_line_posx(u->lineno, to_x); -+ } - break; - #ifdef ENABLE_COMMENT - case COMMENT: -@@ -787,7 +792,7 @@ void do_undo(void) - #endif - case INSERT: - undidmsg = _("text insert"); -- filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom; -+ oldcutbuffer = cutbuffer; oldcutbottom = cutbottom; - cutbuffer = NULL; - cutbottom = NULL; - openfile->mark_begin = fsfromline(u->mark_begin_lineno); -@@ -832,7 +837,7 @@ void do_undo(void) - /* Redo the last thing(s) we undid. */ - void do_redo(void) - { -- filestruct *f; -+ filestruct *f, *shoveline; - char *data, *redidmsg = NULL; - undo *u = openfile->undotop; - -@@ -883,7 +888,7 @@ void do_redo(void) - break; - case ENTER: - redidmsg = _("line break"); -- filestruct *shoveline = make_new_node(f); -+ shoveline = make_new_node(f); - shoveline->data = mallocstrcpy(NULL, u->strdata); - data = mallocstrncpy(NULL, f->data, u->begin + 1); - data[u->begin] = '\0'; -@@ -1405,10 +1410,11 @@ fprintf(stderr, " >> Updating... action = %d, openfile->last_action = %d, openf - if ((u->lineno == u->mark_begin_lineno && u->begin < u->mark_begin_x) - || u->lineno < u->mark_begin_lineno) { - size_t x_loc = u->begin; -+ ssize_t line; - u->begin = u->mark_begin_x; - u->mark_begin_x = x_loc; - -- ssize_t line = u->lineno; -+ line = u->lineno; - u->lineno = u->mark_begin_lineno; - u->mark_begin_lineno = line; - } else -@@ -1484,6 +1490,8 @@ bool do_wrap(filestruct *line) - /* The next line, minus indentation. */ - size_t next_line_len = 0; - /* The length of next_line. */ -+ size_t old_x; -+ filestruct * oldLine; - - /* There are three steps. First, we decide where to wrap. Then, we - * create the new wrap line. Finally, we clean up. */ -@@ -1527,8 +1535,8 @@ bool do_wrap(filestruct *line) - add_undo(SPLIT_BEGIN); - #endif - -- size_t old_x = openfile->current_x; -- filestruct * oldLine = openfile->current; -+ old_x = openfile->current_x; -+ oldLine = openfile->current; - openfile->current = line; - - /* Step 2, making the new wrap line. It will consist of indentation -diff --git a/src/winio.c b/src/winio.c -index 4511322..8e17edb 100644 ---- a/src/winio.c -+++ b/src/winio.c -@@ -2382,7 +2382,10 @@ void edit_draw(filestruct *fileptr, const char *converted, - /* The place in converted from where painting starts. */ - regmatch_t match; - /* The match positions of a single-line regex. */ -- -+ const filestruct *start_line, *end_line; -+ /* The line that matches 'end'. */ -+ regmatch_t startmatch, endmatch; -+ - /* Two notes about regexec(). A return value of zero means - * that there is a match. Also, rm_eo is the first - * non-matching character after the match. */ -@@ -2437,11 +2440,9 @@ void edit_draw(filestruct *fileptr, const char *converted, - } - - /* Second case: varnish is a multiline expression. */ -- const filestruct *start_line = fileptr->prev; -+ start_line = fileptr->prev; - /* The first line before fileptr that matches 'start'. */ -- const filestruct *end_line = fileptr; -- /* The line that matches 'end'. */ -- regmatch_t startmatch, endmatch; -+ end_line = fileptr; - /* The match positions of the start and end regexes. */ - - /* Assume nothing gets painted until proven otherwise below. */ --- -2.7.0 -