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,100 +1,97 @@ PORTNAME= Agda PORTVERSION= 2.6.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Dependently typed functional programming language and proof assistant LICENSE= UNKNOWN LICENSE_NAME= custom LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept BROKEN_i386= Compiler goes out of memory BUILD_DEPENDS= emacs:editors/emacs USES= cabal USE_LOCALE= en_US.UTF-8 USE_CABAL= OneTuple-0.3.1_2 \ QuickCheck-2.14.2 \ STMonadTrans-0.4.6_1 \ StateVar-1.2.2 \ aeson-2.0.3.0 \ alex-3.2.7.1 \ assoc-1.0.2_2 \ async-2.2.4_1 \ attoparsec-0.14.4_1 \ base-compat-0.12.1 \ base-compat-batteries-0.12.1_2 \ base-orphans-0.8.6 \ bifunctors-5.5.12 \ blaze-builder-0.4.2.2_1 \ blaze-html-0.9.1.2_2 \ blaze-markup-0.8.2.8_2 \ boxes-0.1.5 \ case-insensitive-1.2.1.0 \ comonad-5.0.8_1 \ contravariant-1.5.5 \ data-fix-0.3.2_2 \ data-hash-0.2.0.1 \ distributive-0.6.2.1_1 \ dlist-1.0 \ edit-distance-0.2.2.1_1 \ equivalence-0.4 \ gitrev-1.3.1 \ happy-1.20.0_1 \ hashable-1.4.0.2 \ hashtables-1.3 \ indexed-traversable-0.1.2_1 \ indexed-traversable-instances-0.1.1 \ integer-logarithms-1.0.3.1_2 \ monad-control-1.0.3.1 \ murmur-hash-0.1.0.10 \ network-uri-2.6.4.1 \ parallel-3.2.2.0_4 \ primitive-0.7.3.0 \ random-1.2.1.1 \ regex-base-0.94.0.2 \ regex-tdfa-1.3.1.2 \ scientific-0.3.7.0_2 \ semialign-1.2.0.1_1 \ semigroupoids-5.3.7 \ split-0.2.3.4_2 \ splitmix-0.1.0.4 \ strict-0.4.0.1_4 \ tagged-0.8.6.1_2 \ text-short-0.1.5 \ th-abstraction-0.4.3.0 \ th-compat-0.1.3_1 \ these-1.1.1.1_5 \ time-compat-1.9.6.1_3 \ transformers-base-0.4.6 \ transformers-compat-0.7.1_1 \ unordered-containers-0.2.19.1 \ uri-encode-1.5.0.7_2 \ utf8-string-1.0.2 \ uuid-types-1.0.5_2 \ vector-0.12.3.1_1 \ 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} .include 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,81 +1,89 @@ %%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 %%DATADIR%%/lib/prim/Agda/Builtin/Char.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Char/Properties.agda %%DATADIR%%/lib/prim/Agda/Builtin/Char/Properties.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Coinduction.agda %%DATADIR%%/lib/prim/Agda/Builtin/Coinduction.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Glue.agda %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Glue.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/HCompU.agda %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/HCompU.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Id.agda %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Id.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Path.agda %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Path.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Sub.agda %%DATADIR%%/lib/prim/Agda/Builtin/Cubical/Sub.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Equality.agda %%DATADIR%%/lib/prim/Agda/Builtin/Equality.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Equality/Erase.agda %%DATADIR%%/lib/prim/Agda/Builtin/Equality/Erase.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Equality/Rewrite.agda %%DATADIR%%/lib/prim/Agda/Builtin/Equality/Rewrite.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Float.agda %%DATADIR%%/lib/prim/Agda/Builtin/Float.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Float/Properties.agda %%DATADIR%%/lib/prim/Agda/Builtin/Float/Properties.agdai %%DATADIR%%/lib/prim/Agda/Builtin/FromNat.agda %%DATADIR%%/lib/prim/Agda/Builtin/FromNat.agdai %%DATADIR%%/lib/prim/Agda/Builtin/FromNeg.agda %%DATADIR%%/lib/prim/Agda/Builtin/FromNeg.agdai %%DATADIR%%/lib/prim/Agda/Builtin/FromString.agda %%DATADIR%%/lib/prim/Agda/Builtin/FromString.agdai %%DATADIR%%/lib/prim/Agda/Builtin/IO.agda %%DATADIR%%/lib/prim/Agda/Builtin/IO.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Int.agda %%DATADIR%%/lib/prim/Agda/Builtin/Int.agdai %%DATADIR%%/lib/prim/Agda/Builtin/List.agda %%DATADIR%%/lib/prim/Agda/Builtin/List.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Maybe.agda %%DATADIR%%/lib/prim/Agda/Builtin/Maybe.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Nat.agda %%DATADIR%%/lib/prim/Agda/Builtin/Nat.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Reflection.agda %%DATADIR%%/lib/prim/Agda/Builtin/Reflection.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Reflection/External.agda %%DATADIR%%/lib/prim/Agda/Builtin/Reflection/External.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Reflection/Properties.agda %%DATADIR%%/lib/prim/Agda/Builtin/Reflection/Properties.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Sigma.agda %%DATADIR%%/lib/prim/Agda/Builtin/Sigma.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Size.agda %%DATADIR%%/lib/prim/Agda/Builtin/Size.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Strict.agda %%DATADIR%%/lib/prim/Agda/Builtin/Strict.agdai %%DATADIR%%/lib/prim/Agda/Builtin/String.agda %%DATADIR%%/lib/prim/Agda/Builtin/String.agdai %%DATADIR%%/lib/prim/Agda/Builtin/String/Properties.agda %%DATADIR%%/lib/prim/Agda/Builtin/String/Properties.agdai %%DATADIR%%/lib/prim/Agda/Builtin/TrustMe.agda %%DATADIR%%/lib/prim/Agda/Builtin/TrustMe.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Unit.agda %%DATADIR%%/lib/prim/Agda/Builtin/Unit.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Word.agda %%DATADIR%%/lib/prim/Agda/Builtin/Word.agdai %%DATADIR%%/lib/prim/Agda/Builtin/Word/Properties.agda %%DATADIR%%/lib/prim/Agda/Builtin/Word/Properties.agdai %%DATADIR%%/lib/prim/Agda/Primitive.agda %%DATADIR%%/lib/prim/Agda/Primitive.agdai %%DATADIR%%/lib/prim/Agda/Primitive/Cubical.agda %%DATADIR%%/lib/prim/Agda/Primitive/Cubical.agdai