If GH_TAGNAME contains /, the git-archive is generated with the /
replaced by -. Currently we need per-port mess to reset WRKDIST but
it can be handled automatically.
OK?
(The existing WRKDIST don't _have_ to be cleaned at the same time,
but might as well).
The DIST_TUPLE equivalent confused me, so is left as an exercise for
any interested readers. ;)
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
diff -u -p -r1.1641 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 28 Nov 2024 09:53:09 -0000 1.1641
+++ infrastructure/mk/bsd.port.mk 14 Jan 2025 13:55:36 -0000
@@ -897,7 +897,7 @@ _WRKDIRS += ${WRKOBJDIR}/${_WRKDIR_STEM}
_WRKDIRS += ${WRKOBJDIR_MFS}/${_WRKDIR_STEM}
.if !empty(GH_TAGNAME)
-WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/}
+WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/:S,/,-,g}
.elif !empty(GH_COMMIT)
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
.elif defined(DISTNAME)
Index: telephony/coturn/Makefile
===================================================================
RCS file: /cvs/ports/telephony/coturn/Makefile,v
diff -u -p -r1.19 Makefile
--- telephony/coturn/Makefile 16 Dec 2024 13:14:51 -0000 1.19
+++ telephony/coturn/Makefile 14 Jan 2025 13:55:36 -0000
@@ -5,7 +5,6 @@ GH_ACCOUNT = coturn
GH_PROJECT = coturn
GH_TAGNAME = docker/${V}
DISTNAME = turnserver-${V:S/-r/pl/}
-WRKDIST = ${WRKDIR}/coturn-docker-${V}
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
Index: security/uacme/Makefile
===================================================================
RCS file: /cvs/ports/security/uacme/Makefile,v
diff -u -p -r1.13 Makefile
--- security/uacme/Makefile 14 Jan 2025 13:50:31 -0000 1.13
+++ security/uacme/Makefile 14 Jan 2025 13:55:36 -0000
@@ -5,7 +5,6 @@ GH_ACCOUNT= ndilieto
GH_PROJECT= uacme
GH_TAGNAME= upstream/$V
DISTNAME= uacme-$V
-WRKDIST= ${WRKDIR}/uacme-upstream-$V
CATEGORIES= security www
Index: net/slurm/Makefile
===================================================================
RCS file: /cvs/ports/net/slurm/Makefile,v
diff -u -p -r1.15 Makefile
--- net/slurm/Makefile 11 Mar 2022 19:47:31 -0000 1.15
+++ net/slurm/Makefile 14 Jan 2025 13:55:36 -0000
@@ -19,8 +19,6 @@ WANTLIB = c curses
MODULES = devel/cmake
-WRKDIST = ${WRKDIR}/${GH_PROJECT}-upstream-${GH_VERSION}
-
pre-configure:
@${SUBST_CMD} ${WRKSRC}/theme.c ${WRKSRC}/slurm.1
Index: databases/barman/Makefile
===================================================================
RCS file: /cvs/ports/databases/barman/Makefile,v
diff -u -p -r1.30 Makefile
--- databases/barman/Makefile 21 Dec 2024 11:37:48 -0000 1.30
+++ databases/barman/Makefile 14 Jan 2025 13:55:36 -0000
@@ -6,7 +6,6 @@ GH_ACCOUNT = EnterpriseDB
GH_PROJECT = barman
GH_TAGNAME = release/${MODPY_DISTV}
DISTNAME = barman-${MODPY_DISTV}
-WRKDIST = ${WRKDIR}/barman-release-${MODPY_DISTV}
REVISION = 1
CATEGORIES = databases
