Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id C63EE1A9217 for ; Sun, 4 Oct 2020 09:28:08 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3FB6884D8C; Sun, 4 Oct 2020 09:28:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB6E384D6A for ; Sun, 4 Oct 2020 09:28:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id FTMzQSo1Ijq6 for ; Sun, 4 Oct 2020 09:28:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E42E184D33 for ; Sun, 4 Oct 2020 09:28:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D6993FB28; Sun, 4 Oct 2020 09:28:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1601803686263850" MIME-Version: 1.0 Date: Sun, 4 Oct 2020 09:28:06 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2020Q3] pkgsrc/editors To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20201004092806.D6993FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1601803686263850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sun Oct 4 09:28:06 UTC 2020 Modified Files: pkgsrc/editors/xemacs [pkgsrc-2020Q3]: Makefile distinfo pkgsrc/editors/xemacs-current [pkgsrc-2020Q3]: Makefile distinfo pkgsrc/editors/xemacs-current-nox11 [pkgsrc-2020Q3]: Makefile pkgsrc/editors/xemacs-nox11 [pkgsrc-2020Q3]: Makefile Added Files: pkgsrc/editors/xemacs-current/patches [pkgsrc-2020Q3]: patch-src_process.c pkgsrc/editors/xemacs/patches [pkgsrc-2020Q3]: patch-src_process.c Log Message: Pullup ticket #6331 - requested by hauke editors/xemacs: Linux build fix Revisions pulled up: - editors/xemacs-current-nox11/Makefile 1.12 - editors/xemacs-current/Makefile 1.107 - editors/xemacs-current/distinfo 1.38 - editors/xemacs-current/patches/patch-src_process.c 1.1 - editors/xemacs-nox11/Makefile 1.36 - editors/xemacs/Makefile 1.133 - editors/xemacs/distinfo 1.32 - editors/xemacs/patches/patch-src_process.c 1.1 --- Module Name: pkgsrc Committed By: hauke Date: Fri Oct 2 11:31:14 UTC 2020 Modified Files: pkgsrc/editors/xemacs: Makefile distinfo pkgsrc/editors/xemacs-current: Makefile distinfo pkgsrc/editors/xemacs-current-nox11: Makefile pkgsrc/editors/xemacs-nox11: Makefile Added Files: pkgsrc/editors/xemacs-current/patches: patch-src_process.c pkgsrc/editors/xemacs/patches: patch-src_process.c Log Message: Linux glibc 2.32+ has removed sys_siglist Remove stale reference to nb version in Makefile.common To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.132.2.1 pkgsrc/editors/xemacs/Makefile cvs rdiff -u -r1.31 -r1.31.8.1 pkgsrc/editors/xemacs/distinfo cvs rdiff -u -r1.106 -r1.106.2.1 pkgsrc/editors/xemacs-current/Makefile cvs rdiff -u -r1.37 -r1.37.8.1 pkgsrc/editors/xemacs-current/distinfo cvs rdiff -u -r1.11 -r1.11.8.1 pkgsrc/editors/xemacs-current-nox11/Makefile cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/editors/xemacs-current/patches/patch-src_process.c cvs rdiff -u -r1.35 -r1.35.2.1 pkgsrc/editors/xemacs-nox11/Makefile cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/editors/xemacs/patches/patch-src_process.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1601803686263850 Content-Disposition: inline Content-Length: 6859 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/xemacs/Makefile diff -u pkgsrc/editors/xemacs/Makefile:1.132 pkgsrc/editors/xemacs/Makefile:1.132.2.1 --- pkgsrc/editors/xemacs/Makefile:1.132 Thu Sep 24 17:02:01 2020 +++ pkgsrc/editors/xemacs/Makefile Sun Oct 4 09:28:06 2020 @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.132 2020/09/24 17:02:01 hauke Exp $ +# $NetBSD: Makefile,v 1.132.2.1 2020/10/04 09:28:06 bsiegert Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 14 +PKGREVISION= 15 COMMENT= XEmacs text editor version 21.4 # extra options for x11 support, not for sharing with xemacs-current-nox11 -# Version information in ../../editors/xemacs/Makefile.common - PKG_SUPPORTED_OPTIONS+= x11 xface PKG_SUGGESTED_OPTIONS+= x11 Index: pkgsrc/editors/xemacs/distinfo diff -u pkgsrc/editors/xemacs/distinfo:1.31 pkgsrc/editors/xemacs/distinfo:1.31.8.1 --- pkgsrc/editors/xemacs/distinfo:1.31 Wed Nov 27 14:35:16 2019 +++ pkgsrc/editors/xemacs/distinfo Sun Oct 4 09:28:06 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2019/11/27 14:35:16 hauke Exp $ +$NetBSD: distinfo,v 1.31.8.1 2020/10/04 09:28:06 bsiegert Exp $ SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b @@ -18,6 +18,7 @@ SHA1 (patch-src_Makefile.in.in) = 8d2c26 SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4 SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966 +SHA1 (patch-src_process.c) = b33b37e7e68bd49036d90cfed206170456a4b443 SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20 SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305 SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448 Index: pkgsrc/editors/xemacs-current/Makefile diff -u pkgsrc/editors/xemacs-current/Makefile:1.106 pkgsrc/editors/xemacs-current/Makefile:1.106.2.1 --- pkgsrc/editors/xemacs-current/Makefile:1.106 Thu Sep 24 17:02:02 2020 +++ pkgsrc/editors/xemacs-current/Makefile Sun Oct 4 09:28:06 2020 @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.106 2020/09/24 17:02:02 hauke Exp $ +# $NetBSD: Makefile,v 1.106.2.1 2020/10/04 09:28:06 bsiegert Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 14 +PKGREVISION= 15 COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} # extra options for x11 support, not for sharing with xemacs-current-nox11 -# Version information in ../../editors/xemacs-current/Makefile.common - PKG_SUPPORTED_OPTIONS+= x11 xft xface PKG_SUGGESTED_OPTIONS+= x11 Index: pkgsrc/editors/xemacs-current/distinfo diff -u pkgsrc/editors/xemacs-current/distinfo:1.37 pkgsrc/editors/xemacs-current/distinfo:1.37.8.1 --- pkgsrc/editors/xemacs-current/distinfo:1.37 Wed Nov 27 15:11:45 2019 +++ pkgsrc/editors/xemacs-current/distinfo Sun Oct 4 09:28:06 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2019/11/27 15:11:45 hauke Exp $ +$NetBSD: distinfo,v 1.37.8.1 2020/10/04 09:28:06 bsiegert Exp $ SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf @@ -13,4 +13,5 @@ SHA1 (patch-modules_common_Makefile.comm SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2 SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177 SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f +SHA1 (patch-src_process.c) = 4cca9085f0e34ad1adf44ea006df7c2c370beeb9 SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66 Index: pkgsrc/editors/xemacs-current-nox11/Makefile diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.11 pkgsrc/editors/xemacs-current-nox11/Makefile:1.11.8.1 --- pkgsrc/editors/xemacs-current-nox11/Makefile:1.11 Tue Oct 8 12:40:55 2019 +++ pkgsrc/editors/xemacs-current-nox11/Makefile Sun Oct 4 09:28:06 2020 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2019/10/08 12:40:55 hauke Exp $ +# $NetBSD: Makefile,v 1.11.8.1 2020/10/04 09:28:06 bsiegert Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 7 +PKGREVISION= 8 COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support) -# Version information in ../../editors/xemacs-current/Makefile.common .include "../../editors/xemacs-current/options.mk" .include "../../editors/xemacs-current/Makefile.common" Index: pkgsrc/editors/xemacs-nox11/Makefile diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.35 pkgsrc/editors/xemacs-nox11/Makefile:1.35.2.1 --- pkgsrc/editors/xemacs-nox11/Makefile:1.35 Mon Aug 31 18:09:26 2020 +++ pkgsrc/editors/xemacs-nox11/Makefile Sun Oct 4 09:28:06 2020 @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.35 2020/08/31 18:09:26 wiz Exp $ +# $NetBSD: Makefile,v 1.35.2.1 2020/10/04 09:28:06 bsiegert Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 13 +PKGREVISION= 14 COMMENT= XEmacs text editor version 21 (no x11 support) -# Version information in ../../editors/xemacs/Makefile.common - .include "../../editors/xemacs/options.mk" .include "../../editors/xemacs/Makefile.common" Added files: Index: pkgsrc/editors/xemacs-current/patches/patch-src_process.c diff -u /dev/null pkgsrc/editors/xemacs-current/patches/patch-src_process.c:1.1.2.2 --- /dev/null Sun Oct 4 09:28:06 2020 +++ pkgsrc/editors/xemacs-current/patches/patch-src_process.c Sun Oct 4 09:28:06 2020 @@ -0,0 +1,21 @@ +$NetBSD: patch-src_process.c,v 1.1.2.2 2020/10/04 09:28:06 bsiegert Exp $ + +Linux glibc 2.32+ has removed sys_siglist + +--- src/process.c.orig 2013-08-21 17:43:44.000000000 +0000 ++++ src/process.c +@@ -1568,10 +1568,14 @@ See `set-process-sentinel' for more info + const char * + signal_name (int signum) + { ++#if defined(LINUX) && !defined(SYS_SIGLIST_DECLARED) ++ return (const char *)strsignal(signum); ++#else + if (signum >= 0 && signum < NSIG) + return (const char *) sys_siglist[signum]; + + return (const char *) GETTEXT ("unknown signal"); ++#endif + } + + void Index: pkgsrc/editors/xemacs/patches/patch-src_process.c diff -u /dev/null pkgsrc/editors/xemacs/patches/patch-src_process.c:1.1.2.2 --- /dev/null Sun Oct 4 09:28:06 2020 +++ pkgsrc/editors/xemacs/patches/patch-src_process.c Sun Oct 4 09:28:06 2020 @@ -0,0 +1,21 @@ +$NetBSD: patch-src_process.c,v 1.1.2.2 2020/10/04 09:28:06 bsiegert Exp $ + +Linux glibc 2.32+ has removed sys_siglist + +--- src/process.c.orig 2015-03-25 11:25:33.000000000 +0000 ++++ src/process.c +@@ -1310,10 +1310,14 @@ See `set-process-sentinel' for more info + const char * + signal_name (int signum) + { ++#if defined(LINUX) && !defined(SYS_SIGLIST_DECLARED) ++ return (const char *)strsignal(signum); ++#else + if (signum >= 0 && signum < NSIG) + return (const char *) sys_siglist[signum]; + + return (const char *) GETTEXT ("unknown signal"); ++#endif + } + + void --_----------=_1601803686263850--