ii: Update to 1.8

1.8 (2018-02-04):
    - prevent nick collisions by only setting the nick after the server
      accepted it and print a message about change to server log.
    - remove query.sh.
    - add OpenBSD pledge(2) support.
    - fix QUIT message string.
    - raw IRC output to stdout.
    - add quit command (/q [string]).
    - write timestamp in outfile as UNIX timestamp (UTC+0).
    - server host (-s) doesn't default to irc.freenode and is now required.
    - add option (-u) to connect directly to a UNIX domain socket, this
      is useful for tunneling connections.
    - remove "in" file when leaving a channel (enabled commented code).
    - remove "in" files on exit.
    - use IRC_MAX (512), instead of PIPE_BUF (4096) on most systems.
      PIPE_BUF is guaranteed to be atleast 512 bytes for atomic operations.
    - Makefile: always be verbose.
    - use C99 and -D_DEFAULT_SOURCE
    - remove obsolete gethostbyname, use getaddrinfo.
    - IPV6 support.
    - timeout now uses separate exit statuscode 2.
    - cleanup:
        - use arg.h for command-line option parsing.
        - use sbase util functions (estrtol, eprintf).
        - use and import OpenBSD strlcpy().
        - man page typos.
    - style:
        - linewrap to 79 characters.
        - coding style fixes.
        - non-roman numerals for LICENSE period.

4 files changed, 25 insertions, 16 deletions

diff --git a/chat/ii/Makefile b/chat/ii/Makefile
index 044337c64d5..622fcaf254d 100644
--- a/chat/ii/Makefile
+++ b/chat/ii/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/09/08 06:16:15 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/16 18:14:20 nia Exp $
 
-DISTNAME=	ii-1.7
+DISTNAME=	ii-1.8
 CATEGORIES=	chat
 MASTER_SITES=	https://dl.suckless.org/tools/
 
@@ -9,13 +9,8 @@ HOMEPAGE=	https://dl.suckless.org/tools/
 COMMENT=	Minimalist FIFO and filesystem-based IRC client
 LICENSE=	mit
 
-SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	pre-build
-SUBST_MESSAGE.makefile=	Fixing config.mk
-SUBST_FILES.makefile=	config.mk
-SUBST_SED.makefile=	-e 's,/usr/local,${PREFIX},g'
-SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
-SUBST_SED.makefile+=	-e 's,^LDFLAGS,\#LDFLAGS,g'
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
diff --git a/chat/ii/PLIST b/chat/ii/PLIST
index 69815da8acc..2915bc3877c 100644
--- a/chat/ii/PLIST
+++ b/chat/ii/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/04 20:17:42 youri Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/05/16 18:14:20 nia Exp $
 bin/ii
 man/man1/ii.1
 share/doc/ii/CHANGES
 share/doc/ii/FAQ
 share/doc/ii/LICENSE
 share/doc/ii/README
-share/doc/ii/query.sh
diff --git a/chat/ii/distinfo b/chat/ii/distinfo
index a474be14db3..1bf91c65c98 100644
--- a/chat/ii/distinfo
+++ b/chat/ii/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 01:20:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/05/16 18:14:20 nia Exp $
 
-SHA1 (ii-1.7.tar.gz) = 499f40b8d9cac6d2de0c27b1db087de6b819e279
-RMD160 (ii-1.7.tar.gz) = b107bf4b62ad77a91e383fd7b25dbf54d6238d43
-SHA512 (ii-1.7.tar.gz) = 1fa744bc9b4291b5c6c56e023d982aad59001137db6c7682284a2d63e649a32d558adbb85ae3407e312ae5436852b4278c2c522d4ef03f47cf54ea3a1f13ca90
-Size (ii-1.7.tar.gz) = 10174 bytes
+SHA1 (ii-1.8.tar.gz) = 143a8fbf5d3b5db1edb796c7a0679d107c13a4fa
+RMD160 (ii-1.8.tar.gz) = 9d6def21ef5edd4280aa59c3a2bc64d5a8dd6cd3
+SHA512 (ii-1.8.tar.gz) = 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
+Size (ii-1.8.tar.gz) = 12326 bytes
+SHA1 (patch-config.mk) = 3b307c3ba351242cdefece01d154bb0da315b8b8
diff --git a/chat/ii/patches/patch-config.mk b/chat/ii/patches/patch-config.mk
new file mode 100644
index 00000000000..72e58100d13
--- /dev/null
+++ b/chat/ii/patches/patch-config.mk
@@ -0,0 +1,14 @@
+$NetBSD: patch-config.mk,v 1.1 2020/05/16 18:14:20 nia Exp $
+
+Don't override CFLAGS/LDFLAGS
+
+--- config.mk.orig	2018-02-04 13:36:09.000000000 +0000
++++ config.mk
+@@ -21,5 +21,5 @@ CC       = cc
+ #LDFLAGS = ${LIBS}
+ 
+ # release
+-CFLAGS   = -Os ${INCLUDES} -DVERSION=\"${VERSION}\" -std=c99 -D_DEFAULT_SOURCE
+-LDFLAGS  = -s ${LIBS}
++CFLAGS  += ${INCLUDES} -DVERSION=\"${VERSION}\" -std=c99 -D_DEFAULT_SOURCE
++LDFLAGS += -s ${LIBS}