pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sc-im: Add XLSX writing and XLS reading support



Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By:	sjmulder
Date:		Mon Dec 10 18:13:15 2018 +0100
Changeset:	329268c481c3fb4bf8944c61583d6d322bd4041c

Modified Files:
	sc-im/DESCR
	sc-im/options.mk

Log Message:
sc-im: Add XLSX writing and XLS reading support

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

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

diffstat:
 sc-im/DESCR      |  2 +-
 sc-im/options.mk | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs:
diff --git a/sc-im/DESCR b/sc-im/DESCR
index 0f853defe8..d88607dd43 100644
--- a/sc-im/DESCR
+++ b/sc-im/DESCR
@@ -1,2 +1,2 @@
 'SC Improved', a curses-based spreadsheet program based on sc.  New features
-include undo and redo, colors, sorting, plotting and XLSX import.
+include undo and redo, colors, sorting, plotting and XLS[X] support.
diff --git a/sc-im/options.mk b/sc-im/options.mk
index 24a749a48b..e778bd82a3 100644
--- a/sc-im/options.mk
+++ b/sc-im/options.mk
@@ -1,15 +1,22 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sc-im
-PKG_SUPPORTED_OPTIONS+=	xlsx lua
+PKG_SUPPORTED_OPTIONS+=	xls xlsx lua
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mxls)
+CFLAGS+=	-DXLS
+LDFLAGS+=	-lxlsreader
+.include "../../wip/libxls/buildlink3.mk"
+.endif
+
 # reader only, writer needs libxlsxwriter
 .if !empty(PKG_OPTIONS:Mxlsx)
-CFLAGS+=	-DXLSX
+CFLAGS+=	-DXLSX -DXLSX_WRITER
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../wip/libxlsxwriter/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)


Home | Main Index | Thread Index | Old Index