On 2023/01/26 13:50, Stuart Henderson wrote:
> Since the /var referred to here is the directory used by rpki-client
> which can't be overridden by anything in ports, imho it should just
> use /var not VARBASE.
>
> (Similar case to ports which refers to /etc files which are part of the
> base system, which should be /etc not SYSCONFDIR).
+ updated diff with missing @conflict
Index: gortr/Makefile
===================================================================
RCS file: /cvs/ports/net/gortr/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- gortr/Makefile 11 Mar 2022 19:46:01 -0000 1.3
+++ gortr/Makefile 26 Jan 2023 13:54:07 -0000
@@ -4,7 +4,7 @@ MODGO_MODNAME= github.com/cloudflare/go
MODGO_VERSION= v0.14.7
DISTNAME= gortr-${MODGO_VERSION}
-REVISION= 0
+REVISION= 1
BROKEN-aarch64= pins old version of golang.org/x/sys/unix
Index: gortr/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/gortr/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- gortr/pkg/PLIST 11 Mar 2022 19:46:01 -0000 1.2
+++ gortr/pkg/PLIST 26 Jan 2023 13:54:07 -0000
@@ -1,3 +1,4 @@
+@conflict stayrtr-*
@bin bin/gortr
@bin bin/rtrdump
@bin bin/rtrmon
Index: stayrtr/Makefile
===================================================================
RCS file: /cvs/ports/net/stayrtr/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- stayrtr/Makefile 26 Jan 2023 13:38:49 -0000 1.1.1.1
+++ stayrtr/Makefile 26 Jan 2023 13:54:07 -0000
@@ -2,6 +2,7 @@ COMMENT= RPKI-To-Router implementation i
MODGO_MODNAME= github.com/bgp/stayrtr
MODGO_VERSION= v0.4.0
+REVISION= 0
DISTNAME= stayrtr-${MODGO_VERSION}
@@ -10,8 +11,6 @@ HOMEPAGE= https://www.github.com/bgp/sta
# BSD 3-Clause
PERMIT_PACKAGE= yes
-
-SUBST_VARS= VARBASE
MODULES= lang/go
Index: stayrtr/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/stayrtr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- stayrtr/pkg/PLIST 26 Jan 2023 13:38:49 -0000 1.1.1.1
+++ stayrtr/pkg/PLIST 26 Jan 2023 13:54:07 -0000
@@ -1,3 +1,4 @@
+@conflict gortr-*
@newgroup _stayrtr:505
@newuser _stayrtr:505:505::StayRTR Account:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/stayrtr
Index: stayrtr/pkg/README
===================================================================
RCS file: /cvs/ports/net/stayrtr/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- stayrtr/pkg/README 26 Jan 2023 13:38:49 -0000 1.1.1.1
+++ stayrtr/pkg/README 26 Jan 2023 13:54:07 -0000
@@ -8,4 +8,4 @@ To use your local RPKI cache, add to the
And run:
- # rcctl set stayrtr flags -cache ${VARBASE}/db/rpki-client/json
+ # rcctl set stayrtr flags -cache /var/db/rpki-client/json
