From owner-svn-src-stable-10@freebsd.org  Sat Aug  5 14:49:42 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 086E1DAB76F;
 Sat,  5 Aug 2017 14:49:42 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C12D27793D;
 Sat,  5 Aug 2017 14:49:41 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v75Enewk068903;
 Sat, 5 Aug 2017 14:49:40 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v75EneLs068902;
 Sat, 5 Aug 2017 14:49:40 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201708051449.v75EneLs068902@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 5 Aug 2017 14:49:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r322098 - stable/10/usr.sbin/tzsetup
X-SVN-Group: stable-10
X-SVN-Commit-Author: marius
X-SVN-Commit-Paths: stable/10/usr.sbin/tzsetup
X-SVN-Commit-Revision: 322098
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Aug 2017 14:49:42 -0000

Author: marius
Date: Sat Aug  5 14:49:40 2017
New Revision: 322098
URL: https://svnweb.freebsd.org/changeset/base/322098

Log:
  Fix a stable/10-specific mismerge in r322096; the MK_NCURSESW handling
  should be within the MK_DIALOG block as libncurses{,w} isn't required
  when building tzsetup(8) without dialog(3) support.

Modified:
  stable/10/usr.sbin/tzsetup/Makefile

Modified: stable/10/usr.sbin/tzsetup/Makefile
==============================================================================
--- stable/10/usr.sbin/tzsetup/Makefile	Sat Aug  5 12:59:03 2017	(r322097)
+++ stable/10/usr.sbin/tzsetup/Makefile	Sat Aug  5 14:49:40 2017	(r322098)
@@ -12,14 +12,13 @@ WARNS?=	3
 CFLAGS+=	-I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG
 DPADD=	${LIBDIALOG} ${LIBM}
 LDADD=	-ldialog -lm
-.endif
-
 .if ${MK_NCURSESW} == "no"
 DPADD+=	${LIBNCURSES}
 LDADD+=	-lncurses
 .else
 DPADD+=	${LIBNCURSESW}
 LDADD+= -lncursesw
+.endif
 .endif
 
 .include <bsd.prog.mk>