diff --git a/lang/expect/Makefile b/lang/expect/Makefile index c25aab93a3e..faf39f96515 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,6 +1,8 @@ COMMENT = sophisticated scripter based on Tcl/Tk VERSION = 5.45.4 +REVISION = 0 + DISTNAME = expect${VERSION} PKGNAME = expect-${VERSION} SHARED_LIBS = expect5454 0.0 diff --git a/lang/expect/patches/patch-exp_chan_c b/lang/expect/patches/patch-exp_chan_c index a9e7e01fb36..b3005126861 100644 --- a/lang/expect/patches/patch-exp_chan_c +++ b/lang/expect/patches/patch-exp_chan_c @@ -1,7 +1,10 @@ Get rid of implicit declaration of function warning ---- exp_chan.c.orig Thu Sep 9 19:29:43 2010 -+++ exp_chan.c Thu Sep 9 19:30:27 2010 +error: incompatible pointer types initializing 'Tcl_ChannelTypeVersion' (aka 'struct Tcl_ChannelTypeVersion_ *') with an expression of type 'int (ClientData, int)' (aka 'int (void *, int)') [-Wincompatible-pointer-types] + +Index: exp_chan.c +--- exp_chan.c.orig ++++ exp_chan.c @@ -37,6 +37,7 @@ #include "exp_log.h" #include "tcldbg.h" /* Dbg_StdinMode */ @@ -10,3 +13,20 @@ Get rid of implicit declaration of function warning extern int expSetBlockModeProc _ANSI_ARGS_((int fd, int mode)); static int ExpBlockModeProc _ANSI_ARGS_((ClientData instanceData, int mode)); +@@ -58,7 +59,7 @@ static int ExpGetHandleProc _ANSI_ARGS_((ClientData i + + Tcl_ChannelType expChannelType = { + "exp", /* Type name. */ +- ExpBlockModeProc, /* Set blocking/nonblocking mode.*/ ++ TCL_CHANNEL_VERSION_2, /* Version. */ + ExpCloseProc, /* Close proc. */ + ExpInputProc, /* Input proc. */ + ExpOutputProc, /* Output proc. */ +@@ -68,6 +69,7 @@ Tcl_ChannelType expChannelType = { + ExpWatchProc, /* Initialize notifier. */ + ExpGetHandleProc, /* Get OS handles out of channel. */ + NULL, /* Close2 proc */ ++ ExpBlockModeProc, /* Set blocking/nonblocking mode.*/ + }; + + typedef struct ThreadSpecificData {