Author: gabor
Date: Wed Jun 27 05:59:01 2012
New Revision: 237629
URL: http://svn.freebsd.org/changeset/base/237629
Log:
- 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.moskale...@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
Added:
head/tools/build/options/WITH_GNU_SORT (contents, props changed)
Deleted:
head/tools/build/options/WITH_BSD_SORT
Modified:
head/gnu/usr.bin/sort/Makefile
head/share/mk/bsd.own.mk
head/usr.bin/sort/Makefile
Modified: head/gnu/usr.bin/sort/Makefile
==============================================================================
--- head/gnu/usr.bin/sort/Makefile Wed Jun 27 05:50:15 2012
(r237628)
+++ head/gnu/usr.bin/sort/Makefile Wed Jun 27 05:59:01 2012
(r237629)
@@ -5,7 +5,7 @@ SORTDIR= ${.CURDIR}/../../../contrib/gnu
.include <bsd.own.mk>
-.if ${MK_BSD_SORT} != "yes"
+.if ${MK_GNU_SORT} == "yes"
PROG= sort
.else
PROG= gnusort
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Wed Jun 27 05:50:15 2012 (r237628)
+++ head/share/mk/bsd.own.mk Wed Jun 27 05:59:01 2012 (r237629)
@@ -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 \
Added: head/tools/build/options/WITH_GNU_SORT
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_GNU_SORT Wed Jun 27 05:59:01 2012
(r237629)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Install GNU-licensed sort as 'sort' instead of BSD sort.
Modified: head/usr.bin/sort/Makefile
==============================================================================
--- head/usr.bin/sort/Makefile Wed Jun 27 05:50:15 2012 (r237628)
+++ head/usr.bin/sort/Makefile Wed Jun 27 05:59:01 2012 (r237629)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-.if ${MK_BSD_SORT} == "yes"
+.if ${MK_GNU_SORT} != "yes"
PROG= sort
.else
PROG= bsdsort
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
