CVS commit: pkgsrc/net/samba

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat May 23 10:48:30 UTC 2020

Modified Files:
        pkgsrc/net/samba: Makefile

Log Message:
net/samba: remove unknown configure option

This is Samba 3, which does not know this option.


To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 pkgsrc/net/samba/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/samba/Makefile
diff -u pkgsrc/net/samba/Makefile:1.282 pkgsrc/net/samba/Makefile:1.283
--- pkgsrc/net/samba/Makefile:1.282     Fri May 22 10:56:31 2020
+++ pkgsrc/net/samba/Makefile   Sat May 23 10:48:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.282 2020/05/22 10:56:31 adam Exp $
+# $NetBSD: Makefile,v 1.283 2020/05/23 10:48:30 rillig Exp $
 
 DISTNAME=      samba-${VERSION}
 CATEGORIES=    net
@@ -68,10 +68,6 @@ CONFIGURE_ARGS+=             --localstatedir=${SAMB
 CONFIGURE_ARGS+=               --with-mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=               --with-swatdir=${PREFIX}/share/samba/swat
 CONFIGURE_ARGS+=               --enable-external-libtdb
-#
-# Explicitly disable samba4 merged-build option which is broken.
-#
-CONFIGURE_ARGS+=               --enable-merged-build=no
 
 .include "../../net/samba/options.mk"