diff options
Diffstat (limited to 'irc/slirc/files')
| -rw-r--r-- | irc/slirc/files/patch-Makefile | 37 | ||||
| -rw-r--r-- | irc/slirc/files/patch-VFile.txt | 5 | ||||
| -rw-r--r-- | irc/slirc/files/patch-check_slang | 10 | ||||
| -rw-r--r-- | irc/slirc/files/patch-lru.c | 22 | ||||
| -rw-r--r-- | irc/slirc/files/patch-slirc.c | 119 | ||||
| -rw-r--r-- | irc/slirc/files/patch-slload.c | 11 | ||||
| -rw-r--r-- | irc/slirc/files/patch-utils-module.c | 10 | ||||
| -rw-r--r-- | irc/slirc/files/patch-vfile-module.c | 178 | ||||
| -rw-r--r-- | irc/slirc/files/pkg-message.in | 18 |
9 files changed, 0 insertions, 410 deletions
diff --git a/irc/slirc/files/patch-Makefile b/irc/slirc/files/patch-Makefile deleted file mode 100644 index f8dac4eee99e..000000000000 --- a/irc/slirc/files/patch-Makefile +++ /dev/null @@ -1,37 +0,0 @@ ---- Makefile.orig 1999-08-23 22:42:02.000000000 +0200 -+++ Makefile 2014-05-08 18:53:51.000000000 +0200 -@@ -1,10 +1,10 @@ - #!/bin/make -f - --CC=gcc --CFLAGS:=-Wall -Wmissing-declarations -Wstrict-prototypes -O2 -Iinclude -+CC?=cc -+CFLAGS+=-Wall -Wmissing-declarations -Wstrict-prototypes -I$(SLANG_INCDIR) $(KANJI) - SOFLAGS:=-shared -fPIC -Wl,-export-dynamic - LDFLAGS:=-s --LIBS:=-ldl -lm -Llib -lslang -+LIBS:=-lm -ltermcap -L$(SLANG_LIBDIR) -lslang - - pwd:=$(shell pwd) - -@@ -41,13 +41,13 @@ - ifeq ($(CFG_DIR),$(pwd)) - @echo "Running from local dir, no global install" - else -- [ -d $(bin_dir) ] || mkdir -p $(bin_dir) -- [ -d $(lib_dir) ] || mkdir -p $(lib_dir) -- [ -d $(CFG_DIR) ] || mkdir -p $(CFG_DIR) -- [ -d $(script_dir) ] || mkdir -p $(script_dir) -- install -p -o root -g root -m755 slirc $(bin_dir) -- install -p -o root -g root -m755 $(MODULES) $(CFG_DIR) -- install -p -o root -g root -m644 scripts/*.sl $(script_dir) -+ [ -d $(DESTDIR)$(bin_dir) ] || mkdir -p $(DESTDIR)$(bin_dir) -+ [ -d $(DESTDIR)$(lib_dir) ] || mkdir -p $(DESTDIR)$(lib_dir) -+ [ -d $(DESTDIR)$(CFG_DIR) ] || mkdir -p $(DESTDIR)$(CFG_DIR) -+ [ -d $(DESTDIR)$(script_dir) ] || mkdir -p $(DESTDIR)$(script_dir) -+ $(BSD_INSTALL_PROGRAM) slirc $(DESTDIR)$(bin_dir) -+ $(BSD_INSTALL_LIB) $(MODULES) $(DESTDIR)$(CFG_DIR) -+ $(BSD_INSTALL_SCRIPT) scripts/*.sl $(DESTDIR)$(script_dir) - endif - - slirc: slirc.o lru.o slload.o windoze.o diff --git a/irc/slirc/files/patch-VFile.txt b/irc/slirc/files/patch-VFile.txt deleted file mode 100644 index 31ffdebd0ef6..000000000000 --- a/irc/slirc/files/patch-VFile.txt +++ /dev/null @@ -1,5 +0,0 @@ ---- sldocs/VFile.txt.orig Sun Aug 22 00:40:49 1999 -+++ sldocs/VFile.txt Sat Jan 6 20:26:41 2001 -@@ -213 +213 @@ -- O_SYNC -+ O_FSYNC diff --git a/irc/slirc/files/patch-check_slang b/irc/slirc/files/patch-check_slang deleted file mode 100644 index f3efc828ac3f..000000000000 --- a/irc/slirc/files/patch-check_slang +++ /dev/null @@ -1,10 +0,0 @@ ---- check_slang.orig Sat Aug 21 03:25:35 1999 -+++ check_slang Sat Jan 6 09:39:13 2001 -@@ -1,5 +1,5 @@ --#!/bin/bash -- -+#!/bin/sh -+exit 0 # FreeBSD port: We know we have libslang already installed. - # This little script to alert people who didn't bother to read - # step (0) in the README installation instructions - diff --git a/irc/slirc/files/patch-lru.c b/irc/slirc/files/patch-lru.c deleted file mode 100644 index b13118974767..000000000000 --- a/irc/slirc/files/patch-lru.c +++ /dev/null @@ -1,22 +0,0 @@ ---- lru.c.orig Sun Aug 22 13:14:28 1999 -+++ lru.c Sun Aug 22 17:15:12 2004 -@@ -253,8 +253,9 @@ - if (el) { - do { - if (!(p = index(el->str, '!'))) -- p = "NoBang"; -- len = p - el->str; -+ len = strlen(el->str); -+ else -+ len = p - el->str; - if (ix + len > SLtt_Screen_Cols - 2) - break; - if (ix) { -@@ -283,6 +284,7 @@ - Col = ColLRUmesg; - break; - case 'm': -+ break; - } - SLsmg_set_color(Col); - } diff --git a/irc/slirc/files/patch-slirc.c b/irc/slirc/files/patch-slirc.c deleted file mode 100644 index c76a11c95c72..000000000000 --- a/irc/slirc/files/patch-slirc.c +++ /dev/null @@ -1,119 +0,0 @@ ---- ./slirc.c.orig 1999-08-23 11:15:11.000000000 -0400 -+++ ./slirc.c 2009-01-18 22:11:53.000000000 -0500 -@@ -81,7 +81,7 @@ - char buf[130]; - - sprintf(buf, "Caught sig %d (%s)", signum, Top2); -- SLang_doerror(buf); -+ SLang_verror(signum, buf); - if (VF_reset) SLexecute_function(VF_reset); - exit(1); - } -@@ -242,7 +242,7 @@ - { - char secs[8]; - -- sprintf(Status, "%s -> %s Server[%s] %s", -+ snprintf(Status, sizeof(Status), "%s -> %s Server[%s] %s", - NickName, Target, ServerName, StatMsg); - - SLsmg_gotorc(start, 0); -@@ -339,13 +339,15 @@ - - /* now for scripts search-path */ - if((q = getenv("HOME"))) -- sprintf(SLirc_Load_Path,"%s/.slirc/scripts:",q); -+ snprintf(SLirc_Load_Path, 196, "%s/.slirc/scripts",q); - else -- sprintf(SLirc_Load_Path,"/home/%s/.slirc/scripts:",p); -+ snprintf(SLirc_Load_Path, 196, "/home/%s/.slirc/scripts",p); - - if (2 != SLpath_file_exists(SLirc_Load_Path)) - SLirc_Load_Path[0] = '\0'; -- -+ else -+ strcat(SLirc_Load_Path, ":"); -+ - strcat(SLirc_Load_Path,SCRIPTPATH); /* SCRIPTPATH defined in Makefile */ - } - -@@ -758,7 +760,7 @@ - SLsmg_reset_smg(); - SLang_reset_tty(); - if (VF_reset) SLexecute_function(VF_reset); -- SLang_doerror(st); -+ SLang_verror(SL_INTRINSIC_ERROR, st); - puts(st); - exit(1); - } -@@ -774,8 +776,8 @@ - - static void ClearSomeErrors(void) - { -- if (SLang_Error && SLang_Error != USER_BREAK) { -- SLang_Error = 0; -+ if (USER_BREAK != SLang_get_error()) { -+ SLang_set_error(0); - SLsmg_touch_lines(0, SLtt_Screen_Rows); - SLirc_UpdateDisplay(); - SLang_input_pending(20); -@@ -1016,7 +1018,7 @@ - SLtt_get_terminfo(); /* Get the terminal info. */ - SLtt_Use_Ansi_Colors = 1; - if (-1 == SLkp_init()) { -- SLang_doerror("SLkp_init failed."); -+ SLang_verror(SL_INTRINSIC_ERROR, "SLkp_init failed."); - exit(1); - } - -@@ -1026,7 +1028,7 @@ - * (actually, opost's ignored in slang-1.0.3 ) - */ - if (-1 == SLang_init_tty(abort_char, 0, 0)) { -- SLang_doerror("Unable to initialize the terminal."); -+ SLang_verror(SL_INTRINSIC_ERROR, "Unable to initialize the terminal."); - exit(1); - } - SLsmg_init_smg(); /* this does get_screen_size inside. */ -@@ -1073,9 +1075,9 @@ - SetStatus("Loading SLirc init script..."); - SLirc_UpdateDisplay(); - SLang_load_file(argv[1] ? argv[1] : "init.sl"); -- if (SLang_Error) { -- SLang_doerror("Oh, shit. Who fucked up that file, then?"); -- SLang_Error = 0; -+ if (SLang_get_error()) { -+ SLang_verror(SL_INTRINSIC_ERROR, "Oh, shit. Who fucked up that file, then?"); -+ SLang_set_error(0); - } - SLtt_Use_Ansi_Colors = UseColours; - SLirc_UpdateDisplay(); -@@ -1087,7 +1089,7 @@ - check_timed = SLang_get_function("check_timed"); - if (!check_timed) Fatal("check_timed is undefined"); - expiry = time(NULL)+5; -- while (SLang_Error != USER_BREAK) { -+ while (USER_BREAK != SLang_get_error()) { - int r,stkdep; - unsigned int tim; - -@@ -1106,7 +1108,7 @@ - tim = time(NULL); - if (tim<expiry) continue; - expiry += 5; -- stkdep = _SLstack_depth(); -+ stkdep = SLstack_depth(); - r = SLexecute_function(check_timed); - if (r==-1) Fatal("SLexecute_function(check_timed)?"); - # if 0 -@@ -1114,8 +1116,8 @@ - if (!r) Fatal("check_timed is undefined"); - # endif - SLirc_UpdateDisplay(); -- stkdep = _SLstack_depth() - stkdep; /* % items left on stack. */ -- if (stkdep && SLang_Error != USER_BREAK) { -+ stkdep = SLstack_depth() - stkdep; /* % items left on stack. */ -+ if (stkdep && USER_BREAK != SLang_get_error()) { - SLang_verror(SL_APPLICATION_ERROR, - "Eeek... check_timed() left %d units on stack",stkdep); - if (stkdep>0) SLdo_pop_n(stkdep); diff --git a/irc/slirc/files/patch-slload.c b/irc/slirc/files/patch-slload.c deleted file mode 100644 index 1fce02a4f86f..000000000000 --- a/irc/slirc/files/patch-slload.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ./slload.c.orig 1999-08-22 12:43:32.000000000 -0400 -+++ ./slload.c 2009-01-18 22:12:58.000000000 -0500 -@@ -84,7 +84,7 @@ - SLang_free_slstring(name); - SLdeallocate_load_type(x); - -- if (SLang_Error) return -1; -+ if (SLang_get_error()) return -1; - - return 0; - } diff --git a/irc/slirc/files/patch-utils-module.c b/irc/slirc/files/patch-utils-module.c deleted file mode 100644 index eee15bcfca27..000000000000 --- a/irc/slirc/files/patch-utils-module.c +++ /dev/null @@ -1,10 +0,0 @@ ---- utils-module.c.orig Mon Aug 23 01:39:11 1999 -+++ utils-module.c Sat Jan 6 08:46:47 2001 -@@ -11,6 +11,7 @@ - #include <string.h> - #include <stdlib.h> - #include <slang.h> -+#include <sys/types.h> - - /* this was just to verify that cp0 will be an slstring - static int is_same(char *cp0) diff --git a/irc/slirc/files/patch-vfile-module.c b/irc/slirc/files/patch-vfile-module.c deleted file mode 100644 index ec942ed2be66..000000000000 --- a/irc/slirc/files/patch-vfile-module.c +++ /dev/null @@ -1,178 +0,0 @@ ---- ./vfile-module.c.orig 2008-08-11 21:49:04.000000000 +0000 -+++ ./vfile-module.c 2008-08-11 22:25:20.246320000 +0000 -@@ -97,13 +97,13 @@ - int ct; - - if (at->data_type != SLANG_CHAR_TYPE) { -- SLang_doerror("Operation requires character array"); -+ SLang_verror(SL_INTRINSIC_ERROR, "Operation requires character array"); - return -1; - } - - if (len<0) ct = at->num_elements; - else if (len > at->num_elements) { -- SLang_doerror("Too much data for array size"); -+ SLang_verror(SL_INTRINSIC_ERROR, "Too much data for array size"); - return -1; - }else ct = len; - *data = at->data; -@@ -446,11 +446,11 @@ - - VFerrno = 0; - if (t->fd < 0) { -- /* SLang_doerror("file already closed"); */ -+ /* SLang_verror(SL_INTRINSIC_ERROR,"file already closed"); */ - r = 0; goto return_r; - } - if (t->rdvf || t->wrvf) { -- SLang_doerror("You must set_wrdep(*,*,0) before close"); -+ SLang_verror(SL_INTRINSIC_ERROR, "You must set_wrdep(*,*,0) before close"); - goto return_r; - } - r = close(t->fd); -@@ -1171,7 +1171,7 @@ - - l = t->rbuft - t->rbufr; - if (l <= 0) { /* shouldn't happen */ -- SLang_doerror("read_into_buf() called with window=0"); -+ SLang_verror(SL_INTRINSIC_ERROR,"read_into_buf() called with window=0"); - return -1; - } - if (t->fd < 0 || t->flags & SJ_EOF) return 0; /* also shouldn't happen */ -@@ -1209,7 +1209,7 @@ - - if (!l || t->rtermn < 0 || !(m = t->rbufr - t->rbufq)) goto dflt_ret; - if (t->rbufq < t->rbufp) { -- SLang_doerror("q<p"); -+ SLang_verror(SL_INTRINSIC_ERROR, "q<p"); - t->rbufq = t->rbufp; - } - if ( (cp = (char*)memchr(t->rbufq,t->rtermn,m)) -@@ -1259,7 +1259,7 @@ - - /*fprintf(stderr,"fd=%d, rthrsh=%d, bytes=%d\n",t->fd,t->rthrsh,t->rbufr-t->rbufp); */ - if (t->fd < 0) { -- SLang_doerror("Read on closed VFile"); -+ SLang_verror(SL_INTRINSIC_ERROR, "Read on closed VFile"); - goto return_r; - } - -@@ -1364,7 +1364,7 @@ - - if (!(mmt = pop_vfd(SJ_WRITE, &t))) goto free_fail; /* ct = -1 */ - if (t->fd < 0) { -- SLang_doerror("Write on closed VFile"); -+ SLang_verror(SL_INTRINSIC_ERROR, "Write on closed VFile"); - goto free_fail; - } - -@@ -1420,7 +1420,7 @@ - if (!(wr_mmt = pop_vfd(SJ_WRITE, &wt))) goto free1; - - if (wt != rt->wrvf || rt != wt->rdvf) { -- SLang_doerror("copybytes filepair not linked by set_wrdep()"); -+ SLang_verror(SL_INTRINSIC_ERROR, "copybytes filepair not linked by set_wrdep()"); - goto free2; - } - -@@ -1469,7 +1469,7 @@ - if (!(mmt = pop_vfd(SJ_READ, &t))) return -1; /* ct = -1 */ - - if (t->fd < 0) { -- SLang_doerror("Read on closed VFile"); -+ SLang_verror(SL_INTRINSIC_ERROR,"Read on closed VFile"); - r = -1; goto return_r; - } - r = check_buf_data(t); -@@ -1672,7 +1672,7 @@ - fnt = SLang_get_function(func_name); - if (!fnt) {r = -2; goto return_r;} - if (t->fd < 0) { -- SLang_doerror("Can't set_action() on closed VFile"); -+ SLang_verror(SL_INTRINSIC_ERROR,"Can't set_action() on closed VFile"); - r = -3; goto return_r; - } - } -@@ -1720,7 +1720,7 @@ - ) return -1; - - if (t->flags & SJ_UDP) { -- SLang_doerror("only default (unbuffered) rmode makes sense for UDP"); -+ SLang_verror(SL_INTRINSIC_ERROR,"only default (unbuffered) rmode makes sense for UDP"); - r = -1; goto return_r; - } - -@@ -1729,7 +1729,7 @@ - if (!ct) { - if (t->rthrsh) { /* changing from buffered to unbuffered */ - if (t->rbufr > t->rbufp) { -- SLang_doerror("must read data before switching to unbuffered mode"); -+ SLang_verror(SL_INTRINSIC_ERROR,"must read data before switching to unbuffered mode"); - r = -1; goto return_r; - } - SLfree(t->rbuf0); -@@ -1737,7 +1737,7 @@ - vfile_list_dirty = 1; /* just t */ - } - if (ch>=0) { -- SLang_doerror("termination char ignored in unbuffered mode"); -+ SLang_verror(SL_INTRINSIC_ERROR,"termination char ignored in unbuffered mode"); - ch = -1; - } - } -@@ -1802,12 +1802,12 @@ - stkdep = _SLstack_depth() - stkdep; /* % items left on stack. */ - /* for some reason, this next seems to cause segfault when */ - /* used from ./vf and do_actions() is called in SLang ?! */ -- if (stkdep && SLang_Error != USER_BREAK) { -+ if (stkdep && USER_BREAK != SLang_get_error()) { - SLang_verror(SL_APPLICATION_ERROR, - "Eeek... %s() left %d units on stack",t->fns[i]->name,stkdep); - if (stkdep>0) { - SLdo_pop_n(stkdep); -- SLang_Error = 0; /* probably safe to keep going */ -+ SLang_set_error(0); /* probably safe to keep going */ - } - } - -@@ -1840,7 +1840,7 @@ - ct++; - do_action_i(t,0); - if (t->fd >= 0 && t->fns[0] && rbufp == t->rbufp && check_buf_data(t) >= 0) { -- SLang_doerror("read-action did not handle data"); -+ SLang_verror(SL_INTRINSIC_ERROR,"read-action did not handle data"); - t->fns[0] = NULL; /* this to radically kill it */ - } - }while (!vfile_list_dirty && t != tn); -@@ -1868,7 +1868,7 @@ - static fd_set fds[3]; /* a big one, we could malloc */ - - if (do_actions_dep++) { /* we are NOT recursive! */ -- SLang_doerror("Can't call do_actions() recursively"); -+ SLang_verror(SL_INTRINSIC_ERROR,"Can't call do_actions() recursively"); - goto return_ct; - } - /*tim = (int)time(NULL); */ -@@ -2133,8 +2133,8 @@ - { - SLang_Class_Type *cl; - -- if (SLclass_add_typecast(SLANG_CHAR_TYPE, SLANG_INT_TYPE, char_to_int, 1) -- || SLclass_add_typecast(SLANG_INT_TYPE, SLANG_CHAR_TYPE, int_to_char, 1)) -+ if (SLclass_add_typecast(SLANG_CHAR_TYPE, SLANG_INT_TYPE, char_to_int, 1) -+ || SLclass_add_typecast(SLANG_INT_TYPE, SLANG_CHAR_TYPE, int_to_char, 1)) - { - fprintf(stderr,"VFile: fail add_typecast(CHAR<->INT)\n"); - return -1; -@@ -2151,8 +2151,9 @@ - - if (NULL == (cl = SLclass_allocate_class("VFile_Type"))) - return -1; -- cl->cl_destroy = destroy_vfile_type; -- cl->cl_string = vfile_string; -+ SLclass_set_destroy_function(cl, destroy_vfile_type); -+ SLclass_set_string_function(cl, vfile_string); -+ - if (-1 == SLclass_register_class(cl, SJ_VFILE_TYPE, sizeof(VFILE), SLANG_CLASS_TYPE_MMT)) - return -1; - diff --git a/irc/slirc/files/pkg-message.in b/irc/slirc/files/pkg-message.in deleted file mode 100644 index 4662c285c3f1..000000000000 --- a/irc/slirc/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -************************************************************ -Quickstart: - -- Copy config.sl and colours.sl to ~/.slirc/scripts - - mkdir -p ~/.slirc/scripts - cp %%PREFIX%%/lib/slirc/scripts/config.sl ~/.slirc/scripts - cp %%PREFIX%%/lib/slirc/scripts/colours.sl ~/.slirc/scripts - -- Edit ~/.slirc/scripts/config.sl - - () = s_putlast(servers,"server:port::nick"); - variable chan_on_connect = "channel"; - -- Set your name to the environment variable "IRCNAME" - - export IRCNAME="John Doe" -************************************************************ |