CVS commit: pkgsrc/net/netatalk4

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Dec 18 13:28:05 UTC 2024

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

Log Message:
Don't bother installing rc.d scripts on !NetBSD, they will have a
different name anyway

Don't try to initialize init scripts at build time

Install enclosed at.h for Linux, we do it on NetBSD, too

Builds and packages on Linuxen now (Arch here)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.1 -r1.2 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.6 pkgsrc/net/netatalk4/Makefile:1.7
--- pkgsrc/net/netatalk4/Makefile:1.6   Wed Dec 18 10:58:03 2024
+++ pkgsrc/net/netatalk4/Makefile       Wed Dec 18 13:28:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/12/18 10:58:03 nros Exp $
+# $NetBSD: Makefile,v 1.7 2024/12/18 13:28:04 hauke Exp $
 
 GITHUB_PROJECT=        netatalk
 GITHUB_TAG=    refs/tags/${DISTNAME}
@@ -32,9 +32,11 @@ CONFLICTS+=          netatalk-[0-9]* netatalk-as
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
 RCD_SCRIPTS=           netatalk
 ATALK_RCD_SCRIPTS=     a2boot atalkd macipgw papd timelord
 RCD_SCRIPT_SRC.netatalk= ${WRKSRC}/output/distrib/initscripts/netatalk
+.endif
 
 SMF_SRCDIR=            ${WRKSRC}/distrib/initscripts
 SMF_METHODS=           netatalk_smf
@@ -55,6 +57,7 @@ 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
 # into scripts, so replace manually

Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.3 pkgsrc/net/netatalk4/distinfo:1.4
--- pkgsrc/net/netatalk4/distinfo:1.3   Mon Dec 16 15:40:54 2024
+++ pkgsrc/net/netatalk4/distinfo       Wed Dec 18 13:28:04 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/12/16 15:40:54 hauke Exp $
+$NetBSD: distinfo,v 1.4 2024/12/18 13:28:04 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) = 1a62c6009058e2e38fe9017afe30a8732c86d40d
+SHA1 (patch-meson.build) = 6b699a997a48e6515a5bb77776383b038219a60b

Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-meson.build:1.1 pkgsrc/net/netatalk4/patches/patch-meson.build:1.2
--- pkgsrc/net/netatalk4/patches/patch-meson.build:1.1  Thu Nov 21 15:26:08 2024
+++ pkgsrc/net/netatalk4/patches/patch-meson.build      Wed Dec 18 13:28:05 2024
@@ -1,12 +1,14 @@
-$NetBSD: patch-meson.build,v 1.1 2024/11/21 15:26:08 hauke Exp $
+$NetBSD: patch-meson.build,v 1.2 2024/12/18 13:28:05 hauke Exp $
 
 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.
 
---- meson.build.orig   2024-11-09 23:29:31.000000000 +0000
+Install at.h on Linux, we do it on NetBSD, too
+ 
+--- meson.build.orig   2024-11-15 06:52:12.000000000 +0000
 +++ meson.build
-@@ -1993,7 +1993,11 @@ int main(void) {
+@@ -2010,7 +2010,11 @@ int main(void) {
  }
  '''
  
@@ -19,3 +21,11 @@ library.
      if not have_tcpwrap
          have_tcpwrap = cc.links(tcpwrap_code, args: ['-lwrap', '-lnsl'])
      endif
+@@ -2077,7 +2081,6 @@ if host_os.contains('freebsd')
+     cdata.set('FREEBSD', 1)
+     cdata.set('OPEN_NOFOLLOW_ERRNO', 'EMLINK')
+ elif host_os.contains('linux')
+-    use_glibc_at_header = cc.has_header('netatalk/at.h')
+     cdata.set('_GNU_SOURCE', 1)
+     if cc.compiles(
+         '''