From e6e449388d2a9599a03eaf3e13b240c61f6cb319 Mon Sep 17 00:00:00 2001 From: sjmulder Date: Sun, 28 Mar 2021 12:28:00 +0000 Subject: [PATCH] math/sc-im: Update to 0.8.0 Packaging changes: - Some patches got upstreamed - Upstream now defaults to name=sc-im so it no longer needs to be set Changes, (reformatted) from the official changelog: New features: - New motions in edit mode: df cf F dF cF d0 d$ c0 c$ t T dt dT ct cT ^ g_ d^ dg_ c^ cg_ - Simple mouse support. Can handle selection of single cells and scroll. - Added markdown export. - Add custom colors with RGB definitions. - Add support for italic attribute to be appled to cells. - Added digraphs. - Added EXECUTE command. - Added --export_csv --export_tab --export_txt parameters. - New input_bar_bottom config variable. - New underline_grid config variable. - Added filename in status bar (filename_with_mode config variable). - Added option to truncate cells. - Added xlsx sheet parameter. - New @fact function. Other: - modified config and history file locations - renamed winch to sig_winch. - current fg and bg colors are kept if they are not specified in :cellcolor. - OpenBSD support (mostly wordexp() workaround) - Correct lua api function names in doc - always generate backup file when opening file - renamed scim to sc-im in Makefile - Document trigger return value convention Issues fixed: - fix bug when deleting an ent that for instance has a @sum()... it used to remove its vertex and THE ENTS LINKED to THEM! - fix error messages when using "scim --version" and color definitions are intented to be applied from .scimrc. - fix in waiting for valid command to complete after pressing ESC key. - fix in parse_str so a word with white space can be stored in dictionary value - fix when setting default_paste_from_clipboard_cmd - Don't clobber startup message w/ err opening file - Allow for lua scripts in local .sc directory #259 - Send informational messages to stderr rather than the output when used in non-interactive mode #263 - fixed cell_negative color #271 - fixed locked cells when saving #261 - fixed DEL key in insert mode #272 - fix when resizing column #266 - "Autobackup - case insensitive QER options when backup exists" - fixed segfault when fcopy'ing with no selection while on first column - Call write triggers on value clear - Use sc_info to report trigger exit code - fixed #277 - Grow table up to MAXROWS exactly - Remove redundant if clause (God only knows where that was). - fix in getVertex that prevented rebuild_graph to work properly. - fix annoying bug because of not resetting inputline_pos to 0 when confirming a command in COMMAND_MODE - fix in let and slet. existing vertexs should not be removed. - added "eval_visited" in vertex struct for not to collide with current "visited", since: EvalAll uses EvalBottomUp EvalBottomUp uses EvalJustOneVertex EvalJustOneVertex uses eval eval uses GraphAddEdge GraphAddEdge uses GraphIsReachable GraphIsReachable uses visited and EvalBottomUp also uses uses visited! - Also changed markAllVerticesNotVisited and All_vertexs_of_edges_visited functions. - Some other issues fixed: #228, #234, #239, #240, #244, #246, #260, #295, #308 - .. and many other fixes and improvements! Pending: The most significative issue is regarding circular references. This have to be deeply analyzed and with the collaboration of the community it would be hopefully fixed by v0.9. --- math/sc-im/Makefile | 7 ++-- math/sc-im/distinfo | 13 ++++--- math/sc-im/patches/patch-src_Makefile | 51 ++++++++++++++------------- math/sc-im/patches/patch-src_conf.c | 17 --------- 4 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 math/sc-im/patches/patch-src_conf.c diff --git a/math/sc-im/Makefile b/math/sc-im/Makefile index d5aaac5fbfa7..3176297b53a1 100644 --- a/math/sc-im/Makefile +++ b/math/sc-im/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2020/11/05 09:08:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2021/03/28 12:28:00 sjmulder Exp $ -DISTNAME= sc-im-0.7.0 -PKGREVISION= 19 +DISTNAME= sc-im-0.8.0 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -28,8 +27,6 @@ MAKE_ENV+= CFLAGS_DL=${BUILDLINK_CFLAGS.dl:Q} MAKE_ENV+= LDLIBS_DL=${BUILDLINK_LDADD.dl:Q} MAKE_ENV+= LDLIBS=${LDLIBS:Q} -# defaults to scim -MAKE_FLAGS+= name=sc-im MAKE_FLAGS+= prefix=${PREFIX} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 diff --git a/math/sc-im/distinfo b/math/sc-im/distinfo index 60e15e192fbb..cf78bdfe7e71 100644 --- a/math/sc-im/distinfo +++ b/math/sc-im/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2019/12/26 12:32:33 sjmulder Exp $ +$NetBSD: distinfo,v 1.3 2021/03/28 12:28:00 sjmulder Exp $ -SHA1 (sc-im-0.7.0.tar.gz) = 1e8e2ad2f9042c304f57fefb320bb18e76edd398 -RMD160 (sc-im-0.7.0.tar.gz) = 6b13e1dfd46b57dd84d4458fb8bdb509b07d1f1e -SHA512 (sc-im-0.7.0.tar.gz) = 47bc02d4b698c30a3144733216cfdf57daafb4115e5d49774104c4fedbd22f1ab7e491e1fc16683273c8c5e8820f6caf2389223c4789b9e3f777d57528b76f1b -Size (sc-im-0.7.0.tar.gz) = 1109887 bytes -SHA1 (patch-src_Makefile) = 2a7e56779350af57002ecddd8bec13e1b10f7ea4 -SHA1 (patch-src_conf.c) = 832dc1b8883cba80fc49c023564f58509edf72c3 +SHA1 (sc-im-0.8.0.tar.gz) = a603402d0e15e642c677e43be08794f3231aa407 +RMD160 (sc-im-0.8.0.tar.gz) = a5684587c8e594d8df108212cbaf002c66c4b76e +SHA512 (sc-im-0.8.0.tar.gz) = 616178d9ca4b169fb2849a9f8554452e39279b68507132d77007435b57e205c9f24961778e6178867b996575eaa80242de8757a9fb927e0c2d8cd63513436ec9 +Size (sc-im-0.8.0.tar.gz) = 1386374 bytes +SHA1 (patch-src_Makefile) = d691b9b6de32aff4cc69807dada655cb691ee147 diff --git a/math/sc-im/patches/patch-src_Makefile b/math/sc-im/patches/patch-src_Makefile index 8521482458df..92db4a9bc7dd 100644 --- a/math/sc-im/patches/patch-src_Makefile +++ b/math/sc-im/patches/patch-src_Makefile @@ -1,13 +1,11 @@ -$NetBSD: patch-src_Makefile,v 1.1 2019/01/30 12:58:24 leot Exp $ +$NetBSD: patch-src_Makefile,v 1.2 2021/03/28 12:28:00 sjmulder Exp $ -- Fix install permissions - https://github.com/andmarti1424/sc-im/pull/305 - Make libdl and curses flags overridable - Make color support opt in so we can control it ---- src/Makefile +--- src/Makefile.orig 2021-03-18 16:42:21.000000000 +0000 +++ src/Makefile -@@ -29,8 +29,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\" +@@ -36,8 +36,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\" CFLAGS += -DDFLT_PAGER=\"less\" # Sets default editor. Its use in case EDITOR env variable is not set CFLAGS += -DDFLT_EDITOR=\"vim\" @@ -15,15 +13,15 @@ $NetBSD: patch-src_Makefile,v 1.1 2019/01/30 12:58:24 leot Exp $ -CFLAGS += -DUSECOLORS +# Uncomment to enable color support +#CFLAGS += -DUSECOLORS - # Command history file, relative to home directory. Comment out to disable commandline history - CFLAGS += -DHISTORY_FILE=\".$(name)info\" - # Input mode history. Same as previous, but for insert mode commands -@@ -89,25 +89,27 @@ endif + # Command history file, relative to HISTORY_DIR directory. Comment out to disable commandline history + CFLAGS += -DHISTORY_FILE=\"$(HISTORY_FILE)\" -DHISTORY_DIR=\"$(HISTORY_DIR)\" + # Configuration file, relative to CONFIG_DIR directory +@@ -107,25 +107,27 @@ endif - # dynamic linking (should not be used in FreeBSD - ifneq ($(shell uname -s),FreeBSD) + # dynamic linking (not available in BSD) + ifneq ($(shell uname -s | grep -o BSD),BSD) - LDLIBS += -ldl -+ LDLIBS_DL ?= -ldl ++ LDLIBS_DL += -ldl endif +LDLIBS += $(LDLIBS_DL) @@ -53,12 +51,28 @@ $NetBSD: patch-src_Makefile,v 1.1 2019/01/30 12:58:24 leot Exp $ endif # NOTE: libxml and libzip are required for xlsx file import support -@@ -128,9 +130,12 @@ else ifeq ($(shell uname -s),Darwin) +@@ -150,21 +152,24 @@ else ifeq ($(shell uname -s),Darwin) # macOS without pkg-config # macOS' ncurses is built with wide-char support - LDFLAGS += -lncurses + LDLIBS_CURSES += -lncurses + else ifeq ($(shell uname -s),NetBSD) + # NetBSD without pkg-config + +- CFLAGS += -I/usr/pkg/include +- CFLAGS += -I/usr/pkg/include/ncursesw ++ CFLAGS += -I/usr/pkg/include ++ CFLAGS_CURSES += -I/usr/pkg/include/ncursesw + + LDFLAGS += -L/usr/pkg/lib + LDFLAGS += -Wl,-R/usr/pkg/lib + +- LDLIBS += -lncursesw ++ LDLIBS_CURSES += -lncursesw + else +- LDFLAGS += -lncursesw ++ LDLIBS_CURSES += -lncursesw endif +CFLAGS += $(CFLAGS_CURSES) @@ -67,14 +81,3 @@ $NetBSD: patch-src_Makefile,v 1.1 2019/01/30 12:58:24 leot Exp $ OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o .PHONY : all clean install docs man_install man_uninstall -@@ -141,8 +146,8 @@ install : - install -d $(DESTDIR)$(prefix)/bin - install $(name) $(DESTDIR)$(prefix)/bin/$(name) - install -d $(DESTDIR)$(HELPDIR) -- install doc $(DESTDIR)$(HELPDIR)/$(name)_help -- install plot_* $(DESTDIR)$(HELPDIR)/ -+ install -m 644 doc $(DESTDIR)$(HELPDIR)/$(name)_help -+ install -m 644 plot_* $(DESTDIR)$(HELPDIR)/ - install -d $(DESTDIR)$(MANDIR)/ - install -m 644 sc-im.1 $(DESTDIR)$(MANDIR)/$(name).1 - diff --git a/math/sc-im/patches/patch-src_conf.c b/math/sc-im/patches/patch-src_conf.c deleted file mode 100644 index fa34794fc3f0..000000000000 --- a/math/sc-im/patches/patch-src_conf.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_conf.c,v 1.1 2019/12/25 17:34:11 sjmulder Exp $ - -Fix build on Solaris-likes which don't have tm_gmtoff. - ---- src/conf.c.orig 2017-12-13 17:48:59.000000000 +0000 -+++ src/conf.c -@@ -98,8 +98,8 @@ void store_default_config_values() { - put(user_conf_d, "default_paste_from_clipboard_cmd", ""); - #endif - -- // we calc get gmtoffset -- #ifdef USELOCALE -+ // Calculate GMT offset (not on Solaris, doesn't have tm_gmtoff) -+ #if defined(USELOCALE) && !defined(__sun) - time_t t = time(NULL); - struct tm * lt = localtime(&t); - char strgmtoff[7];