Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 04 Jan 2026 21:56:16 +0000
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: eb1140ff7519 - main - textproc/hs-pandoc-crossref: Fix building after the GHC upgrade
Message-ID:  <695ae200.d905.ca757b2@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eb1140ff7519d2fe665cd06b66bdf89d1e4508d0

commit eb1140ff7519d2fe665cd06b66bdf89d1e4508d0
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-12-24 16:33:14 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-01-04 21:50:45 +0000

    textproc/hs-pandoc-crossref: Fix building after the GHC upgrade
---
 textproc/hs-pandoc-crossref/Makefile | 16 ++++++----------
 textproc/hs-pandoc-crossref/distinfo |  6 +-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/textproc/hs-pandoc-crossref/Makefile b/textproc/hs-pandoc-crossref/Makefile
index e52d0706547a..321fdb667a8b 100644
--- a/textproc/hs-pandoc-crossref/Makefile
+++ b/textproc/hs-pandoc-crossref/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pandoc-crossref
 DISTVERSION=	0.3.22
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,10 +10,11 @@ WWW=		https://hackage.haskell.org/package/pandoc-crossref
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
+
 USES=		cabal
 
-USE_CABAL=	pandoc-cli-${PANDOC_VER}
-USE_CABAL+=	Glob-0.10.2_3 \
+USE_CABAL=	Glob-0.10.2_3 \
 		JuicyPixels-3.3.9 \
 		OneTuple-0.4.2_1 \
 		Only-0.1_2 \
@@ -117,7 +119,6 @@ USE_CABAL+=	Glob-0.10.2_3 \
 		open-browser-0.3.0.1 \
 		optparse-applicative-0.19.0.0 \
 		ordered-containers-0.2.4 \
-		os-string-2.0.8 \
 		pandoc-3.8.2 \
 		pandoc-types-1.23.1_4 \
 		pem-0.2.4 \
@@ -187,21 +188,16 @@ USE_CABAL+=	Glob-0.10.2_3 \
 		zip-archive-0.4.3.2_1 \
 		zlib-0.7.1.1
 
-CABAL_EXECUTABLES=	pandoc pandoc-crossref
+CABAL_EXECUTABLES=	pandoc-crossref
 SKIP_CABAL_PLIST=	yes
 
 PLIST_FILES=	bin/pandoc-crossref \
 		share/man/man1/pandoc-crossref.1.gz
 
-PANDOC_VER=	3.8.2
-
 post-build:
-	${SETENV} pandoc_datadir=${WRKSRC}/_cabal_deps/pandoc-${PANDOC_VER} \
-		$$(${FIND} ${WRKSRC}/dist-newstyle -name pandoc -type f -perm +111) \
-		-s -t man ${WRKSRC}/docs/index.md -o ${WRKSRC}/docs/pandoc-crossref.1
+	${LOCALBASE}/bin/pandoc -s -t man ${WRKSRC}/docs/index.md -o ${WRKSRC}/docs/pandoc-crossref.1
 
 post-install:
-	${RM} ${STAGEDIR}${PREFIX}/bin/pandoc
 	${INSTALL_MAN} ${WRKSRC}/docs/pandoc-crossref.1 \
 		${STAGEDIR}${MANDIRS}/man1
 
diff --git a/textproc/hs-pandoc-crossref/distinfo b/textproc/hs-pandoc-crossref/distinfo
index 12e7b06c9316..d1308e5aa70d 100644
--- a/textproc/hs-pandoc-crossref/distinfo
+++ b/textproc/hs-pandoc-crossref/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1760008733
+TIMESTAMP = 1766836552
 SHA256 (cabal/pandoc-crossref-0.3.22/pandoc-crossref-0.3.22.tar.gz) = 11c4ceb655c6f5e7cf0d1ca8230177e485136b2f261d4d7da940191eb8bd5eee
 SIZE (cabal/pandoc-crossref-0.3.22/pandoc-crossref-0.3.22.tar.gz) = 87413
 SHA256 (cabal/Glob-0.10.2/Glob-0.10.2.tar.gz) = 6af672ac8427d35cbd42d64142dc288feab266f0be92dae3c696e8860d8173c0
@@ -279,12 +279,8 @@ SHA256 (cabal/optparse-applicative-0.19.0.0/optparse-applicative-0.19.0.0.tar.gz
 SIZE (cabal/optparse-applicative-0.19.0.0/optparse-applicative-0.19.0.0.tar.gz) = 67629
 SHA256 (cabal/ordered-containers-0.2.4/ordered-containers-0.2.4.tar.gz) = 3da1673e24e12902c2879ee08b73e6978f6bfa70693b13995ebf48bfb7aee546
 SIZE (cabal/ordered-containers-0.2.4/ordered-containers-0.2.4.tar.gz) = 7877
-SHA256 (cabal/os-string-2.0.8/os-string-2.0.8.tar.gz) = 02794279dd30282e7b0d45a860dda50ee26a92b1461f5da4545f62dab4172686
-SIZE (cabal/os-string-2.0.8/os-string-2.0.8.tar.gz) = 44896
 SHA256 (cabal/pandoc-3.8.2/pandoc-3.8.2.tar.gz) = 80eb055b0170f4b3b220c082e1cd643f9f9bf49bbe8b4c57f3be730c23ccc0f7
 SIZE (cabal/pandoc-3.8.2/pandoc-3.8.2.tar.gz) = 7818881
-SHA256 (cabal/pandoc-cli-3.8.2/pandoc-cli-3.8.2.tar.gz) = cf31adfcc041dcb3215c50eb941e1d6cac2a68216e765410a5e580df5dbf7ff6
-SIZE (cabal/pandoc-cli-3.8.2/pandoc-cli-3.8.2.tar.gz) = 98822
 SHA256 (cabal/pandoc-types-1.23.1/pandoc-types-1.23.1.tar.gz) = ad0fa083d28d452b7d37a1c67a2c140137a5f29a2f52fd88e807fac20245a1c1
 SIZE (cabal/pandoc-types-1.23.1/pandoc-types-1.23.1.tar.gz) = 36480
 SHA256 (cabal/pandoc-types-1.23.1/revision/4.cabal) = b8908a15cd12aabffded17f7a18eb87bf577a0fd14e9de08d7976d82139c99ea


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695ae200.d905.ca757b2>