Hi,
I'm progressing in removing VARBASE usage in the ports tree. Most ports are
updated already, but there are a few left for which I haven't gotten an OK yet.
Attached are diffs for:
No response from maintainer in the last week:
security/vaultwarden
net/znc
Maintainer address is handeled by gmail, which doesn't accept my mails at the
moment:
productivity/radicale
sysutils/slant
No maintainer:
databases/influxdb
productivity/radicale2
sysutils/facette
I'm looking for OKs for these.
No REVISION bump is intentional, because the plist doesn't change.
Best regards,
Stefan
Index: security/vaultwarden/Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
diff -u -p -u -p -r1.29 Makefile
--- security/vaultwarden/Makefile 12 Nov 2023 06:08:41 - 1.29
+++ security/vaultwarden/Makefile 24 Nov 2023 21:21:52 -
@@ -47,7 +47,7 @@ WANTLIB +=pq
LIB_DEPENDS += databases/postgresql
.endif
-SUBST_VARS += WRKSRC VARBASE
+SUBST_VARS += WRKSRC
post-configure:
mv ${WRKDIR}/myvendordir ${WRKSRC}
Index: security/vaultwarden/pkg/PLIST
===
RCS file: /cvs/ports/security/vaultwarden/pkg/PLIST,v
diff -u -p -u -p -r1.5 PLIST
--- security/vaultwarden/pkg/PLIST 18 Mar 2023 04:37:36 - 1.5
+++ security/vaultwarden/pkg/PLIST 24 Nov 2023 21:21:52 -
@@ -4,7 +4,7 @@
@mode 750
@owner _vaultwarden
@group _vaultwarden
-@sample ${VARBASE}/vaultwarden/data/
+@sample ${LOCALSTATEDIR}/vaultwarden/data/
@mode
@owner
@group
@@ -14,4 +14,4 @@ share/doc/vaultwarden/.env.template
@mode 640
@owner _vaultwarden
@group _vaultwarden
-@sample ${VARBASE}/vaultwarden/.env
+@sample ${LOCALSTATEDIR}/vaultwarden/.env
Index: net/znc/Makefile
===
RCS file: /cvs/ports/net/znc/Makefile,v
diff -u -p -u -p -r1.51 Makefile
--- net/znc/Makefile27 Sep 2023 14:18:42 - 1.51
+++ net/znc/Makefile24 Nov 2023 20:36:13 -
@@ -36,6 +36,4 @@ CXXFLAGS+=-DHAVE_OPAQUE_SSL
NO_TEST= Yes
-SUBST_VARS+= VARBASE
-
.include
Index: net/znc/pkg/PLIST-main
===
RCS file: /cvs/ports/net/znc/pkg/PLIST-main,v
diff -u -p -u -p -r1.2 PLIST-main
--- net/znc/pkg/PLIST-main 4 May 2022 09:52:20 - 1.2
+++ net/znc/pkg/PLIST-main 24 Nov 2023 20:36:13 -
@@ -4,8 +4,8 @@
@rcscript ${RCDIR}/znc
@owner _znc
@group _znc
-@sample ${VARBASE}/znc/
-@sample ${VARBASE}/znc/configs/
+@sample ${LOCALSTATEDIR}/znc/
+@sample ${LOCALSTATEDIR}/znc/configs/
@owner
@group
@bin bin/znc
Index: productivity/radicale/Makefile
===
RCS file: /cvs/ports/productivity/radicale/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- productivity/radicale/Makefile 13 Nov 2022 20:31:00 - 1.44
+++ productivity/radicale/Makefile 24 Nov 2023 20:38:31 -
@@ -20,7 +20,6 @@ MODPY_PYBUILD = setuptools
RUN_DEPENDS = security/py-passlib${MODPY_FLAVOR}
NO_TEST = Yes
-SUBST_VARS += VARBASE
pre-configure:
@${SUBST_CMD} ${WRKSRC}/radicale/config.py
Index: productivity/radicale/pkg/PLIST
===
RCS file: /cvs/ports/productivity/radicale/pkg/PLIST,v
diff -u -p -u -p -r1.19 PLIST
--- productivity/radicale/pkg/PLIST 13 Nov 2022 20:31:00 - 1.19
+++ productivity/radicale/pkg/PLIST 24 Nov 2023 20:38:31 -
@@ -93,9 +93,9 @@ share/examples/radicale/log
@mode 640
@owner _radicale
@group _radicale
-@sample ${VARBASE}/log/radicale
+@sample ${LOCALSTATEDIR}/log/radicale
@mode 700
-@sample ${VARBASE}/db/radicale/
+@sample ${LOCALSTATEDIR}/db/radicale/
@sample ${SYSCONFDIR}/radicale/private/
@mode
@owner
Index: sysutils/slant/Makefile
===
RCS file: /cvs/ports/sysutils/slant/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- sysutils/slant/Makefile 27 Sep 2023 17:16:34 - 1.10
+++ sysutils/slant/Makefile 24 Nov 2023 21:17:15 -
@@ -25,8 +25,6 @@ LIB_DEPENDS = databases/sqlite3
SITES =https://kristaps.bsd.lv/slant/snapshots/
-SUBST_VARS = VARBASE
-
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
Index: sysutils/slant/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/slant/pkg/PLIST,v
diff -u -p -u -p -r1.2 PLIST
--- sysutils/slant/pkg/PLIST11 Mar 2022 19:58:02 - 1.2
+++ sysutils/slant/pkg/PLIST24 Nov 2023 21:17:15 -
@@ -7,7 +7,7 @@
sbin/slant-upgrade
share/slant/
share/slant/slant.kwbp
-@cwd ${VARBASE}/www
+@cwd ${LOCALSTATEDIR}/www
@rcscript ${RCDIR}/slant_collectd
@bin cgi-bin/slant-cgi
@exec
