From cf57243a460620a51aef50fbe0110f137d34dc2d Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 5 Apr 2014 18:01:49 +0000
Subject: [PATCH] Convert sort to using newer MK_ convention.

---
 share/mk/bsd.own.mk   | 1 +
 usr.bin/sort/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index c682b6f227e9..cd81d57686ab 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -361,6 +361,7 @@ __DEFAULT_NO_OPTIONS = \
     OFED \
     OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN \
+    SORT_THREADS \
     SVN \
     TESTS \
     USB_GADGET_EXAMPLES
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index ea68c4503e63..3b257c2236a7 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -11,7 +11,7 @@ sort.1: sort.1.in
 
 CLEANFILES+= sort.1
 
-.if defined(WITH_THREADS)
+.if ${MK_SORT_THREADS} != "no"
 CFLAGS+= -DSORT_THREADS
 LDFLAGS+= -lpthread -lmd
 MAN_SUB+= -e 's|%%THREADS%%||g'
@@ -20,7 +20,7 @@ LDFLAGS+= -lmd
 MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${MK_NLS} != "no"
 NLS+=	hu_HU.ISO8859-2
 NLSSRCFILES= ${NLS:S@$@.msg@}
 MAN_SUB+= -e 's|%%NLS%%||g'