Index | Thread | Search

From:
Klemens Nanni <kn@openbsd.org>
Subject:
net/yggdrasil-go: drop sample with random key, name readme after package
To:
ports <ports@openbsd.org>
Date:
Fri, 1 Nov 2024 23:17:13 +0000

Download raw body.

Thread
yggdrasil -genconf produces a working config, but everytime with a random key,
so every package built will differ.  You're supposed to put your own key there
anyway (usually with yggdrasil-genkeys).

I don't see much value in shipping and installing a generated random config,
so drop that and expect the user to manager their /etc/yggdrasil.conf file,
if there should be any, themselves.

Next, the package is called yggdrasil-go, but the project's readme lands under
share/doc/yggdrasil/;  not a big deal, but I think we usually go with PKGSTEM
for these, so adjust that, too.

Feedback? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/yggdrasil-go/Makefile,v
diff -u -p -r1.5 Makefile
--- Makefile	27 Nov 2023 09:39:09 -0000	1.5
+++ Makefile	1 Nov 2024 23:10:19 -0000
@@ -2,6 +2,7 @@ COMMENT =	experimental fully end-to-end 
 
 MODGO_MODNAME =	github.com/yggdrasil-network/yggdrasil-go
 MODGO_VERSION =	v0.5.3
+REVISION =	0
 
 DISTNAME =	yggdrasil-go-${MODGO_VERSION}
 
@@ -16,11 +17,11 @@ MODULES =		lang/go
 
 WANTLIB += c pthread
 
+DOC_DIR =	${PREFIX}/share/doc/${PKGSTEM}
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/yggdrasil/
-	${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/yggdrasil/
-	${PREFIX}/bin/yggdrasil -genconf > \
-	    ${PREFIX}/share/examples/yggdrasil/yggdrasil.conf
+	${INSTALL_DATA_DIR} ${DOC_DIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DOC_DIR}/
 	mv ${PREFIX}/bin/{,yggdrasil-}genkeys
 
 .include "modules.inc"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/yggdrasil-go/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- pkg/PLIST	27 Nov 2023 09:39:09 -0000	1.4
+++ pkg/PLIST	1 Nov 2024 23:11:26 -0000
@@ -2,8 +2,5 @@
 @bin bin/yggdrasil
 @bin bin/yggdrasil-genkeys
 @bin bin/yggdrasilctl
-share/doc/yggdrasil/
-share/doc/yggdrasil/README.md
-share/examples/yggdrasil/
-share/examples/yggdrasil/yggdrasil.conf
-@sample ${SYSCONFDIR}/yggdrasil.conf
+share/doc/yggdrasil-go/
+share/doc/yggdrasil-go/README.md