CVS commit: pkgsrc/chat/irssi

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/chat/irssi
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 13 Jul 2025 17:24:31 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 13 17:24:31 UTC 2025

Modified Files:
        pkgsrc/chat/irssi: Makefile PLIST options.mk

Log Message:
irssi: switch to build with meson

Build was broken with perl 5.42, and upstream recommends switching to meson.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/chat/irssi/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/chat/irssi/PLIST
cvs rdiff -u -r1.24 -r1.25 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.111 pkgsrc/chat/irssi/Makefile:1.112
--- pkgsrc/chat/irssi/Makefile:1.111    Fri Jul  4 08:44:47 2025
+++ pkgsrc/chat/irssi/Makefile  Sun Jul 13 17:24:31 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.111 2025/07/04 08:44:47 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2025/07/13 17:24:31 wiz Exp $
 
 DISTNAME=              irssi-1.4.5
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            chat
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=irssi/}
 GITHUB_RELEASE=                ${PKGVERSION_NOREV}
@@ -11,26 +11,26 @@ HOMEPAGE=           http://www.irssi.org/
 COMMENT=               Secure and modular IRC client with text mode user interface
 LICENSE=               gnu-gpl-v2
 
-GNU_CONFIGURE=         yes
-USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 TEST_TARGET=           check
 
-CONFIGURE_ARGS+=       --with-proxy
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+MESON_ARGS+=           -Dwith-proxy=yes
 
-EGDIR=         ${PREFIX}/share/examples/irssi
-CONF_FILES=    ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
+EGDIR=                 ${PREFIX}/share/examples/irssi
+INSTALLATION_DIRS+=    ${EGDIR}
+CONF_FILES=            ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
 
 OPSYSVARS+=            MODULEEXT
 MODULEEXT.Darwin=      bundle
 MODULEEXT.*=           so
 PLIST_SUBST+=          MODULEEXT=${MODULEEXT}
 
-INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/irssi.conf ${DESTDIR}${EGDIR}
 
 .include "options.mk"
 
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/terminfo.buildlink3.mk"

Index: pkgsrc/chat/irssi/PLIST
diff -u pkgsrc/chat/irssi/PLIST:1.20 pkgsrc/chat/irssi/PLIST:1.21
--- pkgsrc/chat/irssi/PLIST:1.20        Sat May 13 13:06:46 2023
+++ pkgsrc/chat/irssi/PLIST     Sun Jul 13 17:24:31 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2023/05/13 13:06:46 nikita Exp $
+@comment $NetBSD: PLIST,v 1.21 2025/07/13 17:24:31 wiz Exp $
 bin/irssi
 include/irssi/irssi-config.h
 include/irssi/irssi-version.h
@@ -133,20 +133,19 @@ include/irssi/src/irc/notifylist/notify-
 include/irssi/src/irc/notifylist/notifylist.h
 include/irssi/src/lib-config/iconfig.h
 include/irssi/src/lib-config/module.h
-lib/irssi/modules/libirc_proxy.la
-lib/pkgconfig/irssi-1.pc
+${PLIST.perl}lib/irssi/modules/libfe_perl.so
+lib/irssi/modules/libirc_proxy.so
+${PLIST.otr}lib/irssi/modules/libotr_core.so
+${PLIST.perl}lib/irssi/modules/libperl_core.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/Irssi.pm
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/Irssi/Irc.pm
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/Irssi/TextUI.pm
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/Irssi/UI.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/.packlist
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/Irc/.packlist
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/Irc/Irc.${MODULEEXT}
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/Irssi.${MODULEEXT}
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/TextUI/.packlist
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/TextUI/TextUI.${MODULEEXT}
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/UI/.packlist
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/Irssi/UI/UI.${MODULEEXT}
+lib/pkgconfig/irssi-1.pc
 man/man1/irssi.1
 share/doc/irssi/capsicum.txt
 share/doc/irssi/design.html
@@ -279,14 +278,11 @@ share/irssi/help/window
 share/irssi/scripts/autoop.pl
 share/irssi/scripts/autorejoin.pl
 share/irssi/scripts/buf.pl
-share/irssi/scripts/command.pl
 share/irssi/scripts/dns.pl
 share/irssi/scripts/kills.pl
 share/irssi/scripts/mail.pl
 share/irssi/scripts/mlock.pl
-share/irssi/scripts/msg-event.pl
 share/irssi/scripts/quitmsg.pl
-share/irssi/scripts/redirect.pl
 share/irssi/scripts/scriptassist.pl
 share/irssi/scripts/usercount.pl
 share/irssi/themes/colorless.theme

Index: pkgsrc/chat/irssi/options.mk
diff -u pkgsrc/chat/irssi/options.mk:1.24 pkgsrc/chat/irssi/options.mk:1.25
--- pkgsrc/chat/irssi/options.mk:1.24   Thu Jun  6 11:03:28 2024
+++ pkgsrc/chat/irssi/options.mk        Sun Jul 13 17:24:31 2025
@@ -1,40 +1,42 @@
-# $NetBSD: options.mk,v 1.24 2024/06/06 11:03:28 jperkin Exp $
+# $NetBSD: options.mk,v 1.25 2025/07/13 17:24:31 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.irssi
-PKG_SUPPORTED_OPTIONS=         otr perl truecolor
-PKG_SUGGESTED_OPTIONS=         otr perl truecolor
+PKG_SUPPORTED_OPTIONS=         otr perl irssi-truecolor
+PKG_SUGGESTED_OPTIONS=         otr perl irssi-truecolor
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=           otr
 .if !empty(PKG_OPTIONS:Motr)
+PLIST.otr=             yes
 # 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}${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
-.  endif
+MESON_ARGS+=           -Dwith-otr=yes
+# TODO: statically linked previously, but this now gives:
+# ld: /usr/lib/libintl.a(sysdep.o): warning: relocation against `sysdep_pair_table' in read-only section `.text'
+# ld: /usr/lib/libintl.a(sysdep.o): relocation R_X86_64_PC32 against symbol `sysdep_pair_table' can not be used when making a shared object; recompile with -fPIC
+#MESON_ARGS+=          -Dstatic-dependency=yes
+# TODO: not sure how to replace this, if at all
+#.  if ${USE_CROSS_COMPILE:tl} == "yes"
+#CONFIGURE_ARGS+=      LIBGCRYPT_CONFIG=${CROSS_DESTDIR:Q}${BUILDLINK_PREFIX.libgcrypt}/bin/libgcrypt-config
+#.  endif
 .include "../../chat/libotr/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --with-otr=no
+MESON_ARGS+=           -Dwith-otr=no
 .endif
 
 PLIST_VARS+=           perl
 .if !empty(PKG_OPTIONS:Mperl)
 PLIST.perl=            yes
 USE_TOOLS+=            perl:run
-PERL5_PACKLIST=                auto/Irssi/.packlist
-PERL5_PACKLIST+=       auto/Irssi/Irc/.packlist
-PERL5_PACKLIST+=       auto/Irssi/UI/.packlist
-PERL5_PACKLIST+=       auto/Irssi/TextUI/.packlist
-.include "../../lang/perl5/packlist.mk"
 .include "../../lang/perl5/buildlink3.mk"
-# actually we don't need --with-perl here, irssi is compiled with it by default
+# this is actually the default
 # but who knows what may happen in future versions
-CONFIGURE_ARGS+=       --with-perl
-CONFIGURE_ARGS+=       --with-perl-lib=vendor
+MESON_ARGS+=           -Dwith-perl=yes
+MESON_ARGS+=           -Dwith-perl-lib=vendor
 .else
-CONFIGURE_ARGS+=       --with-perl=no
+MESON_ARGS+=           -Dwith-perl=no
 .endif
 
-.if !empty(PKG_OPTIONS:Mtruecolor)
-CONFIGURE_ARGS+=       --enable-true-color
+.if !empty(PKG_OPTIONS:Mirssi-truecolor)
+MESON_ARGS+=           -Denable-true-color=yes
 .endif

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