From c7fbb6736286e1c4a125bed52f0daa2b669bf538 Mon Sep 17 00:00:00 2001
From: gabor <gabor@FreeBSD.org>
Date: Wed, 27 Jun 2012 05:59:01 +0000
Subject: [PATCH] - Switch to BSD sort as default sort.  GNU sort will still be
 installed as   "gnusort".  Most of the BSD sort development work was done by 
  Oleg Moskalenko <oleg.moskalenko@citrix.com>. - GNU grep can be set to
 default by setting WITH_GNU_GREP.  It will cause   BSD sort to be installed
 as "bsdsort".

Portbuild tested by:    linimon
---
 gnu/usr.bin/sort/Makefile         | 2 +-
 share/mk/bsd.own.mk               | 2 +-
 tools/build/options/WITH_BSD_SORT | 2 --
 tools/build/options/WITH_GNU_SORT | 2 ++
 usr.bin/sort/Makefile             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 tools/build/options/WITH_BSD_SORT
 create mode 100644 tools/build/options/WITH_GNU_SORT

diff --git a/gnu/usr.bin/sort/Makefile b/gnu/usr.bin/sort/Makefile
index a116a637dec8..bf193bc2b7c6 100644
--- a/gnu/usr.bin/sort/Makefile
+++ b/gnu/usr.bin/sort/Makefile
@@ -5,7 +5,7 @@ SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort
 
 .include <bsd.own.mk>
 
-.if ${MK_BSD_SORT} != "yes"
+.if ${MK_GNU_SORT} == "yes"
 PROG=	sort
 .else
 PROG=	gnusort
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 7d31a395b2b6..aadd492a2405 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -415,7 +415,6 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
     BSD_GREP \
-    BSD_SORT \
     BIND_IDN \
     BIND_LARGE_FILE \
     BIND_LIBS \
@@ -424,6 +423,7 @@ __DEFAULT_NO_OPTIONS = \
     CLANG_EXTRAS \
     CLANG_IS_CC \
     CTF \
+    GNU_SORT \
     HESIOD \
     ICONV \
     IDEA \
diff --git a/tools/build/options/WITH_BSD_SORT b/tools/build/options/WITH_BSD_SORT
deleted file mode 100644
index a9e654d2209f..000000000000
--- a/tools/build/options/WITH_BSD_SORT
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install BSD-licensed sort as 'sort' instead of GNU sort.
diff --git a/tools/build/options/WITH_GNU_SORT b/tools/build/options/WITH_GNU_SORT
new file mode 100644
index 000000000000..6bd32c92f422
--- /dev/null
+++ b/tools/build/options/WITH_GNU_SORT
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Install GNU-licensed sort as 'sort' instead of BSD sort.
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index 14e69e536bef..c17f9e303314 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_BSD_SORT} == "yes"
+.if ${MK_GNU_SORT} != "yes"
 PROG=	sort
 .else
 PROG=	bsdsort