pkgsrc-WIP-changes archive

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

sc-im: Make color optional



Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By:	sjmulder
Date:		Fri Jan 25 15:05:45 2019 +0100
Changeset:	6103b1679d4548130b79393d0d72b918cd6fd9a2

Modified Files:
	sc-im/distinfo
	sc-im/options.mk
	sc-im/patches/patch-src_Makefile

Log Message:
sc-im: Make color optional

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

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

diffstat:
 sc-im/distinfo                   |  2 +-
 sc-im/options.mk                 |  8 ++++++--
 sc-im/patches/patch-src_Makefile | 12 ++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs:
diff --git a/sc-im/distinfo b/sc-im/distinfo
index a4ceb010df..548bd233c7 100644
--- a/sc-im/distinfo
+++ b/sc-im/distinfo
@@ -4,4 +4,4 @@ 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) = 846c4086fada3291301846fa7f03e02762e59d43
+SHA1 (patch-src_Makefile) = 2a7e56779350af57002ecddd8bec13e1b10f7ea4
diff --git a/sc-im/options.mk b/sc-im/options.mk
index db75e9f13b..d971880bfa 100644
--- a/sc-im/options.mk
+++ b/sc-im/options.mk
@@ -1,11 +1,15 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sc-im
-PKG_SUPPORTED_OPTIONS+=	xlsx lua
-PKG_SUGGESTED_OPTIONS+=	xlsx lua
+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
diff --git a/sc-im/patches/patch-src_Makefile b/sc-im/patches/patch-src_Makefile
index 3f0cca7a11..1a32e5474c 100644
--- a/sc-im/patches/patch-src_Makefile
+++ b/sc-im/patches/patch-src_Makefile
@@ -3,9 +3,21 @@ $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


Home | Main Index | Thread Index | Old Index