[136030] trunk/dports/lang/q

[ryandesign at macports.org]

Revision: 136030
          https://trac.macports.org/changeset/136030
Author:   ryandesign at macports.org
Date:     2015-05-10 03:33:02 -0700 (Sun, 10 May 2015)
Log Message:
-----------
q: fix build with readline 6.3 or newer (#47692)

Modified Paths:
--------------
    trunk/dports/lang/q/Portfile

Added Paths:
-----------
    trunk/dports/lang/q/files/patch-readline-6.3.diff

Modified: trunk/dports/lang/q/Portfile
===================================================================
--- trunk/dports/lang/q/Portfile	2015-05-10 04:08:46 UTC (rev 136029)
+++ trunk/dports/lang/q/Portfile	2015-05-10 10:33:02 UTC (rev 136030)
@@ -45,6 +45,7 @@
     rmd160 61a7eba9857ae2c7c553625a423c62fd737836e4
 
 patchfiles \
+    patch-readline-6.3.diff \
     patch-system.c.diff
 
 configure.args \

Added: trunk/dports/lang/q/files/patch-readline-6.3.diff
===================================================================
--- trunk/dports/lang/q/files/patch-readline-6.3.diff	                        (rev 0)
+++ trunk/dports/lang/q/files/patch-readline-6.3.diff	2015-05-10 10:33:02 UTC (rev 136030)
@@ -0,0 +1,41 @@
+Fix build with readline 6.3 and newer.
+--- modules/clib/system.c.orig	2008-02-23 01:31:15.000000000 -0600
++++ modules/clib/system.c	2015-05-10 05:28:51.000000000 -0500
+@@ -5149,7 +5149,7 @@
+   return rl_completion_matches(text, my_sym_generator);
+ }
+ 
+-static CPPFunction *my_completion_function(void)
++static rl_completion_func_t *my_completion_function(void)
+ {
+   expr x = mksym(sym(RL_COMPLETION_FUNCTION)), f = eval(x);
+   if (f != x && f != completion_function) {
+@@ -5157,7 +5157,7 @@
+     completion_function = newref(f);
+   } else
+     dispose(f);
+-  return (CPPFunction *) (completion_function?my_sym_completion:NULL);
++  return (rl_completion_func_t *) (completion_function?my_sym_completion:NULL);
+ }
+ 
+ static char *my_word_break_characters(void)
+@@ -5185,7 +5185,7 @@
+     rl_basic_word_break_characters;
+   char *save_rl_completer_word_break_characters =
+     rl_completer_word_break_characters;
+-  CPPFunction *save_rl_attempted_completion_function =
++  rl_completion_func_t *save_rl_attempted_completion_function =
+     rl_attempted_completion_function;
+   HISTORY_STATE *save_hist = history_get_history_state();
+   int histmax = unstifle_history();
+--- src/q.c.orig	2007-10-27 13:59:05.000000000 -0500
++++ src/q.c	2015-05-10 05:29:08.000000000 -0500
+@@ -652,7 +652,7 @@
+ {
+   rl_readline_name = "Q";
+   rl_basic_word_break_characters = " \t\n\"\\'`@$><=,;|%&~{[(";
+-  rl_attempted_completion_function = (CPPFunction *)sym_completion;
++  rl_attempted_completion_function = (rl_completion_func_t *)sym_completion;
+   save_hist = history_get_history_state();
+ }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150510/271da195/attachment.html>