CVS commit: pkgsrc/net/netatalk4

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 25 10:28:05 UTC 2025

Modified Files:
        pkgsrc/net/netatalk4: Makefile options.mk

Log Message:
net/netatalk4: Specify path to service(8) tool on NetBSD.

This is a kind of silly hack -- the build does not actually run
service(8) at build-time, but it searches for a path, which must
exist at build-time, to a command by that name, if we don't specify a
path via meson binaries.  If it can't find the path and we don't
specify one, it disables the rc.d script generation.  We don't even
really have to put /usr/sbin/service here; we could put /quagga/eland
instead and I think it doesn't change anything in the build output.

Resolves the following symptom when /usr/sbin is not in PATH during
the build (or, in principle, when you're cross-building for NetBSD
from non-NetBSD):

===> Building for netatalk-4.0.6nb5
...
Writing index.html for book(netatalk-manual)
*** Please use pkgtools/verifypc to sanity check dependencies.
bmake[1]: don't know how to make /home/riastradh/pkgsrc/current/work/net/netatalk4/work/netatalk-netatalk-4-0-6/output/distrib/initscripts/netatalk. Stop

bmake[1]: stopped in /home/riastradh/pkgsrc/current/pkgsrc/net/netatalk4
*** Error code 2


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk4/options.mk

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

Modified files:

Index: pkgsrc/net/netatalk4/Makefile
diff -u pkgsrc/net/netatalk4/Makefile:1.9 pkgsrc/net/netatalk4/Makefile:1.10
--- pkgsrc/net/netatalk4/Makefile:1.9   Sat Jan 25 10:27:31 2025
+++ pkgsrc/net/netatalk4/Makefile       Sat Jan 25 10:28:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2025/01/25 10:27:31 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2025/01/25 10:28:05 riastradh Exp $
 
 GITHUB_PROJECT=        netatalk
 GITHUB_TAG=    refs/tags/${DISTNAME}
@@ -6,7 +6,7 @@ DISTNAME=       netatalk-4-0-6
 
 PKGVER=                ${GITHUB_TAG:C/^.+netatalk-//:C/-/./g}
 PKGNAME=       ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}
 

Index: pkgsrc/net/netatalk4/options.mk
diff -u pkgsrc/net/netatalk4/options.mk:1.2 pkgsrc/net/netatalk4/options.mk:1.3
--- pkgsrc/net/netatalk4/options.mk:1.2 Sun Jan 12 16:13:10 2025
+++ pkgsrc/net/netatalk4/options.mk     Sat Jan 25 10:28:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2025/01/12 16:13:10 hauke Exp $
+# $NetBSD: options.mk,v 1.3 2025/01/25 10:28:05 riastradh Exp $
 #
 PKG_OPTIONS_VAR=               PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=         debug dnssd kerberos ldap pam
@@ -26,6 +26,10 @@ MESON_ARGS+=         -Dwith-appletalk=true
 MESON_ARGS+=           -Dwith-spooldir=${VARBASE}/spool/netatalk
 CONF_FILES+=           ${EGDIR}/atalkd.conf    ${PKG_SYSCONFDIR}/atalkd.conf
 CONF_FILES+=           ${EGDIR}/papd.conf      ${PKG_SYSCONFDIR}/papd.conf
+.  if ${OPSYS} == "NetBSD"
+MESON_BINARIES+=       service
+MESON_BINARY.service=  /usr/sbin/service
+.  endif
 RCD_SCRIPTS+=          ${ATALK_RCD_SCRIPTS}
 .for rs in ${ATALK_RCD_SCRIPTS}
 RCD_SCRIPT_SRC.${rs}=  ${WRKSRC}/output/distrib/initscripts/${rs}