CVS commit: pkgsrc/net/samba4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Oct 26 08:26:21 UTC 2024

Modified Files:
        pkgsrc/net/samba4: Makefile

Log Message:
samba4: this now conflicts with ldb


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 pkgsrc/net/samba4/Makefile

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.188 pkgsrc/net/samba4/Makefile:1.189
--- pkgsrc/net/samba4/Makefile:1.188    Thu Oct 24 17:23:43 2024
+++ pkgsrc/net/samba4/Makefile  Sat Oct 26 08:26:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.188 2024/10/24 17:23:43 adam Exp $
+# $NetBSD: Makefile,v 1.189 2024/10/26 08:26:21 wiz Exp $
 
 DISTNAME=      samba-4.21.1
 CATEGORIES=    net
@@ -9,7 +9,7 @@ HOMEPAGE=       https://www.samba.org/
 COMMENT=       SMB/CIFS protocol server suite
 LICENSE=       gnu-gpl-v3
 
-CONFLICTS+=    ja-samba-[0-9]* winbind-[0-9]*
+CONFLICTS+=    ja-samba-[0-9]* winbind-[0-9]* ldb-[0-9]*
 
 GCC_REQD+=     4.4
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt