From owner-svn-src-all@FreeBSD.ORG Wed Jun 27 05:59:02 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12A991065675; Wed, 27 Jun 2012 05:59:02 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D79F78FC27; Wed, 27 Jun 2012 05:59:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5R5x11m085274; Wed, 27 Jun 2012 05:59:01 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5R5x1sH085269; Wed, 27 Jun 2012 05:59:01 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201206270559.q5R5x1sH085269@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 27 Jun 2012 05:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237629 - in head: gnu/usr.bin/sort share/mk tools/build/options usr.bin/sort X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2012 05:59:02 -0000 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 . - 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 -.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 -.if ${MK_BSD_SORT} == "yes" +.if ${MK_GNU_SORT} != "yes" PROG= sort .else PROG= bsdsort