cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.5.0

Browse Source
This commit is contained in:
Baptiste Daroussin 2017-02-20 08:33:14 +00:00
parent 6c14950e87
commit 1b7fde09d5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=434438
4 changed files with 13 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
math/sc-im/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sc-im
PORTVERSION= 0.4.0
PORTVERSION= 0.5.0
DISTVERSIONPREFIX= v
CATEGORIES= math

6
math/sc-im/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1485473874
SHA256 (andmarti1424-sc-im-v0.4.0_GH0.tar.gz) = e9a6d0a87d4f9a657bb8b87bdde9141e42c8916fbb6879d07564ffb67302f68a
SIZE (andmarti1424-sc-im-v0.4.0_GH0.tar.gz) = 700431
TIMESTAMP = 1487579247
SHA256 (andmarti1424-sc-im-v0.5.0_GH0.tar.gz) = d7a31c5225e02239e925b50b414d7e69d12bc3554f218621823782872ccc5e4d
SIZE (andmarti1424-sc-im-v0.5.0_GH0.tar.gz) = 867157

64
math/sc-im/files/patch-Makefile
View File

@ -1,58 +1,6 @@
--- Makefile.orig 2016-11-28 12:29:27 UTC
--- Makefile.orig 2017-02-19 16:32:00 UTC
+++ Makefile
@@ -34,12 +34,12 @@ LIBDIR=$(prefix)/share/doc/$(name)
LIBRARY=-DLIBDIR=\"$(LIBDIR)\"
# For Building SC-IM in LINUX, set LINUX variable below
-LINUX := -DLINUX
-#LINUX :=
+#LINUX := -DLINUX
+LINUX :=
# For Building SC-IM in FREEBSD, set FREEBSD variable below
-#FREEBSD := -DFREEBSD
-FREEBSD :=
+FREEBSD := -DFREEBSD
+#FREEBSD :=
# For Building SC-IM in NETBSD, set NETBSD variable below
#NETBSD := -DNETBSD
@@ -115,15 +115,15 @@ SED := sed
# Uncomment below if you want basic XLS import support.
# Requires libxlsreader.
# Add -lxlsreader in LDLIBS as well.
-XLS :=
-#XLS := -DXLS
+#XLS :=
+XLS := -DXLS
# Uncomment below if you want basic XLSX import support.
# Requires libzip-dev and libxml2-dev
# Add -lzip -xml2 to LDLIBS as well.
# and -I/usr/include/libxml2 or the acording path to the libxml headers, in CFLAGS
-XLSX :=
-#XLSX := -DXLSX
+#XLSX :=
+XLSX := -DXLSX
# Set UNDO variable to enable this feature
#UNDO :=
@@ -134,12 +134,12 @@ UNDO := -DUNDO
MAXROWS := 65536
#CFLAGS := -O2 -Wall -pipe -g
-CFLAGS := $(LINUX) $(FREEBSD) $(NETBSD) $(MACOSX) -O2 -Wall -pipe -g -I/usr/include/libxml2 $(shell pkg-config --cflags ncursesw)
+CFLAGS := $(LINUX) $(FREEBSD) $(NETBSD) $(MACOSX) $(CFLAGS) #-O2 -Wall -pipe -g -I/usr/include/libxml2 $(shell pkg-config --cflags ncursesw)
CFLAGS := $(CFLAGS) $(USECOLORS) $(USELOCALE) $(UNDO) $(SIGVOID) $(DFLT_PAGER)
CFLAGS := $(CFLAGS) $(IEEE_MATH) $(RINT) $(REGEX) $(LIBRARY) -DMAXROWS=$(MAXROWS)
CFLAGS := $(CFLAGS) $(HELP_PATH) $(SNAME) $(NO_NOTIMEOUT) $(SIMPLE) $(XLS) $(XLSX) $(HISTORY_FILE)
-LDLIBS := -lm $(shell pkg-config --libs ncursesw)
+LDLIBS := -lm $(LDLIBS) -lncursesw -lxlsreader -lzip -lxml2 # $(shell pkg-config --libs ncursesw)
#LDLIBS := -lm -lncurses -lxlsreader
#LDLIBS := -lm -lncurses -lxlsreader -lzip -lxml2
@@ -157,8 +157,8 @@ install :
@@ -70,13 +70,13 @@ install :
install $(name) $(DESTDIR)$(prefix)/bin/$(name)
install -d $(DESTDIR)$(HELPDIR)
install doc $(DESTDIR)$(HELPDIR)/$(name)_help
@ -61,5 +9,11 @@
+ install -d $(DESTDIR)$(MANDIR)
+ install -m 644 sc-im.1 $(DESTDIR)$(MANDIR)/$(name).1
uninstall :
-rm $(DESTDIR)$(prefix)/bin/$(name)
-rm $(DESTDIR)$(HELPDIR)/$(name)_help
- -rm $(DESTDIR)$(prefix)/share/man/man1/$(name).1
+ -rm $(DESTDIR)$(prefix)$(MANDIR)/$(name).1
$(name) : $(OBJS)
$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)

11
math/sc-im/files/patch-xls.c
View File

@ -1,11 +0,0 @@
--- xls.c.orig 2016-11-28 12:29:27 UTC
+++ xls.c
@@ -60,7 +60,7 @@ int open_xls(char * fname, char * encodi
for (c = 0; c <= pWS->rows.lastcol; c++) { // cols
xlsCell * cell = xls_cell(pWS, r, c);
//if ((! cell) || (cell->isHidden)) continue;
- if ((! cell) || (cell->ishiden)) continue; // Unfortunately libxls spells this "ishiden"
+ if ((! cell) || (cell->isHidden)) continue; // Unfortunately libxls spells this "ishiden"
// TODO enable rowspan ?
//if (cell->rowspan > 1) continue;