rcvd: some optimalization test

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rcvd: some optimalization test
From: Marcin Gondek (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 1 Oct 2026 18:08:59 +0000
Module Name:	pkgsrc-wip
Committed By:	Marcin Gondek <drixter%e-utp.net@localhost>
Pushed By:	drixter
Date:		Thu Oct 1 20:08:44 2026 +0200
Changeset:	349c18c1b12a8c2d4a98f9148fc7caebb4d4079e

Modified Files:
	rcvd/Makefile
	rcvd/PLIST
Added Files:
	rcvd/Makefile-orig

Log Message:
rcvd: some optimalization test

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=349c18c1b12a8c2d4a98f9148fc7caebb4d4079e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rcvd/Makefile      | 39 +++++++++++++++---------------
 rcvd/Makefile-orig | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rcvd/PLIST         |  8 +++---
 3 files changed, 93 insertions(+), 25 deletions(-)

diffs:
diff --git a/rcvd/Makefile b/rcvd/Makefile
index 5d25a3ebf2..4bb53cb3bd 100644
--- a/rcvd/Makefile
+++ b/rcvd/Makefile
@@ -17,23 +17,26 @@ GO_VERSION_REQD=	127
 .include "go-modules.mk"
 
 # rcvd runs unprivileged and needs a dedicated user/group.
-PKG_GROUPS=	rcvd
-PKG_USERS=	rcvd:rcvd
-PKG_GECOS.rcvd=	rcvd DNS daemon
-PKG_HOME.rcvd=	/nonexistent
-PKG_SHELL.rcvd=	${NOLOGIN}
 
-RCD_SCRIPTS=	rcvd
+BUILD_DEFS+=	VARBASE RCVD_USER RCVD_GROUP
+
+RCVD_USER?=	rcvd
+RCVD_GROUP?=	rcvd
 
-BUILD_DEFS+=	VARBASE
+PKG_GROUPS+=			${RCVD_GROUP}
+PKG_USERS+=			${RVCD_USER}:${RCVD_GROUP}
+PKG_GECOS.${KRESD_USER}=	rcvd DNS daemon
+PKG_GROUPS_VARS+=		RCVD_GROUP
+PKG_USERS_VARS=			RCVD_USER
+
+RCD_SCRIPTS=	rcvd
 
 # Config and log directories, owned by the rcvd user.
-OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/rcvd rcvd rcvd 0755
-OWN_DIRS_PERMS+=	${VARBASE}/log/rcvd rcvd rcvd 0755
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/rcvd ${RCVD_USER} ${RCVD_GROUP} 0755
+OWN_DIRS_PERMS+=	${VARBASE}/log/rcvd ${RCVD_USER} ${RCVD_GROUP} 0755
 
 # The example forwarder profile becomes the default config on first install.
-EGDIR=		${PREFIX}/share/examples/rcvd
-CONF_FILES=	${EGDIR}/rcvd.toml ${PKG_SYSCONFDIR}/rcvd/rcvd.toml
+CONF_FILES=	${PREFIX}/share/examples/rcvd/mode1-forwarder-3providers.toml ${PKG_SYSCONFDIR}/rcvd/rcvd.toml
 
 # Stamp version, date, and source into the binary (parity with the release
 # recipe). buildDate is derived from SOURCE_DATE_EPOCH so the build stays
@@ -55,17 +58,13 @@ GO_BUILD_PATTERN=	./cmd/rcvd
 # rcvd is a pure-Go static binary (no cgo), matching the upstream release recipe.
 MAKE_ENV+=	CGO_ENABLED=0
 
-INSTALLATION_DIRS+=	${EGDIR} share/doc/rcvd/examples ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	share/examples/rcvd ${PKGMANDIR}/man1
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/mode1-forwarder-3providers.toml \
-	${DESTDIR}${EGDIR}/rcvd.toml
-.for f in flagship-dualmode mode1-forwarder-3providers mode2-doh-service
-	${INSTALL_DATA} ${WRKSRC}/etc/${f}.toml \
-	${DESTDIR}${PREFIX}/share/doc/rcvd/examples/${f}.toml
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/man/rcvd.1 \
-	${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcvd.1
+	${INSTALL_DATA} ${WRKSRC}/etc/mode1-forwarder-3providers.toml ${DESTDIR}${PREFIX}/share/examples/rcvd/
+	${INSTALL_DATA} ${WRKSRC}/etc/flagship-dualmode.toml ${DESTDIR}${PREFIX}/share/examples/rcvd/
+	${INSTALL_DATA} ${WRKSRC}/etc/mode2-doh-service.toml ${DESTDIR}${PREFIX}/share/examples/rcvd/
+	${INSTALL_MAN} ${WRKSRC}/man/rcvd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcvd.1
 
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/rcvd/Makefile-orig b/rcvd/Makefile-orig
new file mode 100644
index 0000000000..5d25a3ebf2
--- /dev/null
+++ b/rcvd/Makefile-orig
@@ -0,0 +1,71 @@
+# $NetBSD$
+
+DISTNAME=	rcvd-0.2.0
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rcvd-dns/}
+GITHUB_PROJECT=	rcvd
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
+MAINTAINER=	office%cpm.is@localhost
+HOMEPAGE=	https://rcvd.net/
+COMMENT=	Privacy-first encrypted DNS engine (DoQ/DoT/DoH, no cleartext)
+LICENSE=	mit
+
+# rcvd's go.mod requires Go 1.27.
+GO_VERSION_REQD=	127
+
+.include "go-modules.mk"
+
+# rcvd runs unprivileged and needs a dedicated user/group.
+PKG_GROUPS=	rcvd
+PKG_USERS=	rcvd:rcvd
+PKG_GECOS.rcvd=	rcvd DNS daemon
+PKG_HOME.rcvd=	/nonexistent
+PKG_SHELL.rcvd=	${NOLOGIN}
+
+RCD_SCRIPTS=	rcvd
+
+BUILD_DEFS+=	VARBASE
+
+# Config and log directories, owned by the rcvd user.
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/rcvd rcvd rcvd 0755
+OWN_DIRS_PERMS+=	${VARBASE}/log/rcvd rcvd rcvd 0755
+
+# The example forwarder profile becomes the default config on first install.
+EGDIR=		${PREFIX}/share/examples/rcvd
+CONF_FILES=	${EGDIR}/rcvd.toml ${PKG_SYSCONFDIR}/rcvd/rcvd.toml
+
+# Stamp version, date, and source into the binary (parity with the release
+# recipe). buildDate is derived from SOURCE_DATE_EPOCH so the build stays
+# reproducible: pkgsrc sets it (to a fixed value) under PKGSRC_MKREPRO=yes;
+# otherwise it is unset and buildDate keeps the source default ("unknown"),
+# never a varying wall-clock time. The release tarball carries no .git, so
+# the commit is "unknown" too, by design.
+
+GO_LDFLAGS=		-s -w \
+			-X main.version=${PKGVERSION_NOREV} \
+			-X main.buildSource=pkgsrc
+.if !empty(SOURCE_DATE_EPOCH)
+BUILD_DATE_cmd=		date -u -d "@${SOURCE_DATE_EPOCH}" +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || \  date -u -r "${SOURCE_DATE_EPOCH}" +%Y-%m-%dT%H:%M:%SZ
+GO_LDFLAGS+=		-X main.buildDate=${BUILD_DATE_cmd:sh}
+.endif
+GOFLAGS+=		-ldflags=${GO_LDFLAGS:Q}
+GO_BUILD_PATTERN=	./cmd/rcvd
+
+# rcvd is a pure-Go static binary (no cgo), matching the upstream release recipe.
+MAKE_ENV+=	CGO_ENABLED=0
+
+INSTALLATION_DIRS+=	${EGDIR} share/doc/rcvd/examples ${PKGMANDIR}/man1
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/etc/mode1-forwarder-3providers.toml \
+	${DESTDIR}${EGDIR}/rcvd.toml
+.for f in flagship-dualmode mode1-forwarder-3providers mode2-doh-service
+	${INSTALL_DATA} ${WRKSRC}/etc/${f}.toml \
+	${DESTDIR}${PREFIX}/share/doc/rcvd/examples/${f}.toml
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/rcvd.1 \
+	${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcvd.1
+
+.include "../../lang/go/go-module.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/rcvd/PLIST b/rcvd/PLIST
index 14c4211169..c324731a0a 100644
--- a/rcvd/PLIST
+++ b/rcvd/PLIST
@@ -1,8 +1,6 @@
 @comment $NetBSD$
 bin/rcvd
 man/man1/rcvd.1
-share/doc/rcvd/examples/flagship-dualmode.toml
-share/doc/rcvd/examples/mode1-forwarder-3providers.toml
-share/doc/rcvd/examples/mode2-doh-service.toml
-share/examples/rc.d/rcvd
-share/examples/rcvd/rcvd.toml
+share/examples/rcvd/flagship-dualmode.toml
+share/examples/rcvd/mode1-forwarder-3providers.toml
+share/examples/rcvd/mode2-doh-service.toml
Prev by Date: Update misc/Codewhale to v.0.10.0
Next by Date: p5-Imager: update to 1.037.
Previous by Thread: Update misc/Codewhale to v.0.10.0
Next by Thread: p5-Imager: update to 1.037.
Indexes:
Home | Main Index | Thread Index | Old Index