From nobody Sat May 13 06:38:09 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJGD15cpFz4B0nc; Sat, 13 May 2023 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJGD1558Mz3JgM; Sat, 13 May 2023 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683959889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Ilu2dJVftsoD/EPkdhnggrIuPra/stOB3BvPyK9WYQ=; b=iRyxHYlzBhBeNuGy3buzdoJBkyV2pb7TQy/Irfxo9LWIW8aEq0lVn5PH1SBLwKvvjcOjKJ sD/Zy4amoAOSfZtzz5nGFVkJA52ui3Bys+nW4y+hT4BUGDsodbRiSIzE725nvVveT+YSgl ZaZ0dvlHvhOWyeyOK+WA+A1j8ItMtjW6L5hl40ycxG9QEk7vvZqTFHKjhnjrLlG2HyQC2h lrr0u6KBCJCdaXmVT6irElAJwlVRdeNvsNdmZkOpieWe11KTy/nhu5QP2U4ykn+T1iS4V0 vg0LS0CJOjSr49pZeFr2ZgNnBwh/xSGWLywT4g48G5edLbn6oJV3cywXG0IEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683959889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Ilu2dJVftsoD/EPkdhnggrIuPra/stOB3BvPyK9WYQ=; b=DuLK+MP55sZjfAbTxqaN3UCcWUHs8f4LG1qaC6Y3CtKi4Ilr+JfBLw6Qq080ydRWRT5p7G 71fKmbokSiJpckkEDfl5zy+GIshUsHYderVcc38ZsbIKcKFvV1Y+2VYlK5AQS08kE9dLzB 5Jj4m5HaRNw/M/z1hk3vHryO0UNHITZi6KGVzr8vycgW/1NamSHzZ6yqAb8pA2vFiV/Q/t xEG0ZhCrl8/IKrfp01L81YxRX4BTm5th19qbnBQihHvXWLy+CK6DBoYPiBN+n/uuNBd3l/ CHwyaFWgMGlgJ0F8X88yF83DUhPKwjx/kt/cbTgA6cBBArW0DnjZCfkcbSab3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683959889; a=rsa-sha256; cv=none; b=kortGXyvK8r145W6yChs09RhDcWAuKY4ySyeyana1alvY0lZRLut5hV3dFxQhqzGj4Rsi6 paR98QaLdKnwKu6Cpm085Ixn7tVW2QHVZOPP7GVjoxS80r33McvSQkNzo61O80us9oDwmq 5LT3FGMx5jwlKjJHVZc/Lhg4nQMtAElFAxD+SDoQ771IVF1o6SLqGlWt+xoO10DAPLfS5E SsgfyD0dktZDAUlYCRamVin/ZfSFr5ic1Kt/CQWVL7Ttwpcac5KDhkGAhNMt+HCPhZOG4+ CSB+XBWfkeCBFg10Cfbikg4VM+nx+B1Hf5JjmQFaqYdlywYYtq+F/7Xnq5WhCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJGD1485sz15yG; Sat, 13 May 2023 06:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34D6c9Xg029718; Sat, 13 May 2023 06:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D6c90m029717; Sat, 13 May 2023 06:38:09 GMT (envelope-from git) Date: Sat, 13 May 2023 06:38:09 GMT Message-Id: <202305130638.34D6c90m029717@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 0ebb2e46f549 - main - editors/emacs: Add upstream patch for check-declare-directory List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ebb2e46f5492822021c1944f7d8a6d8d457fae4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ebb2e46f5492822021c1944f7d8a6d8d457fae4 commit 0ebb2e46f5492822021c1944f7d8a6d8d457fae4 Author: Yasuhiro Kimura AuthorDate: 2023-05-12 06:53:17 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-05-13 06:32:53 +0000 editors/emacs: Add upstream patch for check-declare-directory Add following upstream patch for check-declare-directory. ---------------------------------------------------------------------- commit ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6 Author: Lars Ingebrigtsen AuthorDate: Wed May 11 14:18:27 2022 +0200 Commit: Lars Ingebrigtsen CommitDate: Wed May 11 14:18:27 2022 +0200 Don't signal errors in check-declare-directory * lisp/emacs-lisp/check-declare.el (check-declare-directory): Don't bug out if we don't find any files with declare-function:(bug#55354) because this is a predicate function, and that's inconvenient. ---------------------------------------------------------------------- This fixes build error with upcoming update of devel/git-modes to 1.4.1 as following. ---------------------------------------------------------------------- =================================================== ===> Building for git-modes-1.4.1,1 gmake[1]: Entering directory '/wrkdirs/usr/ports/devel/git-modes/work-full/git-modes-1.4.1' Compiling git-modes.el Compiling gitattributes-mode.el Compiling gitconfig-mode.el Compiling gitignore-mode.el Creating git-modes-autoloads.el Checking function declarations Debugger entered--Lisp error: (error "find exited with status 1") signal(error ("find exited with status 1")) error("%s exited with status %s" "find" 1) process-lines-handling-status("find" nil "." "-name" "*.el" "-exec" "grep" "-l" "^[ \11]*(declare-function" "{}" "+") apply(process-lines-handling-status "find" nil ("." "-name" "*.el" "-exec" "grep" "-l" "^[ \11]*(declare-function" "{}" "+")) process-lines("find" "." "-name" "*.el" "-exec" "grep" "-l" "^[ \11]*(declare-function" "{}" "+") check-declare-directory("~/git-modes-1.4.1/") eval((check-declare-directory default-directory) t) command-line-1(("-L" "/usr/local/share/emacs/28.2/site-lisp/compat" "-L" "." "--eval" "(check-declare-directory default-directory)")) command-line() normal-top-level() gmake[1]: *** [Makefile:37: check-declare] Error 255 gmake[1]: Leaving directory '/wrkdirs/usr/ports/devel/git-modes/work-full/git-modes-1.4.1' *** Error code 1 Stop. make: stopped in /usr/ports/devel/git-modes ---------------------------------------------------------------------- Reviewed by: jrm Differential Revision: https://reviews.freebsd.org/D40079 --- editors/emacs/Makefile | 5 +++-- editors/emacs/distinfo | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 3e90ed661540..9a963bac8029 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,6 +1,6 @@ PORTNAME= emacs DISTVERSION= 28.2 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU @@ -9,7 +9,8 @@ PATCH_SITES= https://github.com/emacs-mirror/emacs/commit/:github PATCHFILES= d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch:-p1:github \ 01a4035c869b91c153af9a9132c87adb7669ea1c.patch:-p1:github \ 9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch:-p1:github \ - 1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch:-p1:github + 1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch:-p1:github \ + ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch:-p1:github .if ${FLAVOR:U} == canna PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 6d0cb5a6687d..2233664a344c 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1677506792 +TIMESTAMP = 1683873995 SHA256 (emacs-28.2.tar.xz) = ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488 SIZE (emacs-28.2.tar.xz) = 47722600 SHA256 (d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch) = 6331f8676afa68a0f96b1461c1d75bbfb4f2d99177935f362ced0fef8b72e52d @@ -9,5 +9,7 @@ SHA256 (9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch) = 37fba7d6e2ee9ed90b3203 SIZE (9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch) = 1007 SHA256 (1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch) = 9747b316708f07db7b2aecd874e0732169e0f2b3d7e43964b59fbed5207220da SIZE (1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch) = 987 +SHA256 (ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch) = 0c0659fa405e4cab469754db86556f7374f00a126071e802f6dc883b9586b465 +SIZE (ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch) = 1430 SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684 SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564