- 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

@@ -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

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 \

tools/build/options/WITH_BSD_SORT

@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install BSD-licensed sort as 'sort' instead of GNU sort.

tools/build/options/WITH_GNU_SORT

@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Install GNU-licensed sort as 'sort' instead of BSD sort.

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