From 4ff559f59416a6802d1ba1dae384cbbeaf029bc6 Mon Sep 17 00:00:00 2001
From: marius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 5 Aug 2017 14:49:40 +0000
Subject: [PATCH] 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.

git-svn-id: svn://svn.freebsd.org/base/stable/10@322098 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/tzsetup/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index d28c0af06..ae5a27d83 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -12,8 +12,6 @@ WARNS?=	3
 CFLAGS+=	-I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG
 DPADD=	${LIBDIALOG} ${LIBM}
 LDADD=	-ldialog -lm
-.endif
-
 .if ${MK_NCURSESW} == "no"
 DPADD+=	${LIBNCURSES}
 LDADD+=	-lncurses
@@ -21,5 +19,6 @@ LDADD+=	-lncurses
 DPADD+=	${LIBNCURSESW}
 LDADD+= -lncursesw
 .endif
+.endif
 
 .include <bsd.prog.mk>
-- 
2.42.0