CVS commit: pkgsrc/net/samba4

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar  8 12:39:27 UTC 2020

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST options.mk

Log Message:
samba4: make avahi optional

Avahi by default pulls in X11 via gtk2 and dbus, so you might want to
disable it on a small server if your clients don't need ZeroConf capability.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/samba4/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/samba4/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/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.90 pkgsrc/net/samba4/Makefile:1.91
--- pkgsrc/net/samba4/Makefile:1.90     Wed Jan 29 12:44:14 2020
+++ pkgsrc/net/samba4/Makefile  Sun Mar  8 12:39:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2020/01/29 12:44:14 adam Exp $
+# $NetBSD: Makefile,v 1.91 2020/03/08 12:39:27 tnn Exp $
 
 DISTNAME=      samba-4.11.6
 CATEGORIES=    net
@@ -218,7 +218,6 @@ BUILDLINK_API_DEPENDS.talloc+=      talloc>=2
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../net/avahi/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.26 pkgsrc/net/samba4/PLIST:1.27
--- pkgsrc/net/samba4/PLIST:1.26        Wed Jan 29 12:44:14 2020
+++ pkgsrc/net/samba4/PLIST     Sun Mar  8 12:39:27 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2020/01/29 12:44:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2020/03/08 12:39:27 tnn Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -760,7 +760,7 @@ lib/samba/vfs/recycle.${SOEXT}
 lib/samba/vfs/shadow_copy.${SOEXT}
 lib/samba/vfs/shadow_copy2.${SOEXT}
 lib/samba/vfs/shell_snap.${SOEXT}
-lib/samba/vfs/snapper.${SOEXT}
+${PLIST.dbus}lib/samba/vfs/snapper.${SOEXT}
 lib/samba/vfs/streams_depot.${SOEXT}
 lib/samba/vfs/streams_xattr.${SOEXT}
 lib/samba/vfs/syncops.${SOEXT}
@@ -858,7 +858,7 @@ man/man8/vfs_recycle.8
 man/man8/vfs_shadow_copy.8
 man/man8/vfs_shadow_copy2.8
 man/man8/vfs_shell_snap.8
-man/man8/vfs_snapper.8
+${PLIST.dbus}man/man8/vfs_snapper.8
 man/man8/vfs_streams_depot.8
 man/man8/vfs_streams_xattr.8
 man/man8/vfs_syncops.8

Index: pkgsrc/net/samba4/options.mk
diff -u pkgsrc/net/samba4/options.mk:1.8 pkgsrc/net/samba4/options.mk:1.9
--- pkgsrc/net/samba4/options.mk:1.8    Sat Jun 22 16:11:49 2019
+++ pkgsrc/net/samba4/options.mk        Sun Mar  8 12:39:27 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2019/06/22 16:11:49 jmcneill Exp $
+# $NetBSD: options.mk,v 1.9 2020/03/08 12:39:27 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.samba4
-PKG_SUPPORTED_OPTIONS= ads fam ldap pam winbind # cups # cups option is broken for me.
-PKG_SUGGESTED_OPTIONS= ads ldap pam winbind
+PKG_SUPPORTED_OPTIONS= ads avahi fam ldap pam winbind # cups # cups option is broken for me.
+PKG_SUGGESTED_OPTIONS= ads avahi ldap pam winbind
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS+=       ads
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           ads cups fam ldap pam winbind
+PLIST_VARS+=           ads cups dbus fam ldap pam winbind
 
 ###
 ### Access Control List support.
@@ -98,3 +98,15 @@ WINBINDD_RCD_SCRIPT= winbindd
 .else
 CONFIGURE_ARGS+=       --without-winbind
 .endif
+
+###
+### Avahi DNS Service Discovery.
+###
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+# avahi also pulls in dbus, which affects whether the snapper module gets built
+PLIST.dbus=            yes
+CONFIGURE_ARGS+=       --enable-avahi
+.else
+CONFIGURE_ARGS+=       --disable-avahi
+.endif