Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8D11384EA2 for ; Tue, 31 Oct 2023 14:37:30 +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 mg_riULuYjS6 for ; Tue, 31 Oct 2023 14:37:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E0F3885010 for ; Tue, 31 Oct 2023 14:37:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DA1DFFADC; Tue, 31 Oct 2023 14:37:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1698763049274340" MIME-Version: 1.0 Date: Tue, 31 Oct 2023 14:37:29 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/converters/pandoc To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231031143729.DA1DFFADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1698763049274340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Tue Oct 31 14:37:29 UTC 2023 Modified Files: pkgsrc/converters/pandoc: Makefile PLIST distinfo options.mk Log Message: converters/pandoc: Fix build with GHC 9.6 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/pandoc/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/pandoc/PLIST cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/pandoc/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/pandoc/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1698763049274340 Content-Disposition: inline Content-Length: 3137 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/converters/pandoc/Makefile diff -u pkgsrc/converters/pandoc/Makefile:1.14 pkgsrc/converters/pandoc/Makefile:1.15 --- pkgsrc/converters/pandoc/Makefile:1.14 Mon Oct 9 04:54:04 2023 +++ pkgsrc/converters/pandoc/Makefile Tue Oct 31 14:37:29 2023 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.14 2023/10/09 04:54:04 pho Exp $ +# $NetBSD: Makefile,v 1.15 2023/10/31 14:37:29 pho Exp $ -PKGREVISION= 2 .include "../../converters/hs-pandoc-base/version.mk" # This package does not use the version number of "pandoc-cli" for a # historical reason. When the upstream releases a new version of # "pandoc-cli" without releasing new "pandoc", bump the revision of this # package without changing PANDOC_BASE_VERSION. -DISTNAME= pandoc-cli-0.1 +DISTNAME= pandoc-cli-0.1.1.1 PKGNAME= pandoc-${PANDOC_BASE_VERSION} CATEGORIES= converters Index: pkgsrc/converters/pandoc/PLIST diff -u pkgsrc/converters/pandoc/PLIST:1.3 pkgsrc/converters/pandoc/PLIST:1.4 --- pkgsrc/converters/pandoc/PLIST:1.3 Sun Jan 29 10:09:41 2023 +++ pkgsrc/converters/pandoc/PLIST Tue Oct 31 14:37:29 2023 @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.3 2023/01/29 10:09:41 pho Exp $ +@comment $NetBSD: PLIST,v 1.4 2023/10/31 14:37:29 pho Exp $ bin/pandoc -${PLIST.doc}share/doc/${HS_PLATFORM}/pandoc-cli-0.1/COPYING.md +share/doc/${HS_PLATFORM}/pandoc-cli-0.1.1.1/COPYING.md Index: pkgsrc/converters/pandoc/distinfo diff -u pkgsrc/converters/pandoc/distinfo:1.7 pkgsrc/converters/pandoc/distinfo:1.8 --- pkgsrc/converters/pandoc/distinfo:1.7 Sun Jan 29 10:09:41 2023 +++ pkgsrc/converters/pandoc/distinfo Tue Oct 31 14:37:29 2023 @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2023/01/29 10:09:41 pho Exp $ +$NetBSD: distinfo,v 1.8 2023/10/31 14:37:29 pho Exp $ -BLAKE2s (pandoc-cli-0.1.tar.gz) = abf56c51b167bfd9dade3c30595bd8ce23bb1d3c8828e01bd8289d4178679d1f -SHA512 (pandoc-cli-0.1.tar.gz) = f6b657275704446f7d9cd9b61e4be40c6d793a5d3c72ac8c4da4987cb7c6ff46119ce305bcb7e791ca51dffb458d0e6b549ae0f60228196854b8709d811bec01 -Size (pandoc-cli-0.1.tar.gz) = 10520 bytes +BLAKE2s (pandoc-cli-0.1.1.1.tar.gz) = 08a52dcd8982e90d1dc29f1768118f5b8eddc46c1ab2b728e1fdffd806163ae0 +SHA512 (pandoc-cli-0.1.1.1.tar.gz) = cdc3b30e6d340f8401698ee6c424410602ab37e50d1165c0a84620d323bfa9cf57bbca5c9740fe3d98025c9ce5f11a587cd97328682830a22c0c07a8d6efbb75 +Size (pandoc-cli-0.1.1.1.tar.gz) = 10789 bytes Index: pkgsrc/converters/pandoc/options.mk diff -u pkgsrc/converters/pandoc/options.mk:1.1 pkgsrc/converters/pandoc/options.mk:1.2 --- pkgsrc/converters/pandoc/options.mk:1.1 Sun Jan 29 10:10:04 2023 +++ pkgsrc/converters/pandoc/options.mk Tue Oct 31 14:37:29 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2023/01/29 10:10:04 pho Exp $ +# $NetBSD: options.mk,v 1.2 2023/10/31 14:37:29 pho Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pandoc PKG_SUPPORTED_OPTIONS= lua server @@ -14,6 +14,7 @@ PKG_SUGGESTED_OPTIONS= lua CONFIGURE_ARGS+= -f lua .include "../../lang/hs-hslua-cli/buildlink3.mk" .include "../../converters/hs-pandoc-lua-engine/buildlink3.mk" +.include "../../sysutils/hs-temporary/buildlink3.mk" .else CONFIGURE_ARGS+= -f-lua .endif --_----------=_1698763049274340--