Mon Jul 24 22:21:42 2023 UTC ()
irssi-icb: update to 0.17

This changes the upstream to a fork of the previous one, with extra
commits bringing support for irssi 1.4. Besides fixing the build (and
that of meta-pkgs/bulk-small) this also:

* Adds a buildlink3.mk file to chat/irssi;
* And therefore can avoid extracting a copy of irssi to build;
* Leverages autoreconf to build without a release (git commit ID)
* Reduces the patches required to two.

This is inspired by FreeBSD's port of the same software (irc/irssi-icb).

Tested on NetBSD/amd64; reviewed by jperkin@.


(khorben)
diff -r1.34 -r1.35 pkgsrc/chat/irssi/Makefile.common
diff -r0 -r1.1 pkgsrc/chat/irssi/buildlink3.mk
diff -r1.49 -r1.50 pkgsrc/chat/irssi-icb/Makefile
diff -r1.41 -r1.42 pkgsrc/chat/irssi-icb/distinfo
diff -r1.2 -r0 pkgsrc/chat/irssi-icb/patches/patch-am
diff -r1.2 -r0 pkgsrc/chat/irssi-icb/patches/patch-an
diff -r0 -r1.1 pkgsrc/chat/irssi-icb/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-protocol.c
diff -r1.1 -r0 pkgsrc/chat/irssi-icb/patches/patch-src_core_Makefile.in
diff -r1.1 -r0 pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-core.c
diff -r1.1 -r0 pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c
diff -r1.1 -r0 pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_module-formats.c
Tue Jul 25 07:21:42 2023
Mon Jun 26 19:37:13 2023
pkgsrc/chat/irssi-icb/patches/patch-am,v
anoncvs not yet been updated
Tue Jul 25 07:21:42 2023
Mon Jun 26 19:37:13 2023
pkgsrc/chat/irssi-icb/patches/patch-an,v
anoncvs not yet been updated
Tue Jul 25 07:21:42 2023
Mon Jun 26 19:37:13 2023
pkgsrc/chat/irssi-icb/patches/patch-src_core_Makefile.in,v
anoncvs not yet been updated
Tue Jul 25 07:21:42 2023
Mon Jun 26 19:37:13 2023
pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-core.c,v
anoncvs not yet been updated
Tue Jul 25 07:21:42 2023
Mon Jun 26 19:37:13 2023
pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c,v
anoncvs not yet been updated
Tue Jul 25 07:21:42 2023
Mon Jun 26 19:37:13 2023
pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_module-formats.c,v
anoncvs not yet been updated
cvs diff -r1.34 -r1.35 pkgsrc/chat/irssi/Makefile.common (expand / switch to unified diff)

--- pkgsrc/chat/irssi/Makefile.common 2023/05/13 13:06:46 1.34
+++ pkgsrc/chat/irssi/Makefile.common 2023/07/24 22:21:42 1.35
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile.common,v 1.34 2023/05/13 13:06:46 nikita Exp $ 1# $NetBSD: Makefile.common,v 1.35 2023/07/24 22:21:42 khorben Exp $
2# 2#
3# used by chat/irssi-icb/Makefile 3# used by chat/irssi-icb/Makefile
4# used by chat/irssi-xmpp/Makefile 
5 4
6# Specific distribution information. 5# Specific distribution information.
7IRSSI_VERSION= 1.4.4 6IRSSI_VERSION= 1.4.4
8IRSSI_DISTNAME= irssi-${IRSSI_VERSION} 7IRSSI_DISTNAME= irssi-${IRSSI_VERSION}
9IRSSI_EXTRACT_SUFX= .tar.gz 8IRSSI_EXTRACT_SUFX= .tar.gz
10IRSSI_DISTFILE= ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX} 9IRSSI_DISTFILE= ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
11SITES.${IRSSI_DISTFILE}= https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/ 10SITES.${IRSSI_DISTFILE}= https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/
12 11
13# These files are generated during Irssi's build, but are required by 12# These files are generated during Irssi's build, but are required by
14# plugins to compile properly. 13# plugins to compile properly.
15IRSSI_CONFIG= ${PREFIX}/share/irssi/irssi-config 14IRSSI_CONFIG= ${PREFIX}/share/irssi/irssi-config
16IRSSI_CONFIG_H= ${PREFIX}/include/irssi/irssi-config.h 15IRSSI_CONFIG_H= ${PREFIX}/include/irssi/irssi-config.h
File Added: pkgsrc/chat/irssi/buildlink3.mk
# $NetBSD: buildlink3.mk,v 1.1 2023/07/24 22:21:42 khorben Exp $

BUILDLINK_TREE+=        irssi

.if !defined(IRSSI_BUILDLINK3_MK)
IRSSI_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.irssi+=    irssi>=1.4.4
BUILDLINK_ABI_DEPENDS.irssi+=    irssi>=1.4.4
BUILDLINK_PKGSRCDIR.irssi?=      ../../chat/irssi

.endif # IRSSI_BUILDLINK3_MK

BUILDLINK_TREE+=        -irssi
cvs diff -r1.49 -r1.50 pkgsrc/chat/irssi-icb/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/irssi-icb/Makefile 2022/07/07 16:28:55 1.49
+++ pkgsrc/chat/irssi-icb/Makefile 2023/07/24 22:21:42 1.50
@@ -1,42 +1,37 @@ @@ -1,42 +1,37 @@
1# $NetBSD: Makefile,v 1.49 2022/07/07 16:28:55 jperkin Exp $ 1# $NetBSD: Makefile,v 1.50 2023/07/24 22:21:42 khorben Exp $
2# 2#
3 3
4DISTNAME= irssi-icb-0.15 4DISTNAME= irssi-icb-0.17
5PKGREVISION= 8 
6CATEGORIES= chat 5CATEGORIES= chat
7MASTER_SITES= https://github.com/downloads/jperkin/irssi-icb/ 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mglocker/}
8DISTFILES= ${DISTNAME}.tar.gz ${IRSSI_DISTFILE} 7GITHUB_TAG= c4e2ea8939b5b75d1941ebe3335475482d218838
 8DISTFILES= ${DISTNAME}-${GITHUB_TAG}.tar.gz
9 9
10MAINTAINER= jperkin@pkgsrc.org 10MAINTAINER= jperkin@pkgsrc.org
11HOMEPAGE= http://www.irssi.org/ 11HOMEPAGE= http://www.irssi.org/
12COMMENT= Irssi plugin to access ICB networks 12COMMENT= Irssi plugin to access ICB networks
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16.include "../../chat/irssi/Makefile.common" 16.include "../../chat/irssi/Makefile.common"
17 17
18WRKSRC= ${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME} 18USE_TOOLS+= autoreconf autoconf automake gmake
19 
20DEPENDS+= irssi>=${IRSSI_VERSION}:../../chat/irssi 
21 
22GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
23 20
24USE_LIBTOOL= yes 21USE_LIBTOOL= yes
25USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
26SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
27 24
28CONFIGURE_ARGS+= --with-irssi=${WRKDIR}/${IRSSI_DISTNAME} 25CONFIGURE_ARGS+= --with-irssi=${PREFIX}/include/irssi
29 26
30INSTALLATION_DIRS+= share/doc/irssi 27INSTALLATION_DIRS+= share/doc/irssi
31 28
32post-extract: 29pre-configure:
33 cd ${WRKDIR} && ${LN} -s ${IRSSI_DISTNAME:S/a//} ${IRSSI_DISTNAME} 30 ${RUN} cd ${WRKSRC} && autoreconf -i
34 ${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${IRSSI_DISTNAME} 
35 ${CP} ${IRSSI_CONFIG_H} ${WRKDIR}/${IRSSI_DISTNAME}/config.h 
36 ${CP} ${IRSSI_CONFIG} ${WRKDIR}/${IRSSI_DISTNAME}/irssi-config 
37 31
38post-install: 32post-install:
39 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/irssi/README.icb 33 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/irssi/README.icb
40 34
 35.include "../../chat/irssi/buildlink3.mk"
41.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.41 -r1.42 pkgsrc/chat/irssi-icb/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/irssi-icb/distinfo 2021/10/26 10:05:17 1.41
+++ pkgsrc/chat/irssi-icb/distinfo 2023/07/24 22:21:42 1.42
@@ -1,14 +1,7 @@ @@ -1,14 +1,7 @@
1$NetBSD: distinfo,v 1.41 2021/10/26 10:05:17 nia Exp $ 1$NetBSD: distinfo,v 1.42 2023/07/24 22:21:42 khorben Exp $
2 2
3BLAKE2s (irssi-1.2.3.tar.gz) = 7ac7c6a1e29a75c19faf86dc80ccbf54a2cbc5f93beef251874a39fd51135766 3BLAKE2s (irssi-icb-0.17-c4e2ea8939b5b75d1941ebe3335475482d218838.tar.gz) = 1d9ce4be568c87c937bab6f15eba77a323d23bf927ce9b249a0e0c899a6a7069
4SHA512 (irssi-1.2.3.tar.gz) = 7e4c8dc2d8e3532f26775702254339ba92e276c82b5a7041756574096928e25f2614d04a1cfa091ba90bc3e5a0d552578b80bc89c3c87c6d48722139c2ae47ff 4SHA512 (irssi-icb-0.17-c4e2ea8939b5b75d1941ebe3335475482d218838.tar.gz) = 59149066c5d8468bd43d2d5c52605ba7f42be7ad1df43f496d4af0fb8102d4636724ca937957cb575e41a361db7c0ac1afd549af770d29fbbc031884eddeee38
5Size (irssi-1.2.3.tar.gz) = 1824077 bytes 5Size (irssi-icb-0.17-c4e2ea8939b5b75d1941ebe3335475482d218838.tar.gz) = 23084 bytes
6BLAKE2s (irssi-icb-0.15.tar.gz) = c75451c2dd9b78535248e29999c3424c974a3c4482f3b15a1338084f08806925 6SHA1 (patch-configure.ac) = 6f67f215e9ab970120c2280b50d2ca38c255d88c
7SHA512 (irssi-icb-0.15.tar.gz) = 00af04d14c2c6b65eaf93f9859e6f9f51be4bc8b270c602f4f3b2cc722b148f35c29c7efb12432b063dd41095cf823f2ad329515b0298d0c541742199f3c5fa5 7SHA1 (patch-src_core_icb-protocol.c) = 3238f7ee93aa1c54e83607299e8f45d63562defb
8Size (irssi-icb-0.15.tar.gz) = 306973 bytes 
9SHA1 (patch-am) = 3bd9e38d0fde6d99d9b6a6ad67268bd63a8a92e2 
10SHA1 (patch-an) = bca7fff754b60b49a6322bd5595a4a7f4003a828 
11SHA1 (patch-src_core_Makefile.in) = d052d78b4f084da51498f1df934ca16412b8e5a0 
12SHA1 (patch-src_core_icb-core.c) = fc0f99c383b6452d09641c2b5f049166370d1fc2 
13SHA1 (patch-src_fe-common_fe-icb.c) = 47ca218d295a818028102ca041cf4b9c2053276b 
14SHA1 (patch-src_fe-common_module-formats.c) = 5af701e6919051c834c52e6932e0028324362b9f 
File Deleted: pkgsrc/chat/irssi-icb/patches/patch-am
File Deleted: pkgsrc/chat/irssi-icb/patches/patch-an
File Added: pkgsrc/chat/irssi-icb/patches/patch-configure.ac
$NetBSD: patch-configure.ac,v 1.1 2023/07/24 22:21:42 khorben Exp $

--- configure.ac.orig	2016-06-24 06:33:59.000000000 +0000
+++ configure.ac
@@ -19,24 +19,11 @@ AC_ARG_WITH([irssi],
             [],
             [with_irssi=no])
 
-AS_IF([test "x$with_irssi" = "xno"], [
-      AS_IF([test -f ../irssi-config],
-            [with_irssi=".."],
-            AS_IF([test -f ../irssi/irssi-config],
-                  [with_irssi="../.."],
-                  AS_IF([test -f ../../irssi/irssi-config],
-                        [with_irssi="../../irssi"],
-                        AS_ERROR([Could not determine irssi directory])))) ])
-
 # fix relative paths
 IRSSI_INCLUDE=`cd $with_irssi; pwd`
 
 AC_SUBST(IRSSI_INCLUDE)
 
-AS_IF([test ! -f "$IRSSI_INCLUDE/irssi-config"],
-      [AC_ERROR(Not irssi directory: $IRSSI_INCLUDE)]
-)
-
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 
 AC_CONFIG_FILES([
File Added: pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-protocol.c
$NetBSD: patch-src_core_icb-protocol.c,v 1.1 2023/07/24 22:21:42 khorben Exp $

--- src/core/icb-protocol.c.orig	2023-07-21 23:08:13.814105120 +0000
+++ src/core/icb-protocol.c
@@ -340,8 +340,8 @@ static void sig_server_connected(ICB_SER
                 return;
 
 	server->readtag =
-		g_input_add(net_sendbuffer_handle(server->handle),
-			    G_INPUT_READ,
+		i_input_add(net_sendbuffer_handle(server->handle),
+			    I_INPUT_READ,
 			    (GInputFunction) icb_parse_incoming, server);
 }
File Deleted: pkgsrc/chat/irssi-icb/patches/patch-src_core_Makefile.in
File Deleted: pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-core.c
File Deleted: pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c
File Deleted: pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_module-formats.c