diff --git a/math/sc-im/Makefile b/math/sc-im/Makefile index be832d9a5114..37c518e7a205 100644 --- a/math/sc-im/Makefile +++ b/math/sc-im/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2021/07/26 01:03:28 sjmulder Exp $ +# $NetBSD: Makefile,v 1.27 2021/07/26 01:38:05 sjmulder Exp $ -DISTNAME= sc-im-0.8.0 -PKGREVISION= 3 +DISTNAME= sc-im-0.8.2 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/math/sc-im/PLIST b/math/sc-im/PLIST index 256b00f1e802..2a4f039d8493 100644 --- a/math/sc-im/PLIST +++ b/math/sc-im/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2019/01/30 12:58:24 leot Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/07/26 01:38:05 sjmulder Exp $ bin/sc-im +bin/scopen man/man1/sc-im.1 share/sc-im/plot_bar share/sc-im/plot_line diff --git a/math/sc-im/distinfo b/math/sc-im/distinfo index cf78bdfe7e71..29416f19534b 100644 --- a/math/sc-im/distinfo +++ b/math/sc-im/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2021/03/28 12:28:00 sjmulder Exp $ +$NetBSD: distinfo,v 1.4 2021/07/26 01:38:05 sjmulder Exp $ -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 +SHA1 (sc-im-0.8.2.tar.gz) = 3dde8f1e4d95e7b6e121cbdfa680955773a6eedd +RMD160 (sc-im-0.8.2.tar.gz) = afabf063feda1800fd07e6ee13b4036c7d5a200f +SHA512 (sc-im-0.8.2.tar.gz) = ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c +Size (sc-im-0.8.2.tar.gz) = 1619617 bytes +SHA1 (patch-src_Makefile) = a8775db5d5a91cb1ee53946e4eff4fe3390a9dc5 diff --git a/math/sc-im/patches/patch-src_Makefile b/math/sc-im/patches/patch-src_Makefile index 92db4a9bc7dd..baee84fe1479 100644 --- a/math/sc-im/patches/patch-src_Makefile +++ b/math/sc-im/patches/patch-src_Makefile @@ -1,22 +1,21 @@ -$NetBSD: patch-src_Makefile,v 1.2 2021/03/28 12:28:00 sjmulder Exp $ +$NetBSD: patch-src_Makefile,v 1.3 2021/07/26 01:38:05 sjmulder Exp $ - Make libdl and curses flags overridable - Make color support opt in so we can control it +- Remove hardcoded paths for NetBSD ---- src/Makefile.orig 2021-03-18 16:42:21.000000000 +0000 +--- src/Makefile.orig 2021-05-13 17:38:26.000000000 +0000 +++ src/Makefile -@@ -36,8 +36,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\" - CFLAGS += -DDFLT_PAGER=\"less\" +@@ -37,7 +37,7 @@ CFLAGS += -DDFLT_PAGER=\"less\" # Sets default editor. Its use in case EDITOR env variable is not set CFLAGS += -DDFLT_EDITOR=\"vim\" --# Comment out to disable color support + # Comment out to disable color support -CFLAGS += -DUSECOLORS -+# Uncomment to enable color support +#CFLAGS += -DUSECOLORS # 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 +@@ -94,25 +94,27 @@ endif # dynamic linking (not available in BSD) ifneq ($(shell uname -s | grep -o BSD),BSD) @@ -50,26 +49,23 @@ $NetBSD: patch-src_Makefile,v 1.2 2021/03/28 12:28:00 sjmulder Exp $ + LDLIBS_CURSES ?= -lncursesw endif - # NOTE: libxml and libzip are required for xlsx file import support -@@ -150,21 +152,24 @@ else ifeq ($(shell uname -s),Darwin) + # NOTE: libxlsreader (libxls) is required for xls file reading support +@@ -153,21 +155,14 @@ 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 - +-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 - +- +- LDFLAGS += -L/usr/pkg/lib +- LDFLAGS += -Wl,-R/usr/pkg/lib +- - LDLIBS += -lncursesw -+ LDLIBS_CURSES += -lncursesw ++ LDLIBS_CURSES += -lncurses else - LDFLAGS += -lncursesw + LDLIBS_CURSES += -lncursesw