[pkgsrc/trunk]: pkgsrc/net/samba net/samba: remove unknown configure option

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d971372edebb
branches:  trunk
changeset: 432589:d971372edebb
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat May 23 10:48:30 2020 +0000

description:
net/samba: remove unknown configure option

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

diffstat:

 net/samba/Makefile |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (20 lines):

diff -r e81624e2e56c -r d971372edebb net/samba/Makefile
--- a/net/samba/Makefile        Sat May 23 10:46:24 2020 +0000
+++ b/net/samba/Makefile        Sat May 23 10:48:30 2020 +0000
@@ -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+=               --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"