CVS commit: pkgsrc/chat/irssi

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jun  6 11:03:28 UTC 2024

Modified Files:
        pkgsrc/chat/irssi: Makefile buildlink3.mk distinfo options.mk
Removed Files:
        pkgsrc/chat/irssi: MESSAGE Makefile.common

Log Message:
irssi: Update to 1.4.5.

pkgsrc fixes:

 * Remove useless MESSAGE
 * Fold Makefile.common back into Makefile
 * Remove obsolete variables
 * pkglint -Wall cleanup

v1.4.5 2023-10-03  The Irssi team <staff%irssi.org@localhost>
        + Add workaround for Perl 5.38.0 bug that breaks the Irssi
          locale and glyph rendering (scripts.irssi.org#857, #1498)
        - Fix Perl scripts broken by Perl 5.38 (scripts.irssi.org#851,
          #1474). With input from Leon Timmermans
        - Document workaround to fix linker errors when building with
          meson on Apple (#1435, #1492)
        - Fix meson using wrong filenames on Apple, leading to broken
          Perl support (#1483, #1493)
        - Fix /upgrade not accepting `~' (#1460, #1462). By Lukas Mai
        - Improve compatibility with Perl5-IDEA (#1465, #1467). By
          Charlie Daffern
        - Fix logic in how own actions are printed for other protocols
          (codeberg!5, #1471). By Andrej Kacian
        - Fix crash on old PowerPC Mac (#1482, #1484)
        - Fix wrong prototype of library function used in terminal
          handling (#1495). By Emil Engler
        - Minor cleanups (#1488, #1497). Includes work by Emil Engler
        - Minor help and documentation fixes (#1458, #1494, #1477,
          #1478). Includes work by KindOne


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/chat/irssi/MESSAGE
cvs rdiff -u -r1.108 -r1.109 pkgsrc/chat/irssi/Makefile
cvs rdiff -u -r1.35 -r0 pkgsrc/chat/irssi/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/irssi/buildlink3.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/chat/irssi/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/irssi/options.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/irssi/Makefile
diff -u pkgsrc/chat/irssi/Makefile:1.108 pkgsrc/chat/irssi/Makefile:1.109
--- pkgsrc/chat/irssi/Makefile:1.108    Tue Oct 24 22:08:20 2023
+++ pkgsrc/chat/irssi/Makefile  Thu Jun  6 11:03:28 2024
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.108 2023/10/24 22:08:20 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2024/06/06 11:03:28 jperkin Exp $
 
-DISTNAME=              ${IRSSI_DISTNAME}
-PKGREVISION=           2
+DISTNAME=              irssi-1.4.5
 CATEGORIES=            chat
-EXTRACT_SUFX=          ${IRSSI_EXTRACT_SUFX}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=irssi/}
+GITHUB_RELEASE=                ${PKGVERSION_NOREV}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.irssi.org/
 COMMENT=               Secure and modular IRC client with text mode user interface
 LICENSE=               gnu-gpl-v2
 
-.include "../../mk/bsd.prefs.mk"
-.include "Makefile.common"
-
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 TEST_TARGET=           check
 
-CONFIGURE_ARGS+=       --with-proxy \
-                       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --with-proxy
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=         ${PREFIX}/share/examples/irssi
 CONF_FILES=    ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
@@ -32,9 +29,9 @@ PLIST_SUBST+=         MODULEEXT=${MODULEEXT}
 INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
 
 .include "options.mk"
-.include "../../devel/glib2/buildlink3.mk"
 
-.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/terminfo.buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/irssi/buildlink3.mk
diff -u pkgsrc/chat/irssi/buildlink3.mk:1.1 pkgsrc/chat/irssi/buildlink3.mk:1.2
--- pkgsrc/chat/irssi/buildlink3.mk:1.1 Mon Jul 24 22:21:42 2023
+++ pkgsrc/chat/irssi/buildlink3.mk     Thu Jun  6 11:03:28 2024
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2023/07/24 22:21:42 khorben Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2024/06/06 11:03:28 jperkin Exp $
 
-BUILDLINK_TREE+=        irssi
+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
+BUILDLINK_API_DEPENDS.irssi+=  irssi>=1.4.5
+BUILDLINK_ABI_DEPENDS.irssi+=  irssi>=1.4.5
+BUILDLINK_PKGSRCDIR.irssi?=    ../../chat/irssi
 
 .endif # IRSSI_BUILDLINK3_MK
 
-BUILDLINK_TREE+=        -irssi
+BUILDLINK_TREE+=       -irssi

Index: pkgsrc/chat/irssi/distinfo
diff -u pkgsrc/chat/irssi/distinfo:1.58 pkgsrc/chat/irssi/distinfo:1.59
--- pkgsrc/chat/irssi/distinfo:1.58     Sat May 13 13:06:46 2023
+++ pkgsrc/chat/irssi/distinfo  Thu Jun  6 11:03:28 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.58 2023/05/13 13:06:46 nikita Exp $
+$NetBSD: distinfo,v 1.59 2024/06/06 11:03:28 jperkin Exp $
 
-BLAKE2s (irssi-1.4.4.tar.gz) = 0129d3331a1d33328905c890a80b76309db2c73a2f8a03f4b81c554cd823916d
-SHA512 (irssi-1.4.4.tar.gz) = d4e9f6a2cf583ef52e84a7db20ee08fe020dd9f4b5dc79262e80f666f4ca86f08401499e2368c0381d4de78ff67ba94832ef53ad227170c3455410ae0da5de8d
-Size (irssi-1.4.4.tar.gz) = 1928023 bytes
+BLAKE2s (irssi-1.4.5.tar.gz) = 5fac28beda93f44aa407cdef337bc251244d99c7403685b205e59c4ab1b4e2e9
+SHA512 (irssi-1.4.5.tar.gz) = 6569dc786e31f0a9b62a2adf9235b3d168bbf2684a79b7666baacdea3c8e82397c0b2b708cc6e29438d2158d4b323f2de1643794d6a4ed92423dda81800955cf
+Size (irssi-1.4.5.tar.gz) = 1930467 bytes
 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7

Index: pkgsrc/chat/irssi/options.mk
diff -u pkgsrc/chat/irssi/options.mk:1.23 pkgsrc/chat/irssi/options.mk:1.24
--- pkgsrc/chat/irssi/options.mk:1.23   Thu May 16 23:34:12 2024
+++ pkgsrc/chat/irssi/options.mk        Thu Jun  6 11:03:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2024/05/16 23:34:12 riastradh Exp $
+# $NetBSD: options.mk,v 1.24 2024/06/06 11:03:28 jperkin Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.irssi
 PKG_SUPPORTED_OPTIONS=         otr perl truecolor
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=                otr perl truecol
 # Build it into the main irssi executable instead of a module.
 CONFIGURE_ARGS+=       --with-otr=static
 .  if ${USE_CROSS_COMPILE:tl} == "yes"
-CONFIGURE_ARGS+=       LIBGCRYPT_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE:Q}/bin/libgcrypt-config
+CONFIGURE_ARGS+=       LIBGCRYPT_CONFIG=${CROSS_DESTDIR:Q}${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
 .  endif
 .include "../../chat/libotr/buildlink3.mk"
 .else