spotted while working on the other bits, but this is really standalone,
does not change behaviour and simplifies the other diff.

In DISTFILES, if you have foo-{bar/}baz, bar/baz will be fetched but
saved as foo-baz.

Thus all common parts can go into baz rather than duplicated in foo and
bar/.

no distinfo changes for GH_COMMIT ports.
OK?

Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1576
diff -u -p -r1.1576 bsd.port.mk
--- bsd.port.mk 6 Jul 2022 09:30:41 -0000       1.1576
+++ bsd.port.mk 13 Jul 2022 11:45:51 -0000
@@ -1290,7 +1290,7 @@ _warn_checksum += ;echo ">>> MASTER_SITE
 EXTRACT_SUFX ?= .tar.gz
 
 .if !empty(GH_COMMIT)
-GH_DISTFILE = 
${DISTNAME}-${GH_COMMIT:C/(........).*/\1/}${EXTRACT_SUFX}{${GH_COMMIT}${EXTRACT_SUFX}}
+GH_DISTFILE = 
${DISTNAME}-${GH_COMMIT:C/(........).*/\1/}{${GH_COMMIT}}${EXTRACT_SUFX}
 DISTFILES ?= ${GH_DISTFILE}
 .elif defined(DISTNAME)
 DISTFILES ?= ${DISTNAME}${EXTRACT_SUFX}

Reply via email to