CVS commit: pkgsrc/net/netatalk4

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sun Jan 12 16:13:11 UTC 2025

Modified Files:
        pkgsrc/net/netatalk4: Makefile distinfo options.mk
        pkgsrc/net/netatalk4/patches: patch-meson.build

Log Message:
Make PREFIX and VARBASE configurable in top-level meson.build

Set spooldir only when configured for pap print support

Should fix PR pkg/58987


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netatalk4/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk4/patches/patch-meson.build

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.7 pkgsrc/net/netatalk4/Makefile:1.8
--- pkgsrc/net/netatalk4/Makefile:1.7   Wed Dec 18 13:28:04 2024
+++ pkgsrc/net/netatalk4/Makefile       Sun Jan 12 16:13:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/12/18 13:28:04 hauke Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/12 16:13:10 hauke 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=   3
+PKGREVISION=   4
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}
 
@@ -56,7 +56,6 @@ MESON_ARGS+=          -Dwith-bdb-path=${BDBBASE}
 
 MESON_ARGS+=           -Dwith-tcp-wrappers=true
 MESON_ARGS+=           -Dwith-statedir-path=${VARBASE}/db
-MESON_ARGS+=           -Dwith-spooldir=${VARBASE}/spool/netatalk
 MESON_ARGS+=           -Dwith-init-hooks=false
 
 # Meson will look for perl(1), but then substitute the buildlink path
@@ -71,10 +70,15 @@ SUBST_SED.perlpath= -e 's|@PERL@|${PERL5
 
 # Keep Meson from installing rc.d files
 SUBST_CLASSES+=                init
-SUBST_STAGE.init+=     pre-configure
+SUBST_STAGE.init=      pre-configure
 SUBST_FILES.init+=     distrib/initscripts/meson.build
 SUBST_SED.init+=       -E -e 's|(install): true|\1: false|g'
 
+SUBST_CLASSES+=                varbase
+SUBST_STAGE.varbase=   pre-configure
+SUBST_FILES.varbase+=  meson.build
+SUBST_SED.varbase+=    -e 's,/var/,${VARBASE}/,g'
+
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/msg
 OWN_DIRS+=             ${VARBASE}/db/netatalk/CNID ${REAL_ROOT_USER} ${REAL_ROOT_GROUP}
 

Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.4 pkgsrc/net/netatalk4/distinfo:1.5
--- pkgsrc/net/netatalk4/distinfo:1.4   Wed Dec 18 13:28:04 2024
+++ pkgsrc/net/netatalk4/distinfo       Sun Jan 12 16:13:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/12/18 13:28:04 hauke Exp $
+$NetBSD: distinfo,v 1.5 2025/01/12 16:13:10 hauke Exp $
 
 BLAKE2s (netatalk-4-0-6.tar.gz) = 00beb8d601af7dba7f9e0c30f00c3f90fd3e786346b60997a7708674214a2df9
 SHA512 (netatalk-4-0-6.tar.gz) = d0a99bc8200d767dba8254cf21b9880267da4a18524dbbffec2049dca747f0fe3d7023d26098c5bdc1fca160d06cc019f23e9f34be9ca9f823b3071a6cc729c8
@@ -6,4 +6,4 @@ Size (netatalk-4-0-6.tar.gz) = 1326496 b
 SHA1 (patch-config_meson.build) = ec5be047b65e37afc4b78f36518623169eeb0e16
 SHA1 (patch-config_pam_meson.build) = f321c7bd246f1d82c287e745ea75c9561bc528a9
 SHA1 (patch-libatalk_bstring_bstrlib.c) = 8f38b0c0abea02074172b11f066f0628eb54c55c
-SHA1 (patch-meson.build) = 6b699a997a48e6515a5bb77776383b038219a60b
+SHA1 (patch-meson.build) = b3836f629d44b8b63a5bc6abd4c8f23c02ff5133

Index: pkgsrc/net/netatalk4/options.mk
diff -u pkgsrc/net/netatalk4/options.mk:1.1 pkgsrc/net/netatalk4/options.mk:1.2
--- pkgsrc/net/netatalk4/options.mk:1.1 Thu Nov 21 15:26:08 2024
+++ pkgsrc/net/netatalk4/options.mk     Sun Jan 12 16:13:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/11/21 15:26:08 hauke Exp $
+# $NetBSD: options.mk,v 1.2 2025/01/12 16:13:10 hauke Exp $
 #
 PKG_OPTIONS_VAR=               PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=         debug dnssd kerberos ldap pam
@@ -23,6 +23,7 @@ PLIST_VARS+=                  appletalk gssapi ldap pam
 .include "../../print/cups-base/buildlink3.mk"
 PLIST.appletalk=       yes
 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
 RCD_SCRIPTS+=          ${ATALK_RCD_SCRIPTS}

Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-meson.build:1.2 pkgsrc/net/netatalk4/patches/patch-meson.build:1.3
--- pkgsrc/net/netatalk4/patches/patch-meson.build:1.2  Wed Dec 18 13:28:05 2024
+++ pkgsrc/net/netatalk4/patches/patch-meson.build      Sun Jan 12 16:13:10 2025
@@ -1,13 +1,33 @@
-$NetBSD: patch-meson.build,v 1.2 2024/12/18 13:28:05 hauke Exp $
+$NetBSD: patch-meson.build,v 1.3 2025/01/12 16:13:10 hauke Exp $
+
+Make PREFIX path configurable.
 
 While NetBSD has libwrap, the meson code doesn't find it. The test
 cond still succeeds, so add a branch that does not require the
 library.
 
-Install at.h on Linux, we do it on NetBSD, too
- 
+Install at.h on Linux, we do it on NetBSD, too.
+
 --- meson.build.orig   2024-11-15 06:52:12.000000000 +0000
 +++ meson.build
+@@ -169,7 +169,7 @@ elif host_os == 'netbsd'
+         'include',
+         'sys',
+         'etc/afpd',
+-        '/usr/pkg/include',
++        get_option('prefix') / 'include',
+     )
+ elif host_os == 'omnios'
+     root_includes = include_directories(
+@@ -219,7 +219,7 @@ if host_os in ['dragonfly', 'freebsd', '
+ endif
+ 
+ if host_os == 'netbsd'
+-    libsearch_dirs += '/usr/pkg/lib'
++    libsearch_dirs += get_option('prefix') / 'lib'
+ endif
+ 
+ if uname.found() and uname_stdout.to_lower().contains('omnios')
 @@ -2010,7 +2010,11 @@ int main(void) {
  }
  '''