pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/chat
Module Name: pkgsrc
Committed By: khorben
Date: Mon Jul 24 22:21:42 UTC 2023
Modified Files:
pkgsrc/chat/irssi: Makefile.common
pkgsrc/chat/irssi-icb: Makefile distinfo
Added Files:
pkgsrc/chat/irssi: buildlink3.mk
pkgsrc/chat/irssi-icb/patches: patch-configure.ac
patch-src_core_icb-protocol.c
Removed Files:
pkgsrc/chat/irssi-icb/patches: patch-am patch-an
patch-src_core_Makefile.in patch-src_core_icb-core.c
patch-src_fe-common_fe-icb.c patch-src_fe-common_module-formats.c
Log Message:
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@.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/chat/irssi/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/irssi/buildlink3.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/chat/irssi-icb/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/chat/irssi-icb/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/irssi-icb/patches/patch-am \
pkgsrc/chat/irssi-icb/patches/patch-an
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/irssi-icb/patches/patch-configure.ac \
pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-protocol.c
cvs rdiff -u -r1.1 -r0 \
pkgsrc/chat/irssi-icb/patches/patch-src_core_Makefile.in \
pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-core.c \
pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c \
pkgsrc/chat/irssi-icb/patches/patch-src_fe-common_module-formats.c
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.common
diff -u pkgsrc/chat/irssi/Makefile.common:1.34 pkgsrc/chat/irssi/Makefile.common:1.35
--- pkgsrc/chat/irssi/Makefile.common:1.34 Sat May 13 13:06:46 2023
+++ pkgsrc/chat/irssi/Makefile.common Mon Jul 24 22:21:42 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.34 2023/05/13 13:06:46 nikita Exp $
+# $NetBSD: Makefile.common,v 1.35 2023/07/24 22:21:42 khorben Exp $
#
# used by chat/irssi-icb/Makefile
-# used by chat/irssi-xmpp/Makefile
# Specific distribution information.
IRSSI_VERSION= 1.4.4
Index: pkgsrc/chat/irssi-icb/Makefile
diff -u pkgsrc/chat/irssi-icb/Makefile:1.49 pkgsrc/chat/irssi-icb/Makefile:1.50
--- pkgsrc/chat/irssi-icb/Makefile:1.49 Thu Jul 7 16:28:55 2022
+++ pkgsrc/chat/irssi-icb/Makefile Mon Jul 24 22:21:42 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2022/07/07 16:28:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2023/07/24 22:21:42 khorben Exp $
#
-DISTNAME= irssi-icb-0.15
-PKGREVISION= 8
+DISTNAME= irssi-icb-0.17
CATEGORIES= chat
-MASTER_SITES= https://github.com/downloads/jperkin/irssi-icb/
-DISTFILES= ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=mglocker/}
+GITHUB_TAG= c4e2ea8939b5b75d1941ebe3335475482d218838
+DISTFILES= ${DISTNAME}-${GITHUB_TAG}.tar.gz
MAINTAINER= jperkin%pkgsrc.org@localhost
HOMEPAGE= http://www.irssi.org/
@@ -15,28 +15,23 @@ LICENSE= gnu-gpl-v2
.include "../../mk/bsd.prefs.mk"
.include "../../chat/irssi/Makefile.common"
-WRKSRC= ${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME}
-
-DEPENDS+= irssi>=${IRSSI_VERSION}:../../chat/irssi
-
+USE_TOOLS+= autoreconf autoconf automake gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
SHLIBTOOL_OVERRIDE= # empty
-CONFIGURE_ARGS+= --with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
+CONFIGURE_ARGS+= --with-irssi=${PREFIX}/include/irssi
INSTALLATION_DIRS+= share/doc/irssi
-post-extract:
- cd ${WRKDIR} && ${LN} -s ${IRSSI_DISTNAME:S/a//} ${IRSSI_DISTNAME}
- ${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${IRSSI_DISTNAME}
- ${CP} ${IRSSI_CONFIG_H} ${WRKDIR}/${IRSSI_DISTNAME}/config.h
- ${CP} ${IRSSI_CONFIG} ${WRKDIR}/${IRSSI_DISTNAME}/irssi-config
+pre-configure:
+ ${RUN} cd ${WRKSRC} && autoreconf -i
post-install:
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/irssi/README.icb
+.include "../../chat/irssi/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/irssi-icb/distinfo
diff -u pkgsrc/chat/irssi-icb/distinfo:1.41 pkgsrc/chat/irssi-icb/distinfo:1.42
--- pkgsrc/chat/irssi-icb/distinfo:1.41 Tue Oct 26 10:05:17 2021
+++ pkgsrc/chat/irssi-icb/distinfo Mon Jul 24 22:21:42 2023
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.41 2021/10/26 10:05:17 nia Exp $
+$NetBSD: distinfo,v 1.42 2023/07/24 22:21:42 khorben Exp $
-BLAKE2s (irssi-1.2.3.tar.gz) = 7ac7c6a1e29a75c19faf86dc80ccbf54a2cbc5f93beef251874a39fd51135766
-SHA512 (irssi-1.2.3.tar.gz) = 7e4c8dc2d8e3532f26775702254339ba92e276c82b5a7041756574096928e25f2614d04a1cfa091ba90bc3e5a0d552578b80bc89c3c87c6d48722139c2ae47ff
-Size (irssi-1.2.3.tar.gz) = 1824077 bytes
-BLAKE2s (irssi-icb-0.15.tar.gz) = c75451c2dd9b78535248e29999c3424c974a3c4482f3b15a1338084f08806925
-SHA512 (irssi-icb-0.15.tar.gz) = 00af04d14c2c6b65eaf93f9859e6f9f51be4bc8b270c602f4f3b2cc722b148f35c29c7efb12432b063dd41095cf823f2ad329515b0298d0c541742199f3c5fa5
-Size (irssi-icb-0.15.tar.gz) = 306973 bytes
-SHA1 (patch-am) = 3bd9e38d0fde6d99d9b6a6ad67268bd63a8a92e2
-SHA1 (patch-an) = bca7fff754b60b49a6322bd5595a4a7f4003a828
-SHA1 (patch-src_core_Makefile.in) = d052d78b4f084da51498f1df934ca16412b8e5a0
-SHA1 (patch-src_core_icb-core.c) = fc0f99c383b6452d09641c2b5f049166370d1fc2
-SHA1 (patch-src_fe-common_fe-icb.c) = 47ca218d295a818028102ca041cf4b9c2053276b
-SHA1 (patch-src_fe-common_module-formats.c) = 5af701e6919051c834c52e6932e0028324362b9f
+BLAKE2s (irssi-icb-0.17-c4e2ea8939b5b75d1941ebe3335475482d218838.tar.gz) = 1d9ce4be568c87c937bab6f15eba77a323d23bf927ce9b249a0e0c899a6a7069
+SHA512 (irssi-icb-0.17-c4e2ea8939b5b75d1941ebe3335475482d218838.tar.gz) =
59149066c5d8468bd43d2d5c52605ba7f42be7ad1df43f496d4af0fb8102d4636724ca937957cb575e41a361db7c0ac1afd549af770d29fbbc031884eddeee38
+Size (irssi-icb-0.17-c4e2ea8939b5b75d1941ebe3335475482d218838.tar.gz) = 23084 bytes
+SHA1 (patch-configure.ac) = 6f67f215e9ab970120c2280b50d2ca38c255d88c
+SHA1 (patch-src_core_icb-protocol.c) = 3238f7ee93aa1c54e83607299e8f45d63562defb
Added files:
Index: pkgsrc/chat/irssi/buildlink3.mk
diff -u /dev/null pkgsrc/chat/irssi/buildlink3.mk:1.1
--- /dev/null Mon Jul 24 22:21:42 2023
+++ pkgsrc/chat/irssi/buildlink3.mk Mon Jul 24 22:21:42 2023
@@ -0,0 +1,14 @@
+# $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
Index: pkgsrc/chat/irssi-icb/patches/patch-configure.ac
diff -u /dev/null pkgsrc/chat/irssi-icb/patches/patch-configure.ac:1.1
--- /dev/null Mon Jul 24 22:21:42 2023
+++ pkgsrc/chat/irssi-icb/patches/patch-configure.ac Mon Jul 24 22:21:42 2023
@@ -0,0 +1,29 @@
+$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([
Index: pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-protocol.c
diff -u /dev/null pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-protocol.c:1.1
--- /dev/null Mon Jul 24 22:21:42 2023
+++ pkgsrc/chat/irssi-icb/patches/patch-src_core_icb-protocol.c Mon Jul 24 22:21:42 2023
@@ -0,0 +1,15 @@
+$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);
+ }
+
Home |
Main Index |
Thread Index |
Old Index