[134941] trunk/dports/devel/tclreadline

[ryandesign at macports.org]

Revision: 134941
          https://trac.macports.org/changeset/134941
Author:   ryandesign at macports.org
Date:     2015-04-11 04:37:42 -0700 (Sat, 11 Apr 2015)
Log Message:
-----------
tclreadline: fix build with readline 6.3+ (#46059; maintainer timeout)

Modified Paths:
--------------
    trunk/dports/devel/tclreadline/Portfile
    trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff

Modified: trunk/dports/devel/tclreadline/Portfile
===================================================================
--- trunk/dports/devel/tclreadline/Portfile	2015-04-11 10:58:42 UTC (rev 134940)
+++ trunk/dports/devel/tclreadline/Portfile	2015-04-11 11:37:42 UTC (rev 134941)
@@ -41,6 +41,7 @@
 
 # Patch readline to use malloc/free instead of
 # Tcl_Alloc/Tcl_Free. Required for threaded-enabled Tcl.
+# Use rl_completion_func_t instead of CPPFunction for compatibility with readline 6.3+.
 patchfiles                  patch-tclreadline.c.diff
 
 patchfiles-append           patch-configure.ac.diff

Modified: trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff
===================================================================
--- trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff	2015-04-11 10:58:42 UTC (rev 134940)
+++ trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff	2015-04-11 11:37:42 UTC (rev 134941)
@@ -1,5 +1,5 @@
---- tclreadline.c.orig	2012-02-19 22:30:13.000000000 -0800
-+++ tclreadline.c	2012-02-19 22:27:00.000000000 -0800
+--- tclreadline.c.orig	2000-09-20 12:44:34.000000000 -0500
++++ tclreadline.c	2015-04-11 06:35:23.000000000 -0500
 @@ -49,8 +49,8 @@
  static const char* tclrl_version_str = TCLRL_VERSION_STR;
  static const char* tclrl_patchlevel_str = TCLRL_PATCHLEVEL_STR;
@@ -11,3 +11,12 @@
  
  enum {
      _CMD_SET     = (1 << 0),
+@@ -635,7 +635,7 @@
+      * directory. If this failes, this
+      * is *not* an error.
+      */
+-    rl_attempted_completion_function = (CPPFunction *) TclReadlineCompletion;
++    rl_attempted_completion_function = (rl_completion_func_t *) TclReadlineCompletion;
+     if (read_history(historyfile)) {
+ 	if (write_history(historyfile)) {
+ 	    Tcl_AppendResult (interp, "warning: `",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150411/54c27923/attachment.html>