On Tue, Jan 14, 2025 at 03:33:01PM +0100, Theo Buehler wrote:
> On Tue, Jan 14, 2025 at 01:58:14PM +0000, Stuart Henderson wrote:
> > 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?
>
> ok
>
> > The DIST_TUPLE equivalent confused me, so is left as an exercise for
> > any interested readers. ;)
>
> This seems to work in a quick test with uacme 1.7.6, but presumably this
> ugly repetition wants to be deduplicated (not sure why this wasn't done).
Case in point: I missed a g at the end of the first one.
Index: infrastructure/mk/dist-tuple.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/dist-tuple.port.mk,v
diff -u -p -r1.17 dist-tuple.port.mk
--- infrastructure/mk/dist-tuple.port.mk 29 Feb 2024 21:20:51 -0000
1.17
+++ infrastructure/mk/dist-tuple.port.mk 14 Jan 2025 14:34:46 -0000
@@ -27,9 +27,9 @@ ERRORS += "Fatal: invalid choice for DIS
_subdir =
. if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{10,40}$/HASH/}" != "HASH"
# set DISTNAME if not done by the port and add refs/tags/ subdir
-DISTNAME ?= ${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
+DISTNAME ?=
${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/:S,/,-,g}
_subdir = refs/tags/
-_DT_WRKDIST ?=
${WRKDIR}/${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
+_DT_WRKDIST ?=
${WRKDIR}/${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/:S,/,-,g}
. else
_DT_WRKDIST ?= ${WRKDIR}/${_project:C,^.*/,,}-${_id}
. endif
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 14:34:46 -0000
@@ -1,11 +1,9 @@
COMMENT= lightweight C ACMEv2 client, uses external authenticators
V= 1.7.6
-GH_ACCOUNT= ndilieto
-GH_PROJECT= uacme
-GH_TAGNAME= upstream/$V
-DISTNAME= uacme-$V
-WRKDIST= ${WRKDIR}/uacme-upstream-$V
+DIST_TUPLE= github ndilieto uacme upstream/${V} .
+#DISTNAME= uacme-$V
+#WRKDIST= ${WRKDIR}/uacme-upstream-$V
CATEGORIES= security www
Index: security/uacme/distinfo
===================================================================
RCS file: /cvs/ports/security/uacme/distinfo,v
diff -u -p -r1.8 distinfo
--- security/uacme/distinfo 14 Jan 2025 13:50:31 -0000 1.8
+++ security/uacme/distinfo 14 Jan 2025 14:34:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (uacme-1.7.6.tar.gz) = 0RqGrCoNvyhd4n3/QZPGX383Nto9BIAEmvUNMFlA4NY=
-SIZE (uacme-1.7.6.tar.gz) = 336734
+SHA256 (ndilieto-uacme-upstream/1.7.6.tar.gz) =
0RqGrCoNvyhd4n3/QZPGX383Nto9BIAEmvUNMFlA4NY=
+SIZE (ndilieto-uacme-upstream/1.7.6.tar.gz) = 336734
