Re: Update pandoc to 3.1.6.1

2023-08-13 Thread Greg Steuck 
Evan Silberman  writes:

> Greg Steuck  wrote:
>> Looks like `pandoc lua` doesn't require and runtime deps on lua,
>> is that correct?
>
> Correct. HsLua embeds a Lua interpreter by default. NB the embedded Lua
> existed before 3.x for custom filters there just wasn't the option to
> run pandoc in Lua repl mode, so nothing new here. We can configure our
> build to link to a system-installed Lua. I don't know of a particular
> reason to do so.

Nor do I. Let's commit it as is. Thanks for the update.

Thanks
Grg

Re: Update pandoc to 3.1.6.1

2023-08-12 Thread Evan Silberman 
Greg Steuck  wrote:
> Looks like `pandoc lua` doesn't require and runtime deps on lua,
> is that correct?

Correct. HsLua embeds a Lua interpreter by default. NB the embedded Lua
existed before 3.x for custom filters there just wasn't the option to
run pandoc in Lua repl mode, so nothing new here. We can configure our
build to link to a system-installed Lua. I don't know of a particular
reason to do so.

Evan

Re: Update pandoc to 3.1.6.1

2023-08-12 Thread Greg Steuck 
Thanks for the update Evan! I was not eager to do it due to the -cli
changes, so I appreciate your taking care of it.

I tested your diff with net/gssdp (which seems like the only BUILD_DEPS
user of pandoc). Then also ran a manual step of shellcheck to confirm
the new version produces something sensible. AFAICT, the update is good
to go in. I have just a minor clarifying question below before I commit.

Evan Silberman  writes:

> Hi Greg, ports@
>
> The below updates pandoc to this week's 3.1.6.1. Sorry for the lax
> maintainership! I should be a bit more regular with these now.
>
> The command line tool is now built from the pandoc-cli cabal module,
> which has its own versioning, so things are a little less tidy in the
> Makefile now, oh well. The big developments in version 3 were the
> `pandoc lua` and `pandoc server` modes, which start up into a Lua
> interpreter and an HTTP server respectively. Both modes seem to
> function, or at least execute properly.

Looks like `pandoc lua` doesn't require and runtime deps on lua,
is that correct?

Thanks
Greg

Update pandoc to 3.1.6.1

2023-08-11 Thread Evan Silberman 
Hi Greg, ports@

The below updates pandoc to this week's 3.1.6.1. Sorry for the lax
maintainership! I should be a bit more regular with these now.

The command line tool is now built from the pandoc-cli cabal module,
which has its own versioning, so things are a little less tidy in the
Makefile now, oh well. The big developments in version 3 were the
`pandoc lua` and `pandoc server` modes, which start up into a Lua
interpreter and an HTTP server respectively. Both modes seem to
function, or at least execute properly.

Evan

diff /usr/ports
commit - 608ee79557055c2e8af86b28bd27976cfc65442b
path + /usr/ports
blob - 42305e6437b48cfff88a3238129650f7190d5175
file + textproc/pandoc/Makefile
--- textproc/pandoc/Makefile
+++ textproc/pandoc/Makefile
@@ -1,6 +1,6 @@
-
+V =3.1.6.1
 COMMENT =  convert between markup and document formats
-REVISION = 0
+PKGNAME =  pandoc-${V}
 
 CATEGORIES =   converters textproc
 
@@ -22,212 +22,237 @@ MODCABAL_STEM =   pandoc
 
 MODULES =  devel/cabal
 MODCABAL_FLAGS =   embed_data_files
-MODCABAL_STEM =pandoc
-MODCABAL_VERSION = 2.19.2
+MODCABAL_STEM =pandoc-cli
+MODCABAL_VERSION = 0.1.1.1
+MODCABAL_EXECUTABLES = pandoc
 
-# Avoids cloning from github
-post-extract:
-   @rm ${WRKSRC}/cabal.project
-
 post-install:
-   ${INSTALL_MAN} ${WRKSRC}/man/pandoc.1 ${PREFIX}/man/man1
+   ${INSTALL_MAN} ${WRKDIR}/${PKGNAME}/man/pandoc.1 ${PREFIX}/man/man1
 
 MODCABAL_MANIFEST  = \
Glob0.10.2  3   \
HUnit   1.6.2.0 0   \
-   HsYAML  0.2.1.1 1   \
JuicyPixels 3.3.8   0   \
-   OneTuple0.3.1   3   \
-   QuickCheck  2.14.2  0   \
+   OneTuple0.4.1.1 0   \
+   Only0.1 2   \
+   QuickCheck  2.14.3  0   \
SHA 1.6.4.4 0   \
StateVar1.2.2   0   \
-   aeson   2.1.0.0 2   \
-   aeson-pretty0.8.9   2   \
-   ansi-terminal   0.11.3  0   \
-   ansi-wl-pprint  0.6.9   3   \
+   aeson   2.1.2.1 3   \
+   aeson-pretty0.8.10  0   \
+   alex3.4.0.0 0   \
+   ansi-terminal   1.0 0   \
+   ansi-terminal-types 0.11.5  1   \
appar   0.1.8   0   \
asn1-encoding   0.9.6   2   \
asn1-parse  0.9.5   0   \
asn1-types  0.3.4   0   \
-   assoc   1.0.2   3   \
-   async   2.2.4   2   \
-   attoparsec  0.14.4  2   \
-   attoparsec-iso8601  1.0.2.1 0   \
+   assoc   1.1 0   \
+   async   2.2.4   3   \
+   attoparsec  0.14.4  4   \
+   attoparsec-iso8601  1.1.0.0 1   \
auto-update 0.1.6   0   \
-   base-compat 0.12.2  0   \
-   base-compat-batteries   0.12.2  0   \
-   base-orphans0.8.7   0   \
+   base-compat 0.13.0  0   \
+   base-compat-batteries   0.13.0  0   \
+   base-orphans0.9.0   0   \
+   base-unicode-symbols0.2.4.2 0   \
base16-bytestring   1.0.2.0 0   \
-   base64  0.4.2.4 1   \
-   base64-bytestring   1.2.1.0 0   \
-   basement0.0.15  0   \
-   bifunctors  5.5.12  1   \
-   bitvec  1.1.3.0 0   \
+   base64  0.4.2.4 3   \
+   base64-bytestring   1.2.1.0 1   \
+   basement0.0.16  0   \
+   bifunctors  5.6.1   1   \
+   bitvec  1.1.4.0 0   \
blaze-builder   0.4.2.2 1   \
-   blaze-html  0.9.1.2 2   \
-   blaze-markup0.8.2.8 3   \
-   boring  0.2 2   \
+   blaze-html  0.9.1.2 3   \
+   blaze-markup0.8.2.8 5   \
+   boring  0.2.1   0   \
bsb-http-chunked0.0.0.4 3   \
byteorder   1.0.4   0   \
-   cabal-doctest   1.0.9   2   \
+   cabal-doctest   1.0.9   3   \
call-stack  0.4.0   0   \
case-insensitive1.2.1.0 0   \
+   cassava 0.5.3.0 3   \
cereal  0.5.8.3 0   \
-   citeproc0.8.0.1 0   \
+   citeproc0.8.1   0   \
colour  2.3.6   0   \
-   commonmark  0.2.2   0   \
-   commonmark-extensions   0.2.3.2 0   \
-   commonmark-pandoc   0.2.1.2 0   \
+   commonmark  0.2.3   0   \
+   commonmark-extensions   0.2.3.5 0   \
+   commonmark-pandoc   0.2.1.3 0   \
comonad 5.0.8   1   \
-   conduit 1.3.4.2 0   \
+   conduit 1.3.5   0   \
conduit-extra   1.3.6   0   \
-   connection  0.3.1   1   \
-   constraints 0.13.4  0   \
+   constraints 0.13.4  1   \
contravariant   1.5.5   0   \
-   cookie  0.4.5   0   \
+   cookie  0.4.6   0   \
+