CVS commit: pkgsrc/chat/ii

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/chat/ii
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Tue, 2 Sep 2025 20:24:02 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Sep  2 20:24:02 UTC 2025

Modified Files:
        pkgsrc/chat/ii: Makefile PLIST distinfo
Added Files:
        pkgsrc/chat/ii: options.mk
        pkgsrc/chat/ii/patches: patch-Makefile patch-ii.c
Removed Files:
        pkgsrc/chat/ii/patches: patch-config.mk

Log Message:
chat/ii: update to 2.0

# pkgsrc changes
* Include TLS support (optional, enabled by default).
* Do not build strlcpy() compat unless required.

# upstream changes
* Add a die() function to replace fprintf(3) + exit(3) calls
* Fix undefined behaviour of use of isalpha, isdigit and tolower.
* Code clean-up and documentation improvements.
* Refactored Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/ii/Makefile pkgsrc/chat/ii/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/ii/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/ii/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/ii/patches/patch-Makefile \
    pkgsrc/chat/ii/patches/patch-ii.c
cvs rdiff -u -r1.1 -r0 pkgsrc/chat/ii/patches/patch-config.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/ii/Makefile
diff -u pkgsrc/chat/ii/Makefile:1.5 pkgsrc/chat/ii/Makefile:1.6
--- pkgsrc/chat/ii/Makefile:1.5 Mon Aug 22 17:47:51 2022
+++ pkgsrc/chat/ii/Makefile     Tue Sep  2 20:24:02 2025
@@ -1,18 +1,29 @@
-# $NetBSD: Makefile,v 1.5 2022/08/22 17:47:51 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2025/09/02 20:24:02 vins Exp $
 
-DISTNAME=      ii-1.8
+DISTNAME=      ii-2.0
 CATEGORIES=    chat
 MASTER_SITES=  https://dl.suckless.org/tools/
 
 MAINTAINER=    youri%NetBSD.org@localhost
-HOMEPAGE=      https://dl.suckless.org/tools/
+HOMEPAGE=      https://tools.suckless.org/ii/
 COMMENT=       Minimalist FIFO and filesystem-based IRC client
 LICENSE=       mit
 
-MAKE_FLAGS+=   PREFIX=${PREFIX}
-MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
+.include "options.mk"
+
+MAKE_FLAGS+=   PREFIX=${PREFIX} \
+               MANPREFIX=${PREFIX}/${PKGMANDIR} \
+               DOCPREFIX=${PREFIX}/share/doc
+
+.include "../../mk/bsd.prefs.mk"
 
 CFLAGS.SunOS+= -D__EXTENSIONS__
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+.if !${OPSYS:M*BSD} && ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS"
+# build strlcpy() compatibility
+CPPFLAGS+=     -DNEED_STRLCPY
+MAKE_FLAGS+=   LIBS+=strlcpy.o
+.endif
+
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/ii/distinfo
diff -u pkgsrc/chat/ii/distinfo:1.5 pkgsrc/chat/ii/distinfo:1.6
--- pkgsrc/chat/ii/distinfo:1.5 Tue Oct 26 10:05:16 2021
+++ pkgsrc/chat/ii/distinfo     Tue Sep  2 20:24:02 2025
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:05:16 nia Exp $
+$NetBSD: distinfo,v 1.6 2025/09/02 20:24:02 vins Exp $
 
-BLAKE2s (ii-1.8.tar.gz) = 2cf341124ac1333f9a08d8c041aaeabaaeb019833a54e0a97fd5d9ddb45c4e71
-SHA512 (ii-1.8.tar.gz) = 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
-Size (ii-1.8.tar.gz) = 12326 bytes
-SHA1 (patch-config.mk) = 3b307c3ba351242cdefece01d154bb0da315b8b8
+BLAKE2s (ii-2.0-tls.diff) = 4fd3b60f07c254a040810d15721cb9675154868c3656b7eadce67ad763c4eed5
+SHA512 (ii-2.0-tls.diff) = ee41dc661988b0158b5fc5e3fb92c0b6753993645882fe6a8fc1dc81e904bbcd01ca05623af4eaf8aa1a3fb31b1423ff533e35771f5b47c45fef7546be3c4cb9
+Size (ii-2.0-tls.diff) = 4917 bytes
+BLAKE2s (ii-2.0.tar.gz) = 85d8a85333511e52b913e285470fce32d38447a6cf19236ce186331ed15cebe9
+SHA512 (ii-2.0.tar.gz) = ab8102b5669495b7bc6a3311245f3eb49d2add1e387290e41deb51e121f4c7c98a09d117052c345d8b896149276a83790c0b78efe3ed19fc52bc00575bf8e44a
+Size (ii-2.0.tar.gz) = 11129 bytes
+SHA1 (patch-Makefile) = 2af128eecb5f60aae0f74d939975a05fbe1e8342
+SHA1 (patch-ii.c) = e958dad9b3f7fa2a11d5fe4715dc677178c94723

Index: pkgsrc/chat/ii/PLIST
diff -u pkgsrc/chat/ii/PLIST:1.2 pkgsrc/chat/ii/PLIST:1.3
--- pkgsrc/chat/ii/PLIST:1.2    Sat May 16 18:14:20 2020
+++ pkgsrc/chat/ii/PLIST        Tue Sep  2 20:24:02 2025
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2020/05/16 18:14:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/09/02 20:24:02 vins Exp $
 bin/ii
 man/man1/ii.1
-share/doc/ii/CHANGES
 share/doc/ii/FAQ
-share/doc/ii/LICENSE
 share/doc/ii/README

Added files:

Index: pkgsrc/chat/ii/options.mk
diff -u /dev/null pkgsrc/chat/ii/options.mk:1.1
--- /dev/null   Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/options.mk   Tue Sep  2 20:24:02 2025
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2025/09/02 20:24:02 vins Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ii
+PKG_SUPPORTED_OPTIONS= tls
+PKG_SUGGESTED_OPTIONS= tls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtls)
+PATCH_SITES=            ${HOMEPAGE}/patches/tls/
+PATCHFILES+=            ${DISTNAME}-tls.diff
+PATCH_DIST_STRIP=      -p1
+.  include "../../security/libretls/buildlink3.mk"
+.endif

Index: pkgsrc/chat/ii/patches/patch-Makefile
diff -u /dev/null pkgsrc/chat/ii/patches/patch-Makefile:1.1
--- /dev/null   Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/patches/patch-Makefile       Tue Sep  2 20:24:02 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-Makefile,v 1.1 2025/09/02 20:24:02 vins Exp $
+
+* Do not build strlcpy compat unless needed. 
+* Do not install license file.
+
+--- Makefile.orig      2025-09-02 19:20:32.164153033 +0000
++++ Makefile
+@@ -17,8 +17,7 @@ II_LDFLAGS = $(LDFLAGS)
+ # on systems which provide strlcpy(3),
+ # remove NEED_STRLCPY from CPPFLAGS and
+ # remove strlcpy.o from LIBS
+-II_CPPFLAGS = $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE -DNEED_STRLCPY
+-LIBS        = strlcpy.o
++II_CPPFLAGS = $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE
+ 
+ all: ii
+ 
+@@ -40,7 +39,7 @@ install: all
+       mkdir -p $(DESTDIR)$(PREFIX)/bin
+       mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+       mkdir -p $(DESTDIR)$(DOCPREFIX)/ii
+-      install -m 644 README FAQ LICENSE $(DESTDIR)$(DOCPREFIX)/ii
++      install -m 644 README FAQ $(DESTDIR)$(DOCPREFIX)/ii
+       install -m 775 ii $(DESTDIR)$(PREFIX)/bin
+       sed "s/VERSION/$(VERSION)/g" < ii.1 > $(DESTDIR)$(MANPREFIX)/man1/ii.1
+       chmod 644 $(DESTDIR)$(MANPREFIX)/man1/ii.1
Index: pkgsrc/chat/ii/patches/patch-ii.c
diff -u /dev/null pkgsrc/chat/ii/patches/patch-ii.c:1.1
--- /dev/null   Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/patches/patch-ii.c   Tue Sep  2 20:24:02 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-ii.c,v 1.1 2025/09/02 20:24:02 vins Exp $
+
+Make sure PATH_MAX is defined. 
+
+--- ii.c.orig  2022-10-04 17:25:51.000000000 +0000
++++ ii.c
+@@ -24,6 +24,10 @@ char *argv0;
+ 
+ #include "arg.h"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX _POSIX_PATH_MAX
++#endif
++
+ #ifdef NEED_STRLCPY
+ size_t strlcpy(char *, const char *, size_t);
+ #endif /* NEED_STRLCPY */

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index