CVS commit: [pkgsrc-2017Q1] pkgsrc/math/nickle

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Apr 25 17:39:11 UTC 2017

Modified Files:
        pkgsrc/math/nickle [pkgsrc-2017Q1]: distinfo
        pkgsrc/math/nickle/patches [pkgsrc-2017Q1]: patch-aa
Added Files:
        pkgsrc/math/nickle/patches [pkgsrc-2017Q1]: patch-lex.c

Log Message:
Pullup ticket #5356 - requested by sevan
math/nickle: build fix

Revisions pulled up:
- math/nickle/distinfo                                          1.11
- math/nickle/patches/patch-aa                                  1.5
- math/nickle/patches/patch-lex.c                               1.1

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sun Apr 23 14:49:27 UTC 2017

   Modified Files:
           pkgsrc/math/nickle: distinfo
           pkgsrc/math/nickle/patches: patch-aa
   Added Files:
           pkgsrc/math/nickle/patches: patch-lex.c

   Log Message:
   Fix build problem on NetBSD 6.1_STABLE.

   * Guard use of rl_catch_signals variable with "#if HAVE_RL_CATCH_SIGNALS".

   Add comment in patch/patch-aa quote from last commit message.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 pkgsrc/math/nickle/distinfo
cvs rdiff -u -r1.4 -r1.4.58.1 pkgsrc/math/nickle/patches/patch-aa
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/math/nickle/patches/patch-lex.c

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

Modified files:

Index: pkgsrc/math/nickle/distinfo
diff -u pkgsrc/math/nickle/distinfo:1.10 pkgsrc/math/nickle/distinfo:1.10.2.1
--- pkgsrc/math/nickle/distinfo:1.10    Mon Mar 20 13:13:51 2017
+++ pkgsrc/math/nickle/distinfo Tue Apr 25 17:39:11 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/03/20 13:13:51 wiz Exp $
+$NetBSD: distinfo,v 1.10.2.1 2017/04/25 17:39:11 bsiegert Exp $
 
 SHA1 (nickle-2.79.tar.gz) = 86722b07df9eebf99789b91a0c576f14af8ea739
 RMD160 (nickle-2.79.tar.gz) = a6a211cf1171960c0cab45c9d2206d5ae4abd374
 SHA512 (nickle-2.79.tar.gz) = 3a98dc0e318a62e48b00cbc7bb1324be5c2461b29637ee77fe8ad3d788fdd32b7d896ca5e457edfd86f580901ffcb543d5f27442def271c267096aa9552f45f3
 Size (nickle-2.79.tar.gz) = 581560 bytes
-SHA1 (patch-aa) = 0b1e03f3e42ea088c5a81109e9534c77efe30659
+SHA1 (patch-aa) = 4cbb563244883f6c9f7a3594875052f8d9a9e9b3
+SHA1 (patch-lex.c) = f9d5f3f282f97a94195730062525e9f6310bb316

Index: pkgsrc/math/nickle/patches/patch-aa
diff -u pkgsrc/math/nickle/patches/patch-aa:1.4 pkgsrc/math/nickle/patches/patch-aa:1.4.58.1
--- pkgsrc/math/nickle/patches/patch-aa:1.4     Fri Jan 15 23:09:28 2010
+++ pkgsrc/math/nickle/patches/patch-aa Tue Apr 25 17:39:11 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2010/01/15 23:09:28 tnn Exp $
+$NetBSD: patch-aa,v 1.4.58.1 2017/04/25 17:39:11 bsiegert Exp $
+
+* Fix build issue with Sun Studio.
 
 --- execute.c.orig     2008-03-20 00:21:49.000000000 +0000
 +++ execute.c

Added files:

Index: pkgsrc/math/nickle/patches/patch-lex.c
diff -u /dev/null pkgsrc/math/nickle/patches/patch-lex.c:1.1.2.2
--- /dev/null   Tue Apr 25 17:39:11 2017
+++ pkgsrc/math/nickle/patches/patch-lex.c      Tue Apr 25 17:39:11 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-lex.c,v 1.1.2.2 2017/04/25 17:39:11 bsiegert Exp $
+
+Assign rl_catch_signals only if HAVE_RL_CATCH_SIGNALS.
+
+--- lex.c.orig 2017-03-15 21:28:13.000000000 +0000
++++ lex.c
+@@ -927,8 +927,10 @@ LexInit (void)
+     rl_getc_function = ReadlineGetChar;
+     rl_prep_term_function = my_prep_terminal;
+     rl_deprep_term_function = my_deprep_terminal;
++#if HAVE_RL_CATCH_SIGNALS
+     rl_catch_signals = 0;
+ #endif
++#endif
+     LexInputReference = NewReference ((void **) &lexInput);
+     MemAddRoot (LexInputReference);
+     EXIT ();