Index: head/math/sc-im/Makefile =================================================================== --- head/math/sc-im/Makefile (revision 569135) +++ head/math/sc-im/Makefile (revision 569136) @@ -1,33 +1,31 @@ # $FreeBSD$ PORTNAME= sc-im DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0-81 -DISTVERSIONSUFFIX= -g9beb5c0 -PORTREVISION= 1 +DISTVERSION= 0.8.0 CATEGORIES= math MAINTAINER= bapt@FreeBSD.org COMMENT= Ncurses spreadsheet program for terminal LICENSE= BSD4CLAUSE LIB_DEPENDS= libxlsreader.so:math/libxls \ libxlsxwriter.so:math/libxlsxwriter \ libzip.so:archivers/libzip USES= compiler:c11 gmake gnome lua:51 ncurses pkgconfig USE_GITHUB= yes GH_ACCOUNT= andmarti1424 USE_GNOME= libxml2 WRKSRC_SUBDIR= src CFLAGS+= -DXLSX_EXPORT -DXLS LIBS+= -lxlsreader -lxlsxwriter MAKE_ENV+= LDLIBS="${LIBS}" MAKE_ARGS+= CC="${CC}" prefix="${PREFIX}" MANDIR="${MANPREFIX}/man/man1" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sc-im .include Index: head/math/sc-im/distinfo =================================================================== --- head/math/sc-im/distinfo (revision 569135) +++ head/math/sc-im/distinfo (revision 569136) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557829056 -SHA256 (andmarti1424-sc-im-v0.7.0-81-g9beb5c0_GH0.tar.gz) = 70aecca365ae382c05088c6fb40736cc1046c62e1ef8868fb2dc72f126b1f5b3 -SIZE (andmarti1424-sc-im-v0.7.0-81-g9beb5c0_GH0.tar.gz) = 1114554 +TIMESTAMP = 1616600730 +SHA256 (andmarti1424-sc-im-v0.8.0_GH0.tar.gz) = edc9b9d2dc5ac37c31a46462a1387605983149a1abba00d47ac22f2726ce6d27 +SIZE (andmarti1424-sc-im-v0.8.0_GH0.tar.gz) = 1386374 Index: head/math/sc-im/files/patch-color.h =================================================================== --- head/math/sc-im/files/patch-color.h (revision 569135) +++ head/math/sc-im/files/patch-color.h (nonexistent) @@ -1,11 +0,0 @@ ---- color.h.orig 2019-02-22 18:41:46 UTC -+++ color.h -@@ -57,7 +57,7 @@ struct ucolor { - int blink; - }; - --struct ucolor ucolors[N_INIT_PAIRS]; -+extern struct ucolor ucolors[N_INIT_PAIRS]; - - struct dictionary * get_d_colors_param(); - void start_default_ucolors(); Property changes on: head/math/sc-im/files/patch-color.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-input.c =================================================================== --- head/math/sc-im/files/patch-input.c (revision 569135) +++ head/math/sc-im/files/patch-input.c (nonexistent) @@ -1,10 +0,0 @@ ---- input.c.orig 2019-02-22 18:41:46 UTC -+++ input.c -@@ -64,7 +64,6 @@ static int d; // char read from stdin - int return_value; // return value of getch() - int cmd_multiplier = 0; // Multiplier - int cmd_pending = 0; // Command pending --int shall_quit; // Break loop if ESC key is pressed - - /** - * \brief Reads stdin for a valid command Property changes on: head/math/sc-im/files/patch-input.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-filter.c =================================================================== --- head/math/sc-im/files/patch-filter.c (revision 569135) +++ head/math/sc-im/files/patch-filter.c (nonexistent) @@ -1,11 +0,0 @@ ---- filter.c.orig 2019-02-22 18:41:46 UTC -+++ filter.c -@@ -61,6 +61,8 @@ static int howmany = 0; /**< how many filters wer - static int active = 0; /**< indicates if those filters are applied or not */ - static int * results = NULL; /**< this keeps the results of the applied filters */ - -+static struct filter_item * filters = NULL; -+ - /** - * \brief Add a filter to filters structure - * Property changes on: head/math/sc-im/files/patch-filter.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-cmds__command.c =================================================================== --- head/math/sc-im/files/patch-cmds__command.c (revision 569135) +++ head/math/sc-im/files/patch-cmds__command.c (nonexistent) @@ -1,20 +0,0 @@ ---- cmds_command.c.orig 2019-02-22 18:41:46 UTC -+++ cmds_command.c -@@ -81,7 +81,7 @@ extern char * rev; - extern struct dictionary * user_conf_d; - - wchar_t inputline[BUFFERSIZE]; --wchar_t interp_line[BUFFERSIZE]; -+extern wchar_t interp_line[BUFFERSIZE]; - int inputline_pos; /**< Position in window. Some chars has 2 chars width */ - // see https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms - int real_inputline_pos; /**< Real position in inputline */ -@@ -853,7 +853,7 @@ void do_commandmode(struct block * sb) { - exec_cmd(line); - - } else if ( inputline[0] == L'w' ) { -- if (savefile() == 0 && ! wcscmp(inputline, L"wq")) shall_quit = 1; -+ if (savefile() == 0 && ! wcsncmp(inputline, L"wq", 2)) shall_quit = 1; - - } else if ( ! wcsncmp(inputline, L"file ", 5) ) { - Property changes on: head/math/sc-im/files/patch-cmds__command.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-cmds__normal.c =================================================================== --- head/math/sc-im/files/patch-cmds__normal.c (revision 569135) +++ head/math/sc-im/files/patch-cmds__normal.c (nonexistent) @@ -1,11 +0,0 @@ ---- cmds_normal.c.orig 2019-02-22 18:41:46 UTC -+++ cmds_normal.c -@@ -70,7 +70,7 @@ extern int cmd_multiplier; - extern void start_visualmode(int tlrow, int tlcol, int brrow, int brcol); - extern void ins_in_line(wint_t d); - --wchar_t interp_line[BUFFERSIZE]; -+extern wchar_t interp_line[BUFFERSIZE]; - - #ifdef HISTORY_FILE - extern struct history * commandline_history; Property changes on: head/math/sc-im/files/patch-cmds__normal.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-tui.c =================================================================== --- head/math/sc-im/files/patch-tui.c (revision 569135) +++ head/math/sc-im/files/patch-tui.c (nonexistent) @@ -1,10 +0,0 @@ ---- tui.c.orig 2020-09-02 08:06:29 UTC -+++ tui.c -@@ -102,7 +102,6 @@ WINDOW * main_win; - WINDOW * input_win; - SCREEN * sstderr; - SCREEN * sstdout; --srange * ranges; - - /** - * \brief Called to start UI Property changes on: head/math/sc-im/files/patch-tui.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-file.c =================================================================== --- head/math/sc-im/files/patch-file.c (revision 569135) +++ head/math/sc-im/files/patch-file.c (nonexistent) @@ -1,46 +0,0 @@ ---- file.c.orig 2019-05-11 16:23:57 UTC -+++ file.c -@@ -189,21 +189,23 @@ int modcheck() { - - int savefile() { - int force_rewrite = 0; -+ int shall_quit = 0; - char name[BUFFERSIZE]; - #ifndef NO_WORDEXP - size_t len; - wordexp_t p; - #endif - -- if (! curfile[0] && wcslen(inputline) < 3) { // casos ":w" ":w!" ":x" ":x!" -+ if (! curfile[0] && wcslen(inputline) < 3) { // casos ":w" ":w!" ":wq" ":x" ":x!" - sc_error("There is no filename"); - return -1; - } - - if (inputline[1] == L'!') force_rewrite = 1; -+ if (inputline[1] == L'q') shall_quit = 1; - - wcstombs(name, inputline, BUFFERSIZE); -- del_range_chars(name, 0, 1 + force_rewrite); -+ del_range_chars(name, 0, 1 + force_rewrite + shall_quit); - - #ifndef NO_WORDEXP - wordexp(name, &p, 0); -@@ -221,7 +223,7 @@ int savefile() { - #endif - - if (! force_rewrite && file_exists(name)) { -- sc_error("File already exists. Use \"!\" to force rewrite."); -+ sc_error("File already exists. Use \"w!\" to force rewrite."); - return -1; - } - -@@ -235,7 +237,7 @@ int savefile() { - // if it exists and no '!' is set, return. - if (!strlen(curfile) && backup_exists(name)) { - if (!force_rewrite) { -- sc_error("Backup file of %s exists. Use \"!\" to force the write process.", name); -+ sc_error("Backup file of %s exists. Use \"w!\" to force the write process.", name); - return -1; - } else remove_backup(name); - } Property changes on: head/math/sc-im/files/patch-file.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-filter.h =================================================================== --- head/math/sc-im/files/patch-filter.h (revision 569135) +++ head/math/sc-im/files/patch-filter.h (nonexistent) @@ -1,11 +0,0 @@ ---- filter.h.orig 2019-02-22 18:41:46 UTC -+++ filter.h -@@ -44,7 +44,7 @@ - - struct filter_item { - char * eval; --} * filters; -+}; - - void show_filters(); - void add_filter(char * criteria); Property changes on: head/math/sc-im/files/patch-filter.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-color.c =================================================================== --- head/math/sc-im/files/patch-color.c (revision 569135) +++ head/math/sc-im/files/patch-color.c (nonexistent) @@ -1,11 +0,0 @@ ---- color.c.orig 2019-02-22 18:41:46 UTC -+++ color.c -@@ -60,6 +60,8 @@ - #include "conf.h" - #include "cmds.h" - -+struct ucolor ucolors[N_INIT_PAIRS] = {}; -+ - static struct dictionary * d_colors_param = NULL; - - struct dictionary * get_d_colors_param() { Property changes on: head/math/sc-im/files/patch-color.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-cmds__visual.c =================================================================== --- head/math/sc-im/files/patch-cmds__visual.c (revision 569135) +++ head/math/sc-im/files/patch-cmds__visual.c (nonexistent) @@ -1,11 +0,0 @@ ---- cmds_visual.c.orig 2019-02-22 18:41:46 UTC -+++ cmds_visual.c -@@ -440,7 +440,7 @@ void do_visualmode(struct block * buf) { - sc_error("Locked cells encountered. Nothing changed"); - return; - } -- wchar_t interp_line[BUFFERSIZE]; -+ extern wchar_t interp_line[BUFFERSIZE]; - if (buf->value == L'{') swprintf(interp_line, BUFFERSIZE, L"leftjustify %s", v_name(r->tlrow, r->tlcol)); - else if (buf->value == L'}') swprintf(interp_line, BUFFERSIZE, L"rightjustify %s", v_name(r->tlrow, r->tlcol)); - else if (buf->value == L'|') swprintf(interp_line, BUFFERSIZE, L"center %s", v_name(r->tlrow, r->tlcol)); Property changes on: head/math/sc-im/files/patch-cmds__visual.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/sc-im/files/patch-cmds.c =================================================================== --- head/math/sc-im/files/patch-cmds.c (revision 569135) +++ head/math/sc-im/files/patch-cmds.c (nonexistent) @@ -1,11 +0,0 @@ ---- cmds.c.orig 2019-02-22 18:41:46 UTC -+++ cmds.c -@@ -65,7 +65,7 @@ - #endif - - void syncref(register struct enode *e); --extern unsigned int shall_quit; -+extern int shall_quit; - char insert_edit_submode; - struct ent * freeents = NULL; // keep deleted ents around before sync_refs - wchar_t interp_line[BUFFERSIZE]; Property changes on: head/math/sc-im/files/patch-cmds.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property