sc-im: Remove, imported in pkgsrc as math/sc-im

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: sc-im: Remove, imported in pkgsrc as math/sc-im
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Wed, 30 Jan 2019 13:01:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Jan 30 14:01:42 2019 +0100
Changeset:	d1e57cbc950ed32f6f757e4e91abba9de0132205

Modified Files:
	Makefile
Removed Files:
	sc-im/DESCR
	sc-im/Makefile
	sc-im/PLIST
	sc-im/TODO
	sc-im/distinfo
	sc-im/options.mk
	sc-im/patches/patch-src_Makefile

Log Message:
sc-im: Remove, imported in pkgsrc as math/sc-im

Thanks to Sijmen for packaging it!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d1e57cbc950ed32f6f757e4e91abba9de0132205

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                         |  1 -
 sc-im/DESCR                      |  2 -
 sc-im/Makefile                   | 38 -------------------
 sc-im/PLIST                      |  8 ----
 sc-im/TODO                       | 21 -----------
 sc-im/distinfo                   |  7 ----
 sc-im/options.mk                 | 23 ------------
 sc-im/patches/patch-src_Makefile | 80 ----------------------------------------
 8 files changed, 180 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 6d6bc67ac4..c1de7a9a89 100644
--- a/Makefile
+++ b/Makefile
@@ -4211,7 +4211,6 @@ SUBDIR+=	samtools0119
 SUBDIR+=	sara
 SUBDIR+=	sarf
 SUBDIR+=	sbcl-git
-SUBDIR+=	sc-im
 SUBDIR+=	scantailor
 SUBDIR+=	scare
 SUBDIR+=	schismtracker
diff --git a/sc-im/DESCR b/sc-im/DESCR
deleted file mode 100644
index d88607dd43..0000000000
--- a/sc-im/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-'SC Improved', a curses-based spreadsheet program based on sc.  New features
-include undo and redo, colors, sorting, plotting and XLS[X] support.
diff --git a/sc-im/Makefile b/sc-im/Makefile
deleted file mode 100644
index dc58406ae9..0000000000
--- a/sc-im/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	sc-im-0.7.0
-CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GITHUB:=andmarti1424/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	ik%sjmulder.nl@localhost
-HOMEPAGE=	https://github.com/andmarti1424/sc-im/
-COMMENT=	Curses-based spreadsheet program based on sc
-LICENSE=	original-bsd
-
-BUILD_DIRS=	src
-INSTALL_DIRS=	src
-
-.include "../../mk/bsd.prefs.mk"
-
-# pkg-config to avoid broken Makefile self-configuration
-USE_TOOLS+=	gmake pkg-config yacc
-
-# gnuplot is invoked through the shell, no need to check at compile time
-CFLAGS+=	-DGNUPLOT
-
-MAKE_ENV+=	CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncursesw:Q}
-MAKE_ENV+=	LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q}
-MAKE_ENV+=	CFLAGS_DL=${BUILDLINK_CFLAGS.dl:Q}
-MAKE_ENV+=	LDLIBS_DL=${BUILDLINK_LDADD.dl:Q}
-
-# defaults to scim
-MAKE_FLAGS+=	name=sc-im
-MAKE_FLAGS+=	prefix=${PREFIX}
-MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
-
-.include "options.mk"
-
-.include "../../devel/ncursesw/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sc-im/PLIST b/sc-im/PLIST
deleted file mode 100644
index 0495d94e48..0000000000
--- a/sc-im/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD$
-bin/sc-im
-man/man1/sc-im.1
-share/sc-im/plot_bar
-share/sc-im/plot_line
-share/sc-im/plot_pie
-share/sc-im/plot_scatter
-share/sc-im/sc-im_help
diff --git a/sc-im/TODO b/sc-im/TODO
deleted file mode 100644
index 9496b8854c..0000000000
--- a/sc-im/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-Enabling the lua option on Void Linux, which pulls in the lua51
-buildlink, causes -lncursesw to resolve to -l__nonexistent__:
-
-  cc -L/usr/pkg/lib -Wl,-R/usr/pkg/lib xlsx.o cmds_edit.o cmds_visual.o
-    history.o marks.o lex.o trigger.o maps.o color.o input.o range.o
-    pipe.o dep_graph.o xls.o buffer.o help.o filter.o format.o undo.o
-    interp.o hide_show.o lua.o file.o plot.o vmtbl.o cmds_insert.o
-    freeze.o block.o tui.o conf.o cmds_normal.o xmalloc.o sort.o main.o
-    cmds.o shift.o cmds_command.o yank.o exec.o clipboard.o subtotal.o
-    utils/extra.o utils/dictionary.o utils/string.o gram.o -o sc-im -lm
-    -pthread -ldl -L/usr/pkg/lib -lncursesw  -Wl,-R/usr/pkg/lib
-    -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -llua5.1 -lm  -Wl,--export-dynamic
-  /usr/bin/ld: cannot find -l__nonexistent__
-
-There are some graphical glitches when built against pkgsrc's
-ncursesw 6.1 on xterm-256color terminals:
-
-  https://github.com/andmarti1424/sc-im/issues/304
-
-An xls option can be added once libxls hits 1.5 and is included in
-pkgsrc. Version 1.4 has many vulnerabilities.
diff --git a/sc-im/distinfo b/sc-im/distinfo
deleted file mode 100644
index 548bd233c7..0000000000
--- a/sc-im/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-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
diff --git a/sc-im/options.mk b/sc-im/options.mk
deleted file mode 100644
index d971880bfa..0000000000
--- a/sc-im/options.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.sc-im
-PKG_SUPPORTED_OPTIONS+=	color xlsx lua
-PKG_SUGGESTED_OPTIONS+=	color xlsx lua
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mcolor)
-CFLAGS+=	-DUSECOLORS
-.endif
-
-.if !empty(PKG_OPTIONS:Mxlsx)
-CFLAGS+=	-DXLSX -DXLSX_EXPORT
-LDFLAGS+=	-lxlsxwriter
-.include "../../archivers/libzip/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../wip/libxlsxwriter/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mlua)
-.include "../../lang/lua51/buildlink3.mk"
-.endif
diff --git a/sc-im/patches/patch-src_Makefile b/sc-im/patches/patch-src_Makefile
deleted file mode 100644
index 1a32e5474c..0000000000
--- a/sc-im/patches/patch-src_Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD$
-
-- 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
-@@ -29,8 +29,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\"
--# Comment out to disable color support
--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
- 
- # dynamic linking (should not be used in FreeBSD
- ifneq ($(shell uname -s),FreeBSD)
--  LDLIBS += -ldl
-+  LDLIBS_DL ?= -ldl
- endif
- 
-+LDLIBS += $(LDLIBS_DL)
-+
- ifneq (, $(shell which pkg-config))
-   # Any system with pkg-config
- 
-   # NOTE: ncursesw (required)
-   ifeq ($(shell uname -s),Darwin)
-     # macOS' ncurses is built with wide-char support
--    LDFLAGS += -lncurses
-+    LDLIBS_CURSES ?= -lncurses
-   else ifneq ($(shell pkg-config --exists ncursesw || echo 'no'),no)
--    CFLAGS += $(shell pkg-config --cflags ncursesw)
--    LDLIBS += $(shell pkg-config --libs ncursesw)
-+    CFLAGS_CURSES ?= $(shell pkg-config --cflags ncursesw)
-+    LDLIBS_CURSES ?= $(shell pkg-config --libs ncursesw)
-   else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no)
-     # hopefully this includes wide character support then
--    CFLAGS += $(shell pkg-config --cflags ncurses)
--    LDLIBS += $(shell pkg-config --libs ncurses)
-+    CFLAGS_CURSES ?= $(shell pkg-config --cflags ncurses)
-+    LDLIBS_CURSES ?= $(shell pkg-config --libs ncurses)
-   else
--    LDLIBS += -lncursesw
-+    LDLIBS_CURSES ?= -lncursesw
-   endif
- 
-   # NOTE: libxml and libzip are required for xlsx file import support
-@@ -128,9 +130,12 @@ else ifeq ($(shell uname -s),Darwin)
-   # macOS without pkg-config
- 
-   # macOS' ncurses is built with wide-char support
--  LDFLAGS += -lncurses
-+  LDLIBS_CURSES += -lncurses
- endif
- 
-+CFLAGS += $(CFLAGS_CURSES)
-+LDLIBS += $(LDLIBS_CURSES)
-+
- 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
-
Prev by Date: libxlsxwriter: Change CATEGORIES to textproc
Next by Date: libxlsxwriter: Remove, imported in pkgsrc as textproc/libxlsxwriter
Previous by Thread: libxlsxwriter: Change CATEGORIES to textproc
Next by Thread: libxlsxwriter: Remove, imported in pkgsrc as textproc/libxlsxwriter
Indexes:
Home | Main Index | Thread Index | Old Index