From nobody Mon Apr 1 11:47:41 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7Tlf0DJxz5GJxl; Mon, 1 Apr 2024 11:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7Tld4xdcz42SZ; Mon, 1 Apr 2024 11:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711972061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZeDH0CrYGj5U8s7J7RXUFYg3T7LJ4QgEaHNkgJ58Lg=; b=PkBbmgzusadHzXFJlxW7Gh0CWNqTpyfMGr5rCBXru0qM7ali4zEx5Kr17cLEPEj3OzF2JI aCXKbkntdYYt3tYyI0uhk4hkpp2Lo9FfLPYQg2KO0rxosuNV/V8ezOV8ixXCHILGLhSJPT Iafo93gQqH2iziIBIqiuX66Y+RW+dwcpLRJWCbK5CQZoDEX9np162h0hROupcuSTKIDala jj03sm+sTdc9tgKe5ECFSHYrTChwHRf4HwVfC8ByzADMhInmXM9YB3Az7Vx7D8lvUUnoNw A4ceROigaarAFELfXK4dvzOEvvk1otYDtb8V1Cnzr23TjD6QmO9fh1m5Juv3Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711972061; a=rsa-sha256; cv=none; b=DxH9l7dkQqjOBddN3Z2X3T9V1/2N2MOTuckzU745RhelUyUD4yNqpkMsGI4msA8Wo9O+cE SdFcX1HadRqSgYOZNQVzNRYO8HToy9UEpj7AdEFoqlrPV7e3rSYJIoySyCuqu0USWbEjOe ZNxIFjMUWN/mvgDQvSSZ8QCjHokaUH76ffw/FDcjtJLNqWBxUyKUWa68mZezxfF7ntI2Mb 5R2c/YUjjZ3rPpeYsWLPT7FuXIxzs6oI6ie/hFgIyw+t9qx6/M3odTj+pDANW6uFfLZsyJ LBwbbwCw7iDnbb/4vwPjZx0Uwh6uAftmP3xN/ufFQIB3o/A9Q9Kr8hhOPJ0FMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711972061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZeDH0CrYGj5U8s7J7RXUFYg3T7LJ4QgEaHNkgJ58Lg=; b=SVI+vVQhjDmtuqvnBtS6sNoWhLyDNduMXnbTL0NaS+uGouMej/XQOQWBZmDgpVjD55i1Bx 93JIXWV901X7GeAOgU82WYVw5sfdNVWn8d4xFSux5a6uK2Fq8Z8p032ahabgtGOFFEG0Bm FCrMa7wq2c7rmY24JqveWaAC9WIVaZ3uKtE1fqO5lyBMFjDvBM7Zbpa248LarJ1pLjfY1C 31M8gJ7mocKiEzf+h4GmnnjnZwY8ARfzl10Alv123vHkEJa8HUDlLlPSmwOjppUiSFwGQO 6J48+10zrcDj8bf/hBB5nye9lssO5G2xmyWJOMQAhL2WgeQwRybUc4EVGxEKfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7Tld4YbPz1KFg; Mon, 1 Apr 2024 11:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431BlfCp062251; Mon, 1 Apr 2024 11:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431BlfoN062248; Mon, 1 Apr 2024 11:47:41 GMT (envelope-from git) Date: Mon, 1 Apr 2024 11:47:41 GMT Message-Id: <202404011147.431BlfoN062248@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 0ed793b7cc90 - main - irc/evangeline: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ed793b7cc90340115a74c8097aeedf6e68a373a Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ed793b7cc90340115a74c8097aeedf6e68a373a commit 0ed793b7cc90340115a74c8097aeedf6e68a373a Author: Rene Ladan AuthorDate: 2024-04-01 11:47:32 +0000 Commit: Rene Ladan CommitDate: 2024-04-01 11:47:32 +0000 irc/evangeline: Remove expired port 2024-03-31 irc/evangeline: Abandonware, upstream is gone --- MOVED | 1 + irc/Makefile | 1 - irc/evangeline/Makefile | 69 ------- irc/evangeline/distinfo | 2 - irc/evangeline/files/patch-Makefile.in | 53 ----- irc/evangeline/files/patch-tcl86 | 351 --------------------------------- irc/evangeline/pkg-descr | 6 - 7 files changed, 1 insertion(+), 482 deletions(-) diff --git a/MOVED b/MOVED index b8f0dd6b1d5e..52ad79d75cd1 100644 --- a/MOVED +++ b/MOVED @@ -3124,3 +3124,4 @@ irc/infobot||2024-04-01|Has expired: Abandonware, outdated version and last upst devel/py-mox3||2024-04-01|Has expired: Upstream no longer active and repository has been archived. See also: https://lists.openstack.org/pipermail/openstack-discuss/2020-June/015518.html net-p2p/py-vertex||2024-04-01|Has expired: Abandoned project since 7 years back textproc/py-html2text2018|textproc/py-html2text|2024-04-01|Has expired: Old version without consumers left, use updated textproc/py-html2text instead +irc/evangeline||2024-04-01|Has expired: Abandonware, upstream is gone diff --git a/irc/Makefile b/irc/Makefile index 4449efecbe4e..881b2fce22cc 100644 --- a/irc/Makefile +++ b/irc/Makefile @@ -20,7 +20,6 @@ SUBDIR += epic4 SUBDIR += epic5 SUBDIR += ergo - SUBDIR += evangeline SUBDIR += ezbounce SUBDIR += gruftistats SUBDIR += hexchat diff --git a/irc/evangeline/Makefile b/irc/evangeline/Makefile deleted file mode 100644 index 114a7a9b7c30..000000000000 --- a/irc/evangeline/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -PORTNAME= evangeline -PORTVERSION= 1.1.4 -CATEGORIES= irc tcl -MASTER_SITES= http://www.averse.piasta.pl/_data/evangeline/${PORTVERSION}/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-b1 - -MAINTAINER= ports@FreeBSD.org -COMMENT= IRC Bot based on Eggdrop -WWW= http://www.averse.piasta.pl/ - -LICENSE= GPLv2 - -BROKEN= Unfetchable -DEPRECATED= Abandonware, upstream is gone -EXPIRATION_DATE=2024-03-31 - -WRKSRC= ${WRKDIR}/${PORTNAME} - -USES= gmake tcl -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \ - --with-tclinc=${TCL_INCLUDEDIR}/tcl.h -LLD_UNSAFE= yes # Needs linker to provide library search paths. - -PLIST_FILES= bin/evangeline - -OPTIONS_DEFINE= IPV6 CRYPT -OPTIONS_DEFAULT= CRYPT -CRYPT_DESC= Enable Encryption - -.include - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MCRYPT} -CONFIGURE_ARGS+= --enable-crypt -.else -CONFIGURE_ARGS+= --disable-crypt -.endif - -pre-everything:: - @${ECHO_MSG} 'To redefine the "admin" user name, set ADMIN_NAME' - @${ECHO_MSG} 'To redefine the "Permanent owner" name, set OWNER_NAME' - -post-patch: - @${REINPLACE_CMD} 's,^read usersq,usersq=n,' ${WRKDIR}/evangeline/configure - -# Turns out that putting ADMIN_NAME more than 9 chars creates an overflow... -# Fix that here while replacing the name. -post-configure: -.if !empty(ADMIN_NAME) - @${REINPLACE_CMD} \ - 's,^char admin[^ ]* = [^;]*,const char* admin = "${ADMIN_NAME}",' \ - ${WRKDIR}/evangeline/src/main.c -.endif -.if !empty(OWNER_NAME) - @${REINPLACE_CMD} \ - 's,^char owner[^ ]* = [^;]*,const char* owner = "${OWNER_NAME}",' \ - ${WRKDIR}/evangeline/src/main.c -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${PORTVERSION}-B1 ${STAGEDIR}${PREFIX}/bin/evangeline - -.include diff --git a/irc/evangeline/distinfo b/irc/evangeline/distinfo deleted file mode 100644 index d83954d54399..000000000000 --- a/irc/evangeline/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (evangeline-1.1.4-b1.tar.gz) = 5c2119cf123075b4970748c8baed4f7d4b515a1cdd4c8bbe41f4bacc1e5791f0 -SIZE (evangeline-1.1.4-b1.tar.gz) = 1328229 diff --git a/irc/evangeline/files/patch-Makefile.in b/irc/evangeline/files/patch-Makefile.in deleted file mode 100644 index 21d8efd734f7..000000000000 --- a/irc/evangeline/files/patch-Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ ---- Makefile.in.orig Fri Feb 18 10:28:06 2005 -+++ Makefile.in Fri Feb 18 10:27:08 2005 -@@ -217,8 +217,6 @@ - @echo "" - @echo "modules made:" - @ls -l modules/*.$(MOD_EXT) -- @$(MAKE) finish_install -- @$(installed_msg) - - static: @LIBZ@ EvangelineTest - @echo "" -@@ -233,9 +231,6 @@ - @echo "" - @$(test_run) - @ls -l $(EVANGELINEEXEC) -- @$(MAKE) finish_install -- @$(installed_msg) -- - - debug: @LIBZ@ DebugEvangeline - -@@ -251,8 +246,6 @@ - @echo "" - @echo "modules made:" - @ls -l modules/*.$(MOD_EXT) -- @$(MAKE) finish_install -- @$(installed_msg) - - sdebug: @LIBZ@ EvangelineTest - @echo "" -@@ -267,8 +260,6 @@ - @echo "" - @$(test_run) - @ls -l $(EVANGELINEEXEC) -- @$(MAKE) finish_install -- @$(installed_msg) - - EvangelineTest: conftest - @if test -f EVANGELINEMOD.stamp; then \ -@@ -290,8 +281,12 @@ - fi - @echo "stamp" >EVANGELINEMOD.stamp - -+install: -+ @$(MAKE) finish_install -+ @$(installed_msg) -+ - finish_install: -- @mv ifiles/starter starter -+ @mv ifiles/starter /usr/local/bin/evangeline - @mv ifiles/MyHttp.tcl .data/.scripts/MyHttp.tcl - @rm -rf modules/*.mod modules/EvangelineMod.* modules/Makefile* modules/mod.xlibs modules/autoconf modules/*.h modules/*.o - @rm -rf src/ tmp/ Makefile* config* disabled_modules lush.h diff --git a/irc/evangeline/files/patch-tcl86 b/irc/evangeline/files/patch-tcl86 deleted file mode 100644 index 0d378c4ea969..000000000000 --- a/irc/evangeline/files/patch-tcl86 +++ /dev/null @@ -1,351 +0,0 @@ ---- modules/server.mod/server.c.orig 2013-05-14 09:49:09.000000000 +0200 -+++ modules/server.mod/server.c 2013-05-14 09:49:50.000000000 +0200 -@@ -1424,7 +1424,7 @@ - if (slist != NULL) { - code = Tcl_SplitList(interp, slist, &lc, &list); - if (code == TCL_ERROR) -- return interp->result; -+ return (char *)Tcl_GetStringResult(interp); - for (i = 0; i < lc && i < 50; i++) - add_server((char *) list[i]); - ---- src/botcmd.c.orig 2013-05-14 09:24:30.000000000 +0200 -+++ src/botcmd.c 2013-05-14 09:25:16.000000000 +0200 -@@ -297,7 +297,7 @@ - - else { - simple_sprintf(s, "assoc %d", chan); -- if ((Tcl_Eval(interp, s) != TCL_OK) || !interp->result[0]) -+ if ((Tcl_Eval(interp, s) != TCL_OK) || !Tcl_GetStringResult(interp)[0]) - botnet_send_priv(idx, botnetnick, nick, NULL, "%s %s%d: (* = owner, + =" - " master, %% = botmaster, @ = op)\n", - BOT_PEOPLEONCHAN, (chan < GLOBAL_CHANS) ? "" : "*", -@@ -305,7 +305,7 @@ - else - botnet_send_priv(idx, botnetnick, nick, NULL, "%s '%s' (%s%d): (* = " - "owner, + = master, %% = botmaster, @ = op)\n", -- BOT_PEOPLEONCHAN, interp->result, (chan < GLOBAL_CHANS) ? -+ BOT_PEOPLEONCHAN, Tcl_GetStringResult(interp), (chan < GLOBAL_CHANS) ? - "" : "*", chan % GLOBAL_CHANS); - } - for (i = 0; i < dcc_total; i++) ---- src/botmsg.c.orig 2013-05-14 09:25:38.000000000 +0200 -+++ src/botmsg.c 2013-05-14 09:26:21.000000000 +0200 -@@ -610,7 +610,8 @@ - Tcl_SetVar(interp, "_idx", ss, 0); - if (Tcl_VarEval(interp, "storenote", " $_from $_to $_data $_idx", NULL) == - TCL_OK) { -- if (interp->result && interp->result[0]) -+ const char *res = Tcl_GetStringResult(interp); -+ if (res && res[0]) - status = NOTE_FWD; - if (status == NOTE_AWAY) { - dprintf(iaway, "*** %s.\n", BOT_NOTEARRIVED); ---- src/botnet.c.orig 2013-05-14 09:26:35.000000000 +0200 -+++ src/botnet.c 2013-05-14 09:27:21.000000000 +0200 -@@ -383,12 +383,12 @@ - BOT_LOCALCHAN); - else if (chan > 0) { - simple_sprintf(idle, "assoc %d", chan); -- if ((Tcl_Eval(interp, idle) != TCL_OK) || !interp->result[0]) -+ if ((Tcl_Eval(interp, idle) != TCL_OK) || !Tcl_GetStringResult(interp)[0]) - dprintf(idx, "%s %s%d:\n", BOT_USERSONCHAN, - (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS); - else - dprintf(idx, "%s '%s%s' (%s%d):\n", BOT_USERSONCHAN, -- (chan < GLOBAL_CHANS) ? "" : "*", interp->result, -+ (chan < GLOBAL_CHANS) ? "" : "*", Tcl_GetStringResult(interp), - (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS); - } - nicklen = botnicklen = 0; ---- src/chanprog.c.orig 2013-05-14 09:27:38.000000000 +0200 -+++ src/chanprog.c 2013-05-14 09:28:44.000000000 +0200 -@@ -300,12 +300,12 @@ - - dprintf(idx, "%s %s\n", MISC_TCLLIBRARY, - ((interp) && (Tcl_Eval(interp, "info library") == TCL_OK)) ? -- interp->result : "*unknown*"); -+ Tcl_GetStringResult(interp): "*unknown*"); - - dprintf(idx, "%s %s (%s %s)\n", MISC_TCLVERSION, - ((interp) && (Tcl_Eval(interp, "info patchlevel") == TCL_OK)) ? -- interp->result : (Tcl_Eval(interp, "info tclversion") == TCL_OK) ? -- interp->result : "*unknown*", MISC_TCLHVERSION, -+ Tcl_GetStringResult(interp) : (Tcl_Eval(interp, "info tclversion") == TCL_OK) ? -+ Tcl_GetStringResult(interp) : "*unknown*", MISC_TCLHVERSION, - TCL_PATCH_LEVEL ? TCL_PATCH_LEVEL : "*unknown*"); - - #if HAVE_TCL_THREADS ---- src/cmds.c.orig 2013-05-14 09:29:02.000000000 +0200 -+++ src/cmds.c 2013-05-14 09:34:34.000000000 +0200 -@@ -78,13 +78,13 @@ - dprintf(idx, "%s (* = owner, + = master, %% = botmaster, @ = op)\n", BOT_PARTYMEMBS); - else { - simple_sprintf(s, "assoc %d", chan); -- if ((Tcl_Eval(interp, s) != TCL_OK) || !interp->result[0]) -+ if ((Tcl_Eval(interp, s) != TCL_OK) || !Tcl_GetStringResult(interp)[0]) - dprintf(idx, "%s %s%d: (* = owner, + = master, %% = botmaster, @ = op)\n", - BOT_PEOPLEONCHAN, (chan < GLOBAL_CHANS) ? "" : - "*", chan % GLOBAL_CHANS); - else - dprintf(idx, "%s '%s' (%s%d): (* = owner, + = master, %% = botmaster, @ = op)\n", -- BOT_PEOPLEONCHAN, interp->result, -+ BOT_PEOPLEONCHAN, Tcl_GetStringResult(interp), - (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS); - } - -@@ -287,8 +287,8 @@ - if ((par[0] < '0') || (par[0] > '9')) { - Tcl_SetVar(interp, "chan", par, 0); - if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) == TCL_OK) && -- interp->result[0]) { -- chan = atoi(interp->result); -+ Tcl_GetStringResult(interp)[0]) { -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &chan); - } - if (chan <= 0) { - dprintf(idx, "No such channel exists.\n"); -@@ -1730,8 +1730,8 @@ - else { - Tcl_SetVar(interp, "chan", arg, 0); - if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) == TCL_OK) && -- interp->result[0]) -- newchan = atoi(interp->result); -+ Tcl_GetStringResult(interp)[0]) -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &newchan); - else - newchan = -1; - } -@@ -1753,8 +1753,8 @@ - else { - Tcl_SetVar(interp, "chan", arg, 0); - if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) == TCL_OK) && -- interp->result[0]) -- newchan = atoi(interp->result); -+ Tcl_GetStringResult(interp)[0]) -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &newchan); - else - newchan = -1; - } -@@ -2132,9 +2132,9 @@ - debug1("(cmds.c->cmd_tcl) tcl: evaluate (.tcl): %s", msg); - code = Tcl_GlobalEval(interp, msg); - if (code == TCL_OK) -- dumplots(idx, "Tcl: ", interp->result); -+ dumplots(idx, "Tcl: ", (char *)Tcl_GetStringResult(interp)); - else -- dumplots(idx, "Tcl error: ", interp->result); -+ dumplots(idx, "Tcl error: ", (char *)Tcl_GetStringResult(interp)); - } - - /* Perform a 'set' command */ -@@ -2152,18 +2152,18 @@ - if (!msg[0]) { - strcpy(s, "info globals"); - Tcl_Eval(interp, s); -- dumplots(idx, "Global vars: ", interp->result); -+ dumplots(idx, "Global vars: ", (char *)Tcl_GetStringResult(interp)); - return; - } - strcpy(s + 4, msg); - code = Tcl_Eval(interp, s); - if (code == TCL_OK) { - if (!strchr(msg, ' ')) -- dumplots(idx, "Currently: ", interp->result); -+ dumplots(idx, "Currently: ", (char *)Tcl_GetStringResult(interp)); - else - dprintf(idx, "Ok, set.\n"); - } else -- dprintf(idx, "Error: %s\n", interp->result); -+ dprintf(idx, "Error: %s\n", (char *)Tcl_GetStringResult(interp)); - } - - static void cmd_module(struct userrec *u, int idx, char *par) ---- src/dcc.c.orig 2013-05-14 09:34:52.000000000 +0200 -+++ src/dcc.c 2013-05-14 09:35:45.000000000 +0200 -@@ -1632,10 +1632,12 @@ - Tcl_SetVar(interp, "_n", s, 0); - Tcl_SetVar(interp, "_a", args, 0); - if (Tcl_VarEval(interp, name, " $_n $_a", NULL) == TCL_ERROR) { -- putlog(LOG_MISC, "*", DCC_TCLERROR, name, interp->result); -+ putlog(LOG_MISC, "*", DCC_TCLERROR, name, Tcl_GetStringResult(interp)); - return -1; - } -- return (atoi(interp->result)); -+ int ret; -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &ret); -+ return (ret); - } - - static void dcc_script(int idx, char *buf, int len) ---- src/dns.c.orig 2013-05-14 09:36:01.000000000 +0200 -+++ src/dns.c 2013-05-14 09:36:55.000000000 +0200 -@@ -213,10 +213,10 @@ - output = Tcl_Concat(2, argv); - - if (Tcl_Eval(interp, output) == TCL_ERROR) -- putlog(LOG_MISC, "*", DCC_TCLERROR, tclinfo->proc, interp->result); -+ putlog(LOG_MISC, "*", DCC_TCLERROR, tclinfo->proc, Tcl_GetStringResult(interp)); - Tcl_Free(output); - } else if (Tcl_Eval(interp, Tcl_DStringValue(&list)) == TCL_ERROR) -- putlog(LOG_MISC, "*", DCC_TCLERROR, tclinfo->proc, interp->result); -+ putlog(LOG_MISC, "*", DCC_TCLERROR, tclinfo->proc, Tcl_GetStringResult(interp)); - - Tcl_DStringFree(&list); - ---- src/main.c.orig 2013-05-14 09:37:10.000000000 +0200 -+++ src/main.c 2013-05-14 09:37:42.000000000 +0200 -@@ -246,12 +246,12 @@ - - dprintf(-x, "Tcl library: %s\n", - ((interp) && (Tcl_Eval(interp, "info library") == TCL_OK)) ? -- interp->result : "*unknown*"); -+ Tcl_GetStringResult(interp): "*unknown*"); - - dprintf(-x, "Tcl version: %s (header version %s)\n", - ((interp) && (Tcl_Eval(interp, "info patchlevel") == TCL_OK)) ? -- interp->result : (Tcl_Eval(interp, "info tclversion") == TCL_OK) ? -- interp->result : "*unknown*", TCL_PATCH_LEVEL ? TCL_PATCH_LEVEL : -+ Tcl_GetStringResult(interp) : (Tcl_Eval(interp, "info tclversion") == TCL_OK) ? -+ Tcl_GetStringResult(interp) : "*unknown*", TCL_PATCH_LEVEL ? TCL_PATCH_LEVEL : - "*unknown*"); - - #if HAVE_TCL_THREADS ---- src/proto.h.orig 2013-05-14 09:38:45.000000000 +0200 -+++ src/proto.h 2013-05-14 09:38:54.000000000 +0200 -@@ -239,8 +239,8 @@ - char *hostnamefromip(unsigned long); - void killsock(int); - int answer(int, char *, unsigned long *, unsigned short *, int); --inline int open_listen(int *); --inline int open_listen_by_af(int *, int); -+int open_listen(int *); -+int open_listen_by_af(int *, int); - int open_address_listen(IP addr, int *); - int open_telnet(char *, int); - int open_telnet_dcc(int, char *, char *); ---- src/tcl.c.orig 2013-05-14 09:39:15.000000000 +0200 -+++ src/tcl.c 2013-05-14 09:39:44.000000000 +0200 -@@ -204,7 +204,7 @@ - return "read-only variable"; - else { - if (Tcl_ExprLong(interp, s, &l) == TCL_ERROR) -- return interp->result; -+ return Tcl_GetStringResult(interp); - if ((int *) ii->var == &max_dcc) { - if (l < max_dcc) - return "you can't DECREASE max-dcc"; -@@ -640,7 +640,7 @@ - code = Tcl_Eval(interp, script); - if (code != TCL_OK) { - putlog(LOG_MISC, "*", "Tcl error in script for '%s':", whatzit); -- putlog(LOG_MISC, "*", "%s", interp->result); -+ putlog(LOG_MISC, "*", "%s", Tcl_GetStringResult(interp)); - } - } - ---- src/tcldcc.c.orig 2013-05-14 09:40:00.000000000 +0200 -+++ src/tcldcc.c 2013-05-14 09:41:07.000000000 +0200 -@@ -178,11 +178,11 @@ - else { - Tcl_SetVar(irp, "chan", argv[2], 0); - if (Tcl_VarEval(irp, "assoc ", "$chan", NULL) != TCL_OK || -- !interp->result[0]) { -+ !Tcl_GetStringResult(interp)[0]) { - Tcl_AppendResult(irp, "channel name is invalid", NULL); - return TCL_ERROR; - } -- chan = atoi(interp->result); -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &chan); - } - } else - chan = atoi(argv[2]); -@@ -622,11 +622,11 @@ - if ((argv[1][0] < '0') || (argv[1][0] > '9')) { - Tcl_SetVar(interp, "chan", argv[1], 0); - if ((Tcl_VarEval(interp, "assoc ", "$chan", NULL) != TCL_OK) || -- !interp->result[0]) { -+ !Tcl_GetStringResult(interp)[0]) { - Tcl_AppendResult(irp, "channel name is invalid", NULL); - return TCL_ERROR; - } -- chan = atoi(interp->result); -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &chan); - } else - chan = atoi(argv[1]); - if ((chan < 0) || (chan > 199999)) { ---- src/tclhash.c.orig 2013-05-14 09:41:32.000000000 +0200 -+++ src/tclhash.c 2013-05-14 09:45:25.000000000 +0200 -@@ -643,14 +643,14 @@ - x = Tcl_VarEval(interp, proc, param, NULL); - Context; - if (x == TCL_ERROR) { -- if (strlen(interp->result) > 400) -- interp->result[400] = 0; -- putlog(LOG_MISC, "*", "Tcl error [%s]: %s", proc, interp->result); -+ putlog(LOG_MISC, "*", "Tcl error [%s]: %s", proc, Tcl_GetStringResult(interp)); - return BIND_EXECUTED; - } else { -- if (!strcmp(interp->result, "break")) -+ if (!strcmp(Tcl_GetStringResult(interp), "break")) - return BIND_EXEC_BRK; -- return (atoi(interp->result) > 0) ? BIND_EXEC_LOG : BIND_EXECUTED; -+ int ret; -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &ret); -+ return (ret > 0) ? BIND_EXEC_LOG : BIND_EXECUTED; - } - } - -@@ -702,7 +702,7 @@ - Tcl_SetVar(interp, "lastbind", (char *) tm->mask, TCL_GLOBAL_ONLY); - x = trigger_bind(tc->func_name, param); - if (match_type & BIND_ALTER_ARGS) { -- if (interp->result == NULL || !interp->result[0]) -+ if (Tcl_GetStringResult(interp) == NULL || !Tcl_GetStringResult(interp)[0]) - return x; - } else if ((match_type & BIND_WANTRET) && x == BIND_EXEC_LOG) - return x; -@@ -868,10 +868,10 @@ - MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE | - BIND_WANTRET | BIND_ALTER_ARGS); - if (x == BIND_EXECUTED || x == BIND_EXEC_LOG) { -- if (interp->result == NULL || !interp->result[0]) -+ if (Tcl_GetStringResult(interp) == NULL || !Tcl_GetStringResult(interp)[0]) - return ""; - else -- return interp->result; -+ return Tcl_GetStringResult(interp); - } else - return text; - } -@@ -896,7 +896,7 @@ - Tcl_SetVar(interp, "_n", (char *) s, 0); - x = Tcl_VarEval(interp, cmd, " $_n", NULL); - if (x == TCL_ERROR) -- putlog(LOG_MISC, "*", "error on listen: %s", interp->result); -+ putlog(LOG_MISC, "*", "error on listen: %s", Tcl_GetStringResult(interp)); - } - - void check_tcl_chjn(const char *bot, const char *nick, int chan, ---- src/tclhash.h.orig 2013-05-14 09:38:03.000000000 +0200 -+++ src/tclhash.h 2013-05-14 09:38:25.000000000 +0200 -@@ -47,7 +47,7 @@ - - #ifndef MAKING_MODS - --inline void garbage_collect_tclhash(void); -+void garbage_collect_tclhash(void); - - void init_bind(void); - void kill_bind(void); ---- src/users.c.orig 2013-05-14 09:45:44.000000000 +0200 -+++ src/users.c 2013-05-14 09:46:18.000000000 +0200 -@@ -469,7 +469,7 @@ - Tcl_SetVar(interp, "user", u->handle, 0); - n = 0; - if (Tcl_VarEval(interp, "notes ", "$user", NULL) == TCL_OK) -- n = atoi(interp->result); -+ Tcl_GetIntFromObj(interp, Tcl_GetObjResult(interp), &n); - li = get_user(&USERENTRY_LASTON, u); - if (!li || !li->laston) - strcpy(s1, "never"); diff --git a/irc/evangeline/pkg-descr b/irc/evangeline/pkg-descr deleted file mode 100644 index 7f75a0a0267c..000000000000 --- a/irc/evangeline/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Evangeline is an Internet Relay Chat (IRC) Bot based on Eggdrop. -Its done for IRCnet network and most changes are done to make the bot -best there. Bot might not work correctly on other networks (known problems -with kicking on Quakenet). -Evangeline can be simply extended with modules (Eggdrop's modules with -some modifications) and Tcl scripts of course.