CVS commit: pkgsrc/net/samba4

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Apr  6 16:15:43 UTC 2025

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST

Log Message:
samba4: fix build failure on NetBSD/i386 (and other non-LP64 environments).

Ok'ed by wiz@ and closes PR pkg/58947.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/net/samba4/PLIST

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

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.196 pkgsrc/net/samba4/Makefile:1.197
--- pkgsrc/net/samba4/Makefile:1.196    Tue Jan  7 11:33:06 2025
+++ pkgsrc/net/samba4/Makefile  Sun Apr  6 16:15:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2025/01/07 11:33:06 adam Exp $
+# $NetBSD: Makefile,v 1.197 2025/04/06 16:15:43 tsutsui Exp $
 
 DISTNAME=      samba-4.21.3
 CATEGORIES=    net
@@ -123,6 +123,14 @@ PLIST_SUBST+=      SOEXT=dylib
 PLIST_SUBST+=  SOEXT=so
 .endif
 
+# mdb is built only on LP64 hosts (PR pkg/58947)
+PLIST_VARS+=   mdb
+.for platform in ${LP64PLATFORMS}
+.  if ${MACHINE_PLATFORM:M${platform}}
+PLIST.mdb=     yes
+.  endif
+.endfor
+
 .if !defined(PWD_MKDB)
 PWD_MKDB!=     ${TYPE} pwd_mkdb 2>&1 | \
                ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.59 pkgsrc/net/samba4/PLIST:1.60
--- pkgsrc/net/samba4/PLIST:1.59        Tue Nov 26 11:38:09 2024
+++ pkgsrc/net/samba4/PLIST     Sun Apr  6 16:15:43 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2024/11/26 11:38:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.60 2025/04/06 16:15:43 tsutsui Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -780,7 +780,7 @@ ${PLIST.ads}lib/samba/ldb/ldap.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/ldb.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/ldbsamba_extensions.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/linked_attributes.${SOEXT}
-${PLIST.ads}lib/samba/ldb/mdb.${SOEXT}
+${PLIST.ads}${PLIST.mdb}lib/samba/ldb/mdb.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/new_partition.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/objectclass.${SOEXT}
 ${PLIST.ads}lib/samba/ldb/objectclass_attrs.${SOEXT}
@@ -886,7 +886,7 @@ lib/samba/private/libkrb5-private-samba.
 lib/samba/private/libkrb5samba-private-samba.so
 lib/samba/private/libldb-cmdline-private-samba.so
 lib/samba/private/libldb-key-value-private-samba.so
-lib/samba/private/libldb-mdb-int-private-samba.so
+${PLIST.mdb}lib/samba/private/libldb-mdb-int-private-samba.so
 lib/samba/private/libldb-private-samba.so
 lib/samba/private/libldb-tdb-err-map-private-samba.so
 lib/samba/private/libldb-tdb-int-private-samba.so