misc/mycorrhiza: fix port

thanks to @stu for comments.

4 files changed, 56 insertions, 57 deletions

diff --git a/misc/mycorrhiza/Makefile b/misc/mycorrhiza/Makefile
index eb14d7d..9e042c1 100644
--- a/misc/mycorrhiza/Makefile
+++ b/misc/mycorrhiza/Makefile
@@ -6,8 +6,6 @@ MODGO_VERSION =	v1.12.1
 DISTNAME =	mycorrhiza-${MODGO_VERSION}
 CATEGORIES =	misc
 
-#MAINTAINER = ???
-
 HOMEPAGE =	https://mycorrhiza.wiki
 
 # AGPLv3 only
@@ -15,58 +13,14 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB +=		c pthread
 
-SUBST_VARS +=		VARBASE
+#SUBST_VARS +=		LOCALSTATEDIR
 
 MODULES =		lang/go
 
-MODGO_MODULES =	\
-	git.sr.ht/~bouncepaw/mycomarkup/v5	 v5.2.1 \
-	github.com/andybalholm/brotli		 v1.0.3 \
-	github.com/davecgh/go-spew		 v1.1.0 \
-	github.com/go-ini/ini			 v1.63.2 \
-	github.com/golang/snappy		 v0.0.3 \
-	github.com/gorilla/feeds		 v1.1.1 \
-	github.com/gorilla/mux			 v1.8.0 \
-	github.com/klauspost/compress		 v1.13.5 \
-	github.com/kr/pretty			 v0.2.1 \
-	github.com/kr/pty			 v1.1.1 \
-	github.com/kr/text			 v0.1.0 \
-	github.com/pmezard/go-difflib		 v1.0.0 \
-	github.com/stretchr/objx		 v0.1.0 \
-	github.com/stretchr/testify		 v1.7.0 \
-	github.com/valyala/bytebufferpool	 v1.0.0 \
-	github.com/valyala/fasthttp		 v1.30.0 \
-	github.com/valyala/quicktemplate	 v1.7.0 \
-	github.com/valyala/tcplisten		 v1.0.0 \
-	golang.org/x/crypto			 v0.0.0-20211108221036-ceb1ce70b4fa \
-	golang.org/x/exp			 v0.0.0-20220414153411-bcd21879b8fd \
-	golang.org/x/mod			 v0.6.0-dev.0.20211013180041-c96bc1413d57 \
-	golang.org/x/net			 v0.0.0-20210510120150-4163338589ed \
-	golang.org/x/sys			 v0.0.0-20211109184856-51b60fd695b3 \
-	golang.org/x/term			 v0.0.0-20210927222741-03fcf44c2211 \
-	golang.org/x/text			 v0.3.7 \
-	golang.org/x/tools			 v0.1.8-0.20211029000441-d6a9af8af023 \
-	golang.org/x/xerrors			 v0.0.0-20200804184101-5ec99f83aff1 \
-	gopkg.in/check.v1			 v0.0.0-20161208181325-20d25e280405 \
-	gopkg.in/yaml.v3			 v3.0.0-20200313102051-9f266ea9e77c
-
-MODGO_MODFILES =	\
-	github.com/andybalholm/brotli	 v1.0.2 \
-	github.com/klauspost/compress	 v1.13.4 \
-	golang.org/x/crypto		 v0.0.0-20210513164829-c07d793c2f9a \
-	golang.org/x/net		 v0.0.0-20210226172049-e18ecbb05110 \
-	golang.org/x/sys		 v0.0.0-20201119102817-f84b799fce68 \
-	golang.org/x/sys		 v0.0.0-20210423082822-04245dca01da \
-	golang.org/x/sys		 v0.0.0-20210514084401-e8d321eab015 \
-	golang.org/x/sys		 v0.0.0-20210615035016-665e8c7367d1 \
-	golang.org/x/sys		 v0.0.0-20211019181941-9d821ace8654 \
-	golang.org/x/term		 v0.0.0-20201126162022-7de9c90e9dd1 \
-	golang.org/x/text		 v0.3.3 \
-	golang.org/x/text		 v0.3.6 \
-	golang.org/x/tools		 v0.0.0-20180917221912-90fa682c2a6e
-
 RUN_DEPENDS =		devel/git
 
 NO_TEST =		Yes
 
+.include "modules.inc"
+
 .include <bsd.port.mk>
diff --git a/misc/mycorrhiza/modules.inc b/misc/mycorrhiza/modules.inc
new file mode 100644
index 0000000..d5028d8
--- /dev/null
+++ b/misc/mycorrhiza/modules.inc
@@ -0,0 +1,46 @@
+MODGO_MODULES =	\
+	git.sr.ht/~bouncepaw/mycomarkup/v5	 v5.2.1 \
+	github.com/andybalholm/brotli		 v1.0.3 \
+	github.com/davecgh/go-spew		 v1.1.0 \
+	github.com/go-ini/ini			 v1.63.2 \
+	github.com/golang/snappy		 v0.0.3 \
+	github.com/gorilla/feeds		 v1.1.1 \
+	github.com/gorilla/mux			 v1.8.0 \
+	github.com/klauspost/compress		 v1.13.5 \
+	github.com/kr/pretty			 v0.2.1 \
+	github.com/kr/pty			 v1.1.1 \
+	github.com/kr/text			 v0.1.0 \
+	github.com/pmezard/go-difflib		 v1.0.0 \
+	github.com/stretchr/objx		 v0.1.0 \
+	github.com/stretchr/testify		 v1.7.0 \
+	github.com/valyala/bytebufferpool	 v1.0.0 \
+	github.com/valyala/fasthttp		 v1.30.0 \
+	github.com/valyala/quicktemplate	 v1.7.0 \
+	github.com/valyala/tcplisten		 v1.0.0 \
+	golang.org/x/crypto			 v0.0.0-20211108221036-ceb1ce70b4fa \
+	golang.org/x/exp			 v0.0.0-20220414153411-bcd21879b8fd \
+	golang.org/x/mod			 v0.6.0-dev.0.20211013180041-c96bc1413d57 \
+	golang.org/x/net			 v0.0.0-20210510120150-4163338589ed \
+	golang.org/x/sys			 v0.0.0-20211109184856-51b60fd695b3 \
+	golang.org/x/term			 v0.0.0-20210927222741-03fcf44c2211 \
+	golang.org/x/text			 v0.3.7 \
+	golang.org/x/tools			 v0.1.8-0.20211029000441-d6a9af8af023 \
+	golang.org/x/xerrors			 v0.0.0-20200804184101-5ec99f83aff1 \
+	gopkg.in/check.v1			 v0.0.0-20161208181325-20d25e280405 \
+	gopkg.in/yaml.v3			 v3.0.0-20200313102051-9f266ea9e77c
+
+MODGO_MODFILES =	\
+	github.com/andybalholm/brotli	 v1.0.2 \
+	github.com/klauspost/compress	 v1.13.4 \
+	golang.org/x/crypto		 v0.0.0-20210513164829-c07d793c2f9a \
+	golang.org/x/net		 v0.0.0-20210226172049-e18ecbb05110 \
+	golang.org/x/sys		 v0.0.0-20201119102817-f84b799fce68 \
+	golang.org/x/sys		 v0.0.0-20210423082822-04245dca01da \
+	golang.org/x/sys		 v0.0.0-20210514084401-e8d321eab015 \
+	golang.org/x/sys		 v0.0.0-20210615035016-665e8c7367d1 \
+	golang.org/x/sys		 v0.0.0-20211019181941-9d821ace8654 \
+	golang.org/x/term		 v0.0.0-20201126162022-7de9c90e9dd1 \
+	golang.org/x/text		 v0.3.3 \
+	golang.org/x/text		 v0.3.6 \
+	golang.org/x/tools		 v0.0.0-20180917221912-90fa682c2a6e
+
diff --git a/misc/mycorrhiza/pkg/PLIST b/misc/mycorrhiza/pkg/PLIST
index 08aaa82..462ab5a 100644
--- a/misc/mycorrhiza/pkg/PLIST
+++ b/misc/mycorrhiza/pkg/PLIST
@@ -1,5 +1,9 @@
 @newgroup _mycorrhiza:884
-@newuser _mycorrhiza:884:_mycorrhiza:daemon:Mycorrhiza User:${VARBASE}/mycorrhiza:/sbin/nologin
+@newuser _mycorrhiza:884:_mycorrhiza::Mycorrhiza User:${LOCALSTATEDIR}/mycorrhiza:/sbin/nologin
 @rcscript ${RCDIR}/mycorrhiza
 @bin bin/mycorrhiza
 share/doc/pkg-readmes/${PKGSTEM}
+@mode 0755
+@owner _mycorrhiza
+@group _mycorrhiza
+@sample ${LOCALSTATEDIR}/mycorrhiza/
diff --git a/misc/mycorrhiza/pkg/README b/misc/mycorrhiza/pkg/README
index 0b7ea37..74fdf77 100644
--- a/misc/mycorrhiza/pkg/README
+++ b/misc/mycorrhiza/pkg/README
@@ -37,7 +37,6 @@ domain mycorrhiza.example.com {
 }
 
 mycorrhiza# acme-client -v mycorrhiza.example.com
-mycorrhiza# acme-client -v mycorrhiza.example.com
 
 relayd(8)
 ---------
@@ -74,13 +73,9 @@ Setup
 
 See ${HOMEPAGE} for details about configuration and deployment.
 Be sure to set up proper authentication.
-Set desired wiki name in ${RCDIR}/mycorrhiza (daemon_flags variable).
-
-mycorrhiza# mkdir ${VARBASE}/mycorrhiza
-mycorrhiza# cd ${VARBASE}/mycorrhiza
-mycorrhiza# mycorrhiza .
-mycorrhiza# chown -R _mycorrhiza:_mycorrhiza ${VARBASE}/mycorrhiza
+Set desired wiki name, enable and start the daemon.
 
+mycorrhiza# rcctl set mycorrhiza flags '${LOCALSTATEDIR}/mycorrhiza'
 mycorrhiza# rcctl enable mycorrhiza
 mycorrhiza# rcctl start mycorrhiza