From nobody Mon Aug 15 13:07:58 2022 X-Original-To: dev-commits-ports-all@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 4M5vht71PKz4YtYs; Mon, 15 Aug 2022 13:07:58 +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 4M5vht6RkMz3Wth; Mon, 15 Aug 2022 13:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660568878; 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=3yuP2Ci2haaKP9EiYzbqiKrs6IfhXPJ7Zc8Xa+3e3Hg=; b=m0L6dNBlv0oX/fgJR/q5iGdlRjsak4uDr9w3Wf22WvzMFK9LrPnxKQELhi1LqrZ6mD9ojH FyQsN6HfBrfkiDer16Rd0Gciiw+eJdJ4WJ6yOUgukgiIAIHx+SUmXzW4ZQXRH4Hno09cVL wggceFwzet2X/KxSfl8TSr5ShyHWk6Y0cz798ge44qGIlR6oEFJQ8E0n5852zPAn72tc5X PNEnk12KOqLPTzLb4W+wVtX5gxF2OPJ+0+2nuhhBFt5xbKESrU2xPI5ncR+c+dPPXojnhh q79YbPsmxRI9j4WiJ+qJ6kMagLj1PpD7Ta/pgmPLoZD+3NZKluyY+koOolEpuw== 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 4M5vht5VxMzWX9; Mon, 15 Aug 2022 13:07:58 +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 27FD7wJS039034; Mon, 15 Aug 2022 13:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FD7weC039033; Mon, 15 Aug 2022 13:07:58 GMT (envelope-from git) Date: Mon, 15 Aug 2022 13:07:58 GMT Message-Id: <202208151307.27FD7weC039033@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: a04537df062a - main - math/hs-Agda: Unbreak and enable compiling emacs mode files. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a04537df062a4149d0a518c1d68e54f7757f1020 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660568878; 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=3yuP2Ci2haaKP9EiYzbqiKrs6IfhXPJ7Zc8Xa+3e3Hg=; b=Z/RNEcVzouBEqoESCVjGGCdgLixxbG2BkUoCgRg5hEvtCj/njMzUpj/atM8i7jjYfV/7MW ujzQTRWGmVlngnHUMQvrLr5OSL7PzwqQBRr9D6V5y6LPZs11266O9etlAJzbtAJehF9Yhe +JSsc+vDqu+b3+AxB6s/6+KkmS2271jlpJdlXfdw2DcWx2hiBWZ3inyObUthOI/lRUPBYH nvaWWbyWWSoWPQwH6dLr8vOX0drpwn94XOWYVuTSX367/dWkPRq+fKCEgumasjYp0SluCM sDtqQ4EStDH9H6+c09ONx5J69+eAeXUaAucC93FLWXrUP3H7xMQmR5WI9qLT7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660568878; a=rsa-sha256; cv=none; b=hFLByZKvjhXraW96pYZxa8nuP89ZAs9QNw2fL9Ddpdshf/dHfqW5WQK8OGIcCXyuv/8xNv SNeclCbFYfvevvpsSrJf2/MFPmS5XQ9F65EUn9OVwHAyDoSSA1m+ZSrYHea8mU7iPcksRo UApFgQVGeZkqFYu7ByLpsZUumUCzwfmD7MaU980IHPOcVNyd+pcNX5vUrjeelfuNv5jdV0 TpIeZwrEJKz3AgodkhsW27UylRWGxfOAGc2hBsNBcCTGFAPB3XXf4HOiH99CHOoe1VfhXW eAm3z6Odysm73siEf9WV6e8NNsxpt2qy/OGKAaVKroBWkv9hr105rA2C00qdNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a04537df062a4149d0a518c1d68e54f7757f1020 commit a04537df062a4149d0a518c1d68e54f7757f1020 Author: Gleb Popov AuthorDate: 2022-08-15 13:06:51 +0000 Commit: Gleb Popov CommitDate: 2022-08-15 13:07:25 +0000 math/hs-Agda: Unbreak and enable compiling emacs mode files. --- math/hs-Agda/Makefile | 13 +++++-------- .../files/patch-src_data_emacs-mode_agda2-mode.el | 22 ++++++++++++++++++++++ math/hs-Agda/pkg-plist | 8 ++++++++ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile index 4d8a1bce5991..fa372c306e69 100644 --- a/math/hs-Agda/Makefile +++ b/math/hs-Agda/Makefile @@ -1,6 +1,6 @@ PORTNAME= Agda PORTVERSION= 2.6.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org @@ -82,18 +82,15 @@ USE_CABAL= OneTuple-0.3.1_2 \ witherable-0.4.2_2 \ zlib-0.6.3.0 -EXECUTABLES= agda-mode agda -CABAL_WRAPPER_SCRIPTS= ${EXECUTABLES} +CABAL_EXECUTABLES= agda-mode agda +CABAL_WRAPPER_SCRIPTS= ${CABAL_EXECUTABLES} agda_DATADIR_VARS= Agda agda-mode_DATADIR_VARS= Agda -post-build: -# Do not compile Emacs mode files until https://github.com/agda/agda/issues/4610 is fixed -# ${SETENV} Agda_datadir=${WRKSRC}/src/data $$(find ${WRKSRC}/dist-newstyle -name agda-mode -type f -perm +111) compile - post-install: + ${SETENV} Agda_datadir=${WRKSRC}/src/data ${STAGEDIR}${PREFIX}/libexec/cabal/agda-mode compile + find ${WRKSRC}/src/data/lib/prim/Agda -name '*.agda' -exec ${SETENV} Agda_datadir=${WRKSRC}/src/data ${STAGEDIR}${PREFIX}/libexec/cabal/agda {} \; ${MKDIR} ${STAGEDIR}${DATADIR}/lib/prim/Agda - find ${WRKSRC}/src/data/lib/prim/Agda -name '*.agda' -exec ${SETENV} ${PORTNAME}_datadir=${WRKSRC}/src/data ${STAGEDIR}${PREFIX}/libexec/cabal/agda {} \; cd ${WRKSRC}/src/data && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR} cd ${WRKSRC}/src/data && ${COPYTREE_SHARE} emacs-mode ${STAGEDIR}${DATADIR} diff --git a/math/hs-Agda/files/patch-src_data_emacs-mode_agda2-mode.el b/math/hs-Agda/files/patch-src_data_emacs-mode_agda2-mode.el new file mode 100644 index 000000000000..6f42665200dc --- /dev/null +++ b/math/hs-Agda/files/patch-src_data_emacs-mode_agda2-mode.el @@ -0,0 +1,22 @@ +--- src/data/emacs-mode/agda2-mode.el.orig 2001-09-09 01:46:40 UTC ++++ src/data/emacs-mode/agda2-mode.el +@@ -1306,7 +1306,8 @@ top-level scope." + + (agda2-maybe-normalised + agda2-elaborate-give +- "Elaborate check the given expression against the hole's type and fill in hole with the elaborated term" ++ "Elaborate check the given expression against the hole's type and fill ++in hole with the elaborated term" + "Cmd_elaborate_give" + "expression to elaborate and give") + +@@ -1324,7 +1325,8 @@ top-level scope." + + (agda2-maybe-normalised + agda2-goal-and-context-and-checked +- "Shows the context, the goal and check the given expression's against the hole's type" ++ "Shows the context, the goal and check the given expression's against ++the hole's type" + "Cmd_goal_type_context_check" + "expression to type") + diff --git a/math/hs-Agda/pkg-plist b/math/hs-Agda/pkg-plist index 694d4e40fe2e..4060154a17ae 100644 --- a/math/hs-Agda/pkg-plist +++ b/math/hs-Agda/pkg-plist @@ -1,12 +1,20 @@ %%DATADIR%%/emacs-mode/agda-input.el +%%DATADIR%%/emacs-mode/agda-input.elc %%DATADIR%%/emacs-mode/agda2-abbrevs.el +%%DATADIR%%/emacs-mode/agda2-abbrevs.elc %%DATADIR%%/emacs-mode/agda2-highlight.el +%%DATADIR%%/emacs-mode/agda2-highlight.elc %%DATADIR%%/emacs-mode/agda2-mode-pkg.el %%DATADIR%%/emacs-mode/agda2-mode.el +%%DATADIR%%/emacs-mode/agda2-mode.elc %%DATADIR%%/emacs-mode/agda2-queue.el +%%DATADIR%%/emacs-mode/agda2-queue.elc %%DATADIR%%/emacs-mode/agda2.el +%%DATADIR%%/emacs-mode/agda2.elc %%DATADIR%%/emacs-mode/annotation.el +%%DATADIR%%/emacs-mode/annotation.elc %%DATADIR%%/emacs-mode/eri.el +%%DATADIR%%/emacs-mode/eri.elc %%DATADIR%%/lib/prim/Agda/Builtin/Bool.agda %%DATADIR%%/lib/prim/Agda/Builtin/Bool.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Char.agda