diff options
| -rw-r--r-- | network/ircII/NOTES_TO_SELF | 6 | ||||
| -rw-r--r-- | network/ircII/ircII.SlackBuild | 54 | ||||
| -rw-r--r-- | network/ircII/ircII.info | 8 | ||||
| -rw-r--r-- | network/ircII/patches/0002-ircII-goes-reverse-color-when-switching-colour-to-on.patch | 43 | ||||
| -rw-r--r-- | network/ircII/patches/manpage.diff (renamed from network/ircII/manpage.diff) | 16 | ||||
| -rw-r--r-- | network/ircII/patches/spelling.diff | 105 |
6 files changed, 181 insertions, 51 deletions
diff --git a/network/ircII/NOTES_TO_SELF b/network/ircII/NOTES_TO_SELF index be1695b90d..13128c3b0e 100644 --- a/network/ircII/NOTES_TO_SELF +++ b/network/ircII/NOTES_TO_SELF @@ -1,11 +1,5 @@ Notes to self: -repology shows that some distros (notably Gentoo) are packaging -newer snapshots. This build will stick with the version that Debian -packages, including their patches. - --- - wserv and ircio are executed correctly (in the new libexec/ircII dir), tested them with the following results: diff --git a/network/ircII/ircII.SlackBuild b/network/ircII/ircII.SlackBuild index ffc8dd1e1a..d3c24735e2 100644 --- a/network/ircII/ircII.SlackBuild +++ b/network/ircII/ircII.SlackBuild @@ -10,6 +10,9 @@ # Normally I prefer all-lowercase package names, but this just looks # *wrong* as "ircii". +# 20241126 bkw: update for v20240918. Depart from the Debian packaging; +# their patches no longer apply. + # 20210913 bkw: # - update for v20210616. The datestamp comes from the output of # "ircII -v" (not the ChangeLog). @@ -25,17 +28,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ircII -VERSION=${VERSION:-20210616_2} +VERSION=${VERSION:-20240918} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=${PRGNAM,,} -SRCVER=${VERSION%_*} - -# We're applying Debian's patches against a slightly older version. -DEBSRCVER=20210328 -DEBVER=${VERSION#*_} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -90,26 +88,19 @@ echo "=== DEFSRV='$DEFSRV', srvopt='$srvopt'" rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-$SRCVER.tar.bz2 -cd $SRCNAM -tar xvf $CWD/${SRCNAM}_$DEBSRCVER-$DEBVER.debian.tar.xz +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 +cd $SRCNAM-$VERSION chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -# apply most of Debian's patches, except: -# - the absolute-path patch would move the nonexistent -# /usr/share/irc/ircII.{motd,servers} to /etc/irc/{motd,servers}. -# Since we don't ship either file, and their paths are settable in -# ~/.ircrc anyway, I see no use for this patch. -# - the Add-ioption patch is meant to fix some compile warnings that we -# don't actually get. Plus, it won't apply cleanly. -rm -f debian/patches/0004-absolute-path* \ - debian/patches/0003-Add-ioption* - -for i in $( cat debian/patches/series ); do - [ -e debian/patches/$i ] && patch -p1 < debian/patches/$i +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +# 20241126 bkw: Debian's patches no longer apply, except the reverse +# color one. spelling.diff is based on their old spelling patch. +# manpage.diff is my own typo/grammar/etc fixes. minor nitpicks, maybe. +for i in $CWD/patches/*; do + echo "===> $i" + patch -p1 < $i done # fix warnings caused by missing includes. @@ -119,13 +110,13 @@ sed -i -e '1i#include <curses.h>' \ # do not compile with termcap. there's no --disable-termcap or similar, # have to do surgery. +# 20241126 bkw: also, upstream thinks it needs a newer autoconf than +# we have, but actually it's fine with 2.69. sed -i -e '/AC_CHECK_LIB(termcap/s,termcap,ncurses,g' \ -e 's,termcap\.h ,,' \ + -e '/AC_PREREQ/s,71,69,' \ configure.in -# my own typo/grammar/etc fixes. minor nitpicks, maybe. -patch -p1 < $CWD/manpage.diff - autoreconf -ifv # is there a disadvantage to enabling emacs meta keys? @@ -172,10 +163,11 @@ done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html perl doc/help2html.pl $PKG/usr/share/irc/help $PKG/usr/doc/$PRGNAM-$VERSION/html +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION rm -f doc/*.1 doc/*.spec* doc/*.orig doc/*.pl -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog NEWS README doc/* contrib $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKGDOC +cp -a ChangeLog NEWS README doc/* contrib $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install sed -e "s,@para_opt@,$para_opt," \ diff --git a/network/ircII/ircII.info b/network/ircII/ircII.info index 10744e2162..53e7f5cbb5 100644 --- a/network/ircII/ircII.info +++ b/network/ircII/ircII.info @@ -1,10 +1,8 @@ PRGNAM="ircII" -VERSION="20210616_2" +VERSION="20240918" HOMEPAGE="http://www.eterna.com.au/ircii/" -DOWNLOAD="https://slackware.uk/~urchlay/src/ircii-20210616.tar.bz2 \ - https://deb.debian.org/debian/pool/main/i/ircii/ircii_20210328-2.debian.tar.xz" -MD5SUM="521ede3dd468100373a9783841bc7a81 \ - 335e7e22d6a1c106f874586a81c7ea3d" +DOWNLOAD="https://slackware.uk/~urchlay/src/ircii-20240918.tar.bz2" +MD5SUM="427ef2d3c8785083d65fee8101093dda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/ircII/patches/0002-ircII-goes-reverse-color-when-switching-colour-to-on.patch b/network/ircII/patches/0002-ircII-goes-reverse-color-when-switching-colour-to-on.patch new file mode 100644 index 0000000000..49947f3ab0 --- /dev/null +++ b/network/ircII/patches/0002-ircII-goes-reverse-color-when-switching-colour-to-on.patch @@ -0,0 +1,43 @@ +From db1218712b39348f03925878963a24a7573ef83f Mon Sep 17 00:00:00 2001 +From: Gregory P. Smith <greg@electricrain.com> +Date: Wed, 29 Nov 2006 23:47:38 -0800 +Subject: ircII goes reverse color when switching colour to on in xterms + +Bug-Debian: http://bugs.debian.org/61008 +--- + include/config.h.dist | 4 +- + include/screen.h | 2 + + source/screen.c | 87 ++++++++++++++++++++++++++++++++++++++++++------ + 3 files changed, 80 insertions(+), 13 deletions(-) + +--- a/include/config.h.dist ++++ b/include/config.h.dist +@@ -111,7 +111,7 @@ + #define DEFAULT_ALWAYS_SPLIT_BIGGEST 1 + #define DEFAULT_AUTO_UNMARK_AWAY 0 + #define DEFAULT_AUTO_WHOWAS 0 +-#define DEFAULT_BACKGROUND_COLOUR 1 ++#define DEFAULT_BACKGROUND_COLOUR 16 + #define DEFAULT_BEEP 1 + #define DEFAULT_BEEP_MAX 3 + #define DEFAULT_BEEP_ON_MSG "NONE" +@@ -141,7 +141,7 @@ + #define DEFAULT_FLOOD_RATE 3 + #define DEFAULT_FLOOD_USERS 3 + #define DEFAULT_FLOOD_WARNING 0 +-#define DEFAULT_FOREGROUND_COLOUR 15 ++#define DEFAULT_FOREGROUND_COLOUR 16 + #define DEFAULT_FULL_STATUS_LINE 1 + #define DEFAULT_HELP_PAGER 1 + #define DEFAULT_HELP_PROMPT 1 +--- a/include/screen.h ++++ b/include/screen.h +@@ -44,6 +44,8 @@ + #define WAIT_PROMPT_LINE 0x01 + #define WAIT_PROMPT_KEY 0x02 + ++#define COLOUR_DEFAULT 16 ++ + /* Stuff for the screen/xterm junk */ + + #define ST_NOTHING -1 diff --git a/network/ircII/manpage.diff b/network/ircII/patches/manpage.diff index 4ad650926a..6224b2b9c5 100644 --- a/network/ircII/manpage.diff +++ b/network/ircII/patches/manpage.diff @@ -1,6 +1,6 @@ -diff -Naur ircii/doc/ircII.1 ircii.patched/doc/ircII.1 ---- ircii/doc/ircII.1 2021-06-18 14:20:02.000000000 -0400 -+++ ircii.patched/doc/ircII.1 2021-09-13 23:51:35.255955020 -0400 +diff -Naur ircii-20240918/doc/ircII.1 ircii-20240918.patched/doc/ircII.1 +--- ircii-20240918/doc/ircII.1 2024-09-20 01:30:10.000000000 -0400 ++++ ircii-20240918.patched/doc/ircII.1 2024-11-26 00:26:04.370000574 -0500 @@ -332,17 +332,17 @@ .Nm scripts, that can then be loaded with @@ -23,15 +23,13 @@ diff -Naur ircii/doc/ircII.1 ircii.patched/doc/ircII.1 Message of the day. This file is displayed only once each time it is changed. .El -@@ -399,9 +399,9 @@ - .Ic /HELP \&? +@@ -406,8 +406,8 @@ command as this prints a listing of all available help files. .Pp --Access to HTML version of the help files is availble from --.Lk http://eterna.com.au/ircii/help/ . + Access to HTML version of the help files is available from +-.Lk http://eterna23.net/ircii/help/ . -Note that these are generated from the builtin help files and -+Access to HTML versions of the help files is available from -+.Lk http://eterna.com.au/ircii/help/ ++.Lk http://eterna23.net/ircii/help/ +; note that these are generated from the builtin help files and may have formatting issues. .Sh SIGNALS diff --git a/network/ircII/patches/spelling.diff b/network/ircII/patches/spelling.diff new file mode 100644 index 0000000000..e26c45ee6a --- /dev/null +++ b/network/ircII/patches/spelling.diff @@ -0,0 +1,105 @@ +diff -Naur ircii-20240918/source/edit.c ircii-20240918.patched/source/edit.c +--- ircii-20240918/source/edit.c 2024-09-20 01:30:10.000000000 -0400 ++++ ircii-20240918.patched/source/edit.c 2024-11-26 00:12:58.858074498 -0500 +@@ -1330,7 +1330,7 @@ + } + else + { +- say("WHO -HOSTS: missing arguement"); ++ say("WHO -HOSTS: missing argument"); + new_free(&cmd); + return; + } +@@ -1349,7 +1349,7 @@ + } + else + { +- say("WHO -SERVERS: missing arguement"); ++ say("WHO -SERVERS: missing argument"); + new_free(&cmd); + return; + } +@@ -1364,7 +1364,7 @@ + } + else + { +- say("WHO -NAME: missing arguement"); ++ say("WHO -NAME: missing argument"); + new_free(&cmd); + return; + } +@@ -1379,7 +1379,7 @@ + } + else + { +- say("WHO -REALNAME: missing arguement"); ++ say("WHO -REALNAME: missing argument"); + new_free(&cmd); + return; + } +@@ -1394,7 +1394,7 @@ + } + else + { +- say("WHO -NICK: missing arguement"); ++ say("WHO -NICK: missing argument"); + new_free(&cmd); + return; + } +@@ -1409,7 +1409,7 @@ + } + else + { +- say("WHO -FILE: missing arguement"); ++ say("WHO -FILE: missing argument"); + new_free(&cmd); + return; + } +@@ -1553,7 +1553,7 @@ + { + if (!(nick = recv_nick)) + { +- say("You have not recieved a message from \ ++ say("You have not received a message from \ + anyone yet"); + goto out; + } +@@ -3593,7 +3593,7 @@ + + /* + * timercmd: the bit that handles the TIMER command. If there are no +- * arguements, then just list the currently pending timers, if we are ++ * arguments, then just list the currently pending timers, if we are + * give a -DELETE flag, attempt to delete the timer from the list. Else + * consider it to be a timer to add, and add it. + */ +@@ -3842,7 +3842,7 @@ + } + + /* +- * inputcmd: the INPUT command. Takes a couple of arguements... ++ * inputcmd: the INPUT command. Takes a couple of arguments... + * the first surrounded in double quotes, and the rest makes up + * a normal ircII command. The command is evalutated, with $* + * being the line that you input. Used add_wait_prompt() to prompt +diff -Naur ircii-20240918/source/keys.c ircii-20240918.patched/source/keys.c +--- ircii-20240918/source/keys.c 2024-09-20 01:30:10.000000000 -0400 ++++ ircii-20240918.patched/source/keys.c 2024-11-26 00:13:22.274072294 -0500 +@@ -1682,7 +1682,7 @@ + key_names[i].func(0, args); + break; + default: +- say("Ambigious function %s", arg); ++ say("Ambiguous function %s", arg); + break; + } + } +@@ -1803,7 +1803,7 @@ + break; + + default: +- say("Ambigious function %s", arg); ++ say("Ambiguous function %s", arg); + return; + } + |