Sun Mar 28 12:28:00 2021 UTC ()
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.


(sjmulder)
diff -r1.21 -r1.22 pkgsrc/math/sc-im/Makefile
diff -r1.2 -r1.3 pkgsrc/math/sc-im/distinfo
diff -r1.1 -r1.2 pkgsrc/math/sc-im/patches/patch-src_Makefile
diff -r1.1 -r0 pkgsrc/math/sc-im/patches/patch-src_conf.c
cvs diff -r1.21 -r1.22 pkgsrc/math/sc-im/Makefile (expand / switch to unified diff)

--- pkgsrc/math/sc-im/Makefile 2020/11/05 09:08:38 1.21
+++ pkgsrc/math/sc-im/Makefile 2021/03/28 12:28:00 1.22
@@ -1,43 +1,40 @@ @@ -1,43 +1,40 @@
1# $NetBSD: Makefile,v 1.21 2020/11/05 09:08:38 ryoon Exp $ 1# $NetBSD: Makefile,v 1.22 2021/03/28 12:28:00 sjmulder Exp $
2 2
3DISTNAME= sc-im-0.7.0 3DISTNAME= sc-im-0.8.0
4PKGREVISION= 19 
5CATEGORIES= math 4CATEGORIES= math
6MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
8 7
9MAINTAINER= sjmulder@NetBSD.org 8MAINTAINER= sjmulder@NetBSD.org
10HOMEPAGE= https://github.com/andmarti1424/sc-im/ 9HOMEPAGE= https://github.com/andmarti1424/sc-im/
11COMMENT= Curses-based spreadsheet program based on sc 10COMMENT= Curses-based spreadsheet program based on sc
12LICENSE= original-bsd 11LICENSE= original-bsd
13 12
14BUILD_DIRS= src 13BUILD_DIRS= src
15INSTALL_DIRS= src 14INSTALL_DIRS= src
16 15
17.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
18 17
19# pkg-config to avoid broken Makefile self-configuration 18# pkg-config to avoid broken Makefile self-configuration
20USE_TOOLS+= gmake pkg-config yacc 19USE_TOOLS+= gmake pkg-config yacc
21 20
22# gnuplot is invoked through the shell, no need to check at compile time 21# gnuplot is invoked through the shell, no need to check at compile time
23CFLAGS+= -DGNUPLOT 22CFLAGS+= -DGNUPLOT
24 23
25MAKE_ENV+= CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncursesw:Q} 24MAKE_ENV+= CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncursesw:Q}
26MAKE_ENV+= LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q} 25MAKE_ENV+= LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q}
27MAKE_ENV+= CFLAGS_DL=${BUILDLINK_CFLAGS.dl:Q} 26MAKE_ENV+= CFLAGS_DL=${BUILDLINK_CFLAGS.dl:Q}
28MAKE_ENV+= LDLIBS_DL=${BUILDLINK_LDADD.dl:Q} 27MAKE_ENV+= LDLIBS_DL=${BUILDLINK_LDADD.dl:Q}
29MAKE_ENV+= LDLIBS=${LDLIBS:Q} 28MAKE_ENV+= LDLIBS=${LDLIBS:Q}
30 29
31# defaults to scim 
32MAKE_FLAGS+= name=sc-im 
33MAKE_FLAGS+= prefix=${PREFIX} 30MAKE_FLAGS+= prefix=${PREFIX}
34MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 31MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
35 32
36.include "../../devel/ncursesw/buildlink3.mk" 33.include "../../devel/ncursesw/buildlink3.mk"
37.include "../../mk/dlopen.buildlink3.mk" 34.include "../../mk/dlopen.buildlink3.mk"
38 35
39# Include after ncursesw bl3, otherwise ncurses bl3 (non-wide), included 36# Include after ncursesw bl3, otherwise ncurses bl3 (non-wide), included
40# as a transitive dependency of lua, sabotages the -lncurses transform. 37# as a transitive dependency of lua, sabotages the -lncurses transform.
41.include "options.mk" 38.include "options.mk"
42 39
43.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/math/sc-im/distinfo (expand / switch to unified diff)

--- pkgsrc/math/sc-im/distinfo 2019/12/26 12:32:33 1.2
+++ pkgsrc/math/sc-im/distinfo 2021/03/28 12:28:00 1.3
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.2 2019/12/26 12:32:33 sjmulder Exp $ 1$NetBSD: distinfo,v 1.3 2021/03/28 12:28:00 sjmulder Exp $
2 2
3SHA1 (sc-im-0.7.0.tar.gz) = 1e8e2ad2f9042c304f57fefb320bb18e76edd398 3SHA1 (sc-im-0.8.0.tar.gz) = a603402d0e15e642c677e43be08794f3231aa407
4RMD160 (sc-im-0.7.0.tar.gz) = 6b13e1dfd46b57dd84d4458fb8bdb509b07d1f1e 4RMD160 (sc-im-0.8.0.tar.gz) = a5684587c8e594d8df108212cbaf002c66c4b76e
5SHA512 (sc-im-0.7.0.tar.gz) = 47bc02d4b698c30a3144733216cfdf57daafb4115e5d49774104c4fedbd22f1ab7e491e1fc16683273c8c5e8820f6caf2389223c4789b9e3f777d57528b76f1b 5SHA512 (sc-im-0.8.0.tar.gz) = 616178d9ca4b169fb2849a9f8554452e39279b68507132d77007435b57e205c9f24961778e6178867b996575eaa80242de8757a9fb927e0c2d8cd63513436ec9
6Size (sc-im-0.7.0.tar.gz) = 1109887 bytes 6Size (sc-im-0.8.0.tar.gz) = 1386374 bytes
7SHA1 (patch-src_Makefile) = 2a7e56779350af57002ecddd8bec13e1b10f7ea4 7SHA1 (patch-src_Makefile) = d691b9b6de32aff4cc69807dada655cb691ee147
8SHA1 (patch-src_conf.c) = 832dc1b8883cba80fc49c023564f58509edf72c3 
cvs diff -r1.1 -r1.2 pkgsrc/math/sc-im/patches/patch-src_Makefile (expand / switch to unified diff)

--- pkgsrc/math/sc-im/patches/patch-src_Makefile 2019/01/30 12:58:24 1.1
+++ pkgsrc/math/sc-im/patches/patch-src_Makefile 2021/03/28 12:28:00 1.2
@@ -1,39 +1,37 @@ @@ -1,39 +1,37 @@
1$NetBSD: patch-src_Makefile,v 1.1 2019/01/30 12:58:24 leot Exp $ 1$NetBSD: patch-src_Makefile,v 1.2 2021/03/28 12:28:00 sjmulder Exp $
2 2
3- Fix install permissions 
4 https://github.com/andmarti1424/sc-im/pull/305 
5- Make libdl and curses flags overridable 3- Make libdl and curses flags overridable
6- Make color support opt in so we can control it 4- Make color support opt in so we can control it
7 5
8--- src/Makefile 6--- src/Makefile.orig 2021-03-18 16:42:21.000000000 +0000
9+++ src/Makefile 7+++ src/Makefile
10@@ -29,8 +29,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\" 8@@ -36,8 +36,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\"
11 CFLAGS += -DDFLT_PAGER=\"less\" 9 CFLAGS += -DDFLT_PAGER=\"less\"
12 # Sets default editor. Its use in case EDITOR env variable is not set 10 # Sets default editor. Its use in case EDITOR env variable is not set
13 CFLAGS += -DDFLT_EDITOR=\"vim\" 11 CFLAGS += -DDFLT_EDITOR=\"vim\"
14-# Comment out to disable color support 12-# Comment out to disable color support
15-CFLAGS += -DUSECOLORS 13-CFLAGS += -DUSECOLORS
16+# Uncomment to enable color support 14+# Uncomment to enable color support
17+#CFLAGS += -DUSECOLORS 15+#CFLAGS += -DUSECOLORS
18 # Command history file, relative to home directory. Comment out to disable commandline history 16 # Command history file, relative to HISTORY_DIR directory. Comment out to disable commandline history
19 CFLAGS += -DHISTORY_FILE=\".$(name)info\" 17 CFLAGS += -DHISTORY_FILE=\"$(HISTORY_FILE)\" -DHISTORY_DIR=\"$(HISTORY_DIR)\"
20 # Input mode history. Same as previous, but for insert mode commands 18 # Configuration file, relative to CONFIG_DIR directory
21@@ -89,25 +89,27 @@ endif 19@@ -107,25 +107,27 @@ endif
22  20
23 # dynamic linking (should not be used in FreeBSD 21 # dynamic linking (not available in BSD)
24 ifneq ($(shell uname -s),FreeBSD) 22 ifneq ($(shell uname -s | grep -o BSD),BSD)
25- LDLIBS += -ldl 23- LDLIBS += -ldl
26+ LDLIBS_DL ?= -ldl 24+ LDLIBS_DL += -ldl
27 endif 25 endif
28  26
29+LDLIBS += $(LDLIBS_DL) 27+LDLIBS += $(LDLIBS_DL)
30+ 28+
31 ifneq (, $(shell which pkg-config)) 29 ifneq (, $(shell which pkg-config))
32 # Any system with pkg-config 30 # Any system with pkg-config
33  31
34 # NOTE: ncursesw (required) 32 # NOTE: ncursesw (required)
35 ifeq ($(shell uname -s),Darwin) 33 ifeq ($(shell uname -s),Darwin)
36 # macOS' ncurses is built with wide-char support 34 # macOS' ncurses is built with wide-char support
37- LDFLAGS += -lncurses 35- LDFLAGS += -lncurses
38+ LDLIBS_CURSES ?= -lncurses 36+ LDLIBS_CURSES ?= -lncurses
39 else ifneq ($(shell pkg-config --exists ncursesw || echo 'no'),no) 37 else ifneq ($(shell pkg-config --exists ncursesw || echo 'no'),no)
@@ -43,38 +41,43 @@ $NetBSD: patch-src_Makefile,v 1.1 2019/0 @@ -43,38 +41,43 @@ $NetBSD: patch-src_Makefile,v 1.1 2019/0
43+ LDLIBS_CURSES ?= $(shell pkg-config --libs ncursesw) 41+ LDLIBS_CURSES ?= $(shell pkg-config --libs ncursesw)
44 else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no) 42 else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no)
45 # hopefully this includes wide character support then 43 # hopefully this includes wide character support then
46- CFLAGS += $(shell pkg-config --cflags ncurses) 44- CFLAGS += $(shell pkg-config --cflags ncurses)
47- LDLIBS += $(shell pkg-config --libs ncurses) 45- LDLIBS += $(shell pkg-config --libs ncurses)
48+ CFLAGS_CURSES ?= $(shell pkg-config --cflags ncurses) 46+ CFLAGS_CURSES ?= $(shell pkg-config --cflags ncurses)
49+ LDLIBS_CURSES ?= $(shell pkg-config --libs ncurses) 47+ LDLIBS_CURSES ?= $(shell pkg-config --libs ncurses)
50 else 48 else
51- LDLIBS += -lncursesw 49- LDLIBS += -lncursesw
52+ LDLIBS_CURSES ?= -lncursesw 50+ LDLIBS_CURSES ?= -lncursesw
53 endif 51 endif
54  52
55 # NOTE: libxml and libzip are required for xlsx file import support 53 # NOTE: libxml and libzip are required for xlsx file import support
56@@ -128,9 +130,12 @@ else ifeq ($(shell uname -s),Darwin) 54@@ -150,21 +152,24 @@ else ifeq ($(shell uname -s),Darwin)
57 # macOS without pkg-config 55 # macOS without pkg-config
58  56
59 # macOS' ncurses is built with wide-char support 57 # macOS' ncurses is built with wide-char support
60- LDFLAGS += -lncurses 58- LDFLAGS += -lncurses
61+ LDLIBS_CURSES += -lncurses 59+ LDLIBS_CURSES += -lncurses
 60 else ifeq ($(shell uname -s),NetBSD)
 61 # NetBSD without pkg-config
 62
 63- CFLAGS += -I/usr/pkg/include
 64- CFLAGS += -I/usr/pkg/include/ncursesw
 65+ CFLAGS += -I/usr/pkg/include
 66+ CFLAGS_CURSES += -I/usr/pkg/include/ncursesw
 67
 68 LDFLAGS += -L/usr/pkg/lib
 69 LDFLAGS += -Wl,-R/usr/pkg/lib
 70
 71- LDLIBS += -lncursesw
 72+ LDLIBS_CURSES += -lncursesw
 73 else
 74- LDFLAGS += -lncursesw
 75+ LDLIBS_CURSES += -lncursesw
62 endif 76 endif
63  77
64+CFLAGS += $(CFLAGS_CURSES) 78+CFLAGS += $(CFLAGS_CURSES)
65+LDLIBS += $(LDLIBS_CURSES) 79+LDLIBS += $(LDLIBS_CURSES)
66+ 80+
67 OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o 81 OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o
68  82
69 .PHONY : all clean install docs man_install man_uninstall 83 .PHONY : all clean install docs man_install man_uninstall
70@@ -141,8 +146,8 @@ install : 
71 install -d $(DESTDIR)$(prefix)/bin 
72 install $(name) $(DESTDIR)$(prefix)/bin/$(name) 
73 install -d $(DESTDIR)$(HELPDIR) 
74- install doc $(DESTDIR)$(HELPDIR)/$(name)_help 
75- install plot_* $(DESTDIR)$(HELPDIR)/ 
76+ install -m 644 doc $(DESTDIR)$(HELPDIR)/$(name)_help 
77+ install -m 644 plot_* $(DESTDIR)$(HELPDIR)/ 
78 install -d $(DESTDIR)$(MANDIR)/ 
79 install -m 644 sc-im.1 $(DESTDIR)$(MANDIR)/$(name).1 
80  
File Deleted: pkgsrc/math/sc-im/patches/Attic/patch-src_conf.c