Here I'm confused why things used to work or when it broke. The new
code makes sense and is consistent with the revision handling below.

OK?

>From a646f21c45e5a13fb76981e0b8e936b5fce77ad3 Mon Sep 17 00:00:00 2001
From: Greg Steuck <[email protected]>
Date: Sun, 12 Nov 2023 08:25:24 -0800

This looks like a "how could this ever have worked" problem.
It is only ever exercised if a file needs to be fetched.
Once in distfiles we won't notice when it's broken.
---
 devel/cabal/cabal.port.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/cabal/cabal.port.mk b/devel/cabal/cabal.port.mk
index b3bf953b981..48602141e67 100644
--- a/devel/cabal/cabal.port.mk
+++ b/devel/cabal/cabal.port.mk
@@ -60,7 +60,7 @@ MODCABAL_post-extract = \
 # Some packages need an updated .cabal file from hackage to overwrite
 # the one in the tar ball.
 .if defined(MODCABAL_REVISION)
-DISTFILES.hs += 
${DISTNAME}_${MODCABAL_REVISION}{revision/${MODCABAL_REVISION}}.cabal
+DISTFILES.hs += 
${DISTNAME}_${MODCABAL_REVISION}{${DISTNAME}/revision/${MODCABAL_REVISION}}.cabal
 MODCABAL_post-extract += \
        && cp ${FULLDISTDIR}/${DISTNAME}_${MODCABAL_REVISION}.cabal \
                ${WRKSRC}/${MODCABAL_STEM}.cabal
-- 
2.42.0

Reply via email to