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 -0000 1.29
+++ security/vaultwarden/Makefile 24 Nov 2023 21:21:52 -0000
@@ -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 -0000 1.5
+++ security/vaultwarden/pkg/PLIST 24 Nov 2023 21:21:52 -0000
@@ -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/Makefile 27 Sep 2023 14:18:42 -0000 1.51
+++ net/znc/Makefile 24 Nov 2023 20:36:13 -0000
@@ -36,6 +36,4 @@ CXXFLAGS+= -DHAVE_OPAQUE_SSL
NO_TEST= Yes
-SUBST_VARS+= VARBASE
-
.include <bsd.port.mk>
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 -0000 1.2
+++ net/znc/pkg/PLIST-main 24 Nov 2023 20:36:13 -0000
@@ -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 -0000 1.44
+++ productivity/radicale/Makefile 24 Nov 2023 20:38:31 -0000
@@ -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 -0000 1.19
+++ productivity/radicale/pkg/PLIST 24 Nov 2023 20:38:31 -0000
@@ -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 -0000 1.10
+++ sysutils/slant/Makefile 24 Nov 2023 21:17:15 -0000
@@ -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/PLIST 11 Mar 2022 19:58:02 -0000 1.2
+++ sysutils/slant/pkg/PLIST 24 Nov 2023 21:17:15 -0000
@@ -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 slant-upgrade
Index: databases/influxdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/influxdb/Makefile,v
diff -u -p -u -p -r1.28 Makefile
--- databases/influxdb/Makefile 14 Nov 2023 00:08:32 -0000 1.28
+++ databases/influxdb/Makefile 24 Nov 2023 19:37:44 -0000
@@ -59,7 +59,6 @@ MODGO_FLAGS += -tags assets
# for patches to apply
WRKDIST = ${WRKSRC}
-SUBST_VARS = VARBASE
NO_TEST = Yes
Index: databases/influxdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/influxdb/pkg/PLIST,v
diff -u -p -u -p -r1.10 PLIST
--- databases/influxdb/pkg/PLIST 14 Nov 2023 00:08:32 -0000 1.10
+++ databases/influxdb/pkg/PLIST 24 Nov 2023 19:37:44 -0000
@@ -1,13 +1,13 @@
@newgroup _influx:797
-@newuser _influx:797:_influx::InfluxDB user:${VARBASE}/influxdb:/sbin/nologin
+@newuser _influx:797:_influx::InfluxDB
user:${LOCALSTATEDIR}/influxdb:/sbin/nologin
@rcscript ${RCDIR}/influxdb
-@extraunexec rm -rf ${VARBASE}/influxdb/
+@extraunexec rm -rf ${LOCALSTATEDIR}/influxdb/
@bin bin/influxd
@bin bin/telemetryd
@mode 0750
@owner _influx
@group _influx
-@sample ${VARBASE}/influxdb/
+@sample ${LOCALSTATEDIR}/influxdb/
@mode
@owner
@group
Index: productivity/radicale2/Makefile
===================================================================
RCS file: /cvs/ports/productivity/radicale2/Makefile,v
diff -u -p -u -p -r1.14 Makefile
--- productivity/radicale2/Makefile 15 Apr 2023 08:30:47 -0000 1.14
+++ productivity/radicale2/Makefile 24 Nov 2023 20:39:21 -0000
@@ -21,7 +21,6 @@ RUN_DEPENDS = devel/py-dateutil${MODPY_F
textproc/py-vobject${MODPY_FLAVOR}
NO_TEST = Yes
-SUBST_VARS += VARBASE
pre-configure:
@${SUBST_CMD} ${WRKSRC}/radicale/config.py
Index: productivity/radicale2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/radicale2/pkg/PLIST,v
diff -u -p -u -p -r1.7 PLIST
--- productivity/radicale2/pkg/PLIST 13 Nov 2022 20:31:00 -0000 1.7
+++ productivity/radicale2/pkg/PLIST 24 Nov 2023 20:39:21 -0000
@@ -59,9 +59,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/facette/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/facette/Makefile,v
diff -u -p -u -p -r1.22 Makefile
--- sysutils/facette/Makefile 25 Sep 2023 17:07:36 -0000 1.22
+++ sysutils/facette/Makefile 24 Nov 2023 21:15:26 -0000
@@ -33,7 +33,6 @@ WANTLIB += c pthread rrd
PORTHOME = ${WRKDIR}
MAKE_ENV = CGO_LDFLAGS="-Wl,-rpath -Wl,${X11BASE}/lib"
USE_GMAKE = Yes
-SUBST_VARS += VARBASE
post-patch:
ln -s ${WRKDIR}/node_modules ${WRKSRC}/ui/node_modules
Index: sysutils/facette/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/facette/pkg/PLIST,v
diff -u -p -u -p -r1.6 PLIST
--- sysutils/facette/pkg/PLIST 8 Nov 2022 11:17:09 -0000 1.6
+++ sysutils/facette/pkg/PLIST 24 Nov 2023 21:15:26 -0000
@@ -1,5 +1,5 @@
@newgroup _facette:774
-@newuser _facette:774:774::Facette Daemon:${VARBASE}/empty:/sbin/nologin
+@newuser _facette:774:774::Facette Daemon:${LOCALSTATEDIR}/empty:/sbin/nologin
@rcscript ${RCDIR}/facette
@bin bin/facette
@bin bin/facettectl
@@ -9,4 +9,4 @@ share/examples/facette/facette.yaml
@sample ${SYSCONFDIR}/facette/facette.yaml
@owner _facette
@group _facette
-@sample ${VARBASE}/facette/
+@sample ${LOCALSTATEDIR}/facette/
