From owner-svn-src-head@FreeBSD.ORG  Fri May 11 12:47:22 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 40CD41065670;
	Fri, 11 May 2012 12:47:22 +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 1026A8FC08;
	Fri, 11 May 2012 12:47:22 +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 q4BClLjV083945;
	Fri, 11 May 2012 12:47:21 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4BClLnB083940;
	Fri, 11 May 2012 12:47:21 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201205111247.q4BClLnB083940@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 11 May 2012 12:47:21 +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: r235268 - in head: gnu/usr.bin/sort share/mk
	tools/build/options usr.bin
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2012 12:47:22 -0000

Author: gabor
Date: Fri May 11 12:47:21 2012
New Revision: 235268
URL: http://svn.freebsd.org/changeset/base/235268

Log:
  - Hook up BSD sort to the build.  By default, it will be installed as
    "bsdsort" and GNU sort will be the default "sort".  When WITH_BSD_SORT
    is set, BSD sort will be the default "sort" and GNU sort will be installed
    as "gnusort".

Added:
  head/tools/build/options/WITH_BSD_SORT   (contents, props changed)
Modified:
  head/gnu/usr.bin/sort/Makefile
  head/share/mk/bsd.own.mk
  head/usr.bin/Makefile

Modified: head/gnu/usr.bin/sort/Makefile
==============================================================================
--- head/gnu/usr.bin/sort/Makefile	Fri May 11 12:37:16 2012	(r235267)
+++ head/gnu/usr.bin/sort/Makefile	Fri May 11 12:47:21 2012	(r235268)
@@ -3,7 +3,18 @@
 SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort
 .PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man
 
+.include <bsd.own.mk>
+
+.if ${MK_BSD_SORT} != "yes"
 PROG=	sort
+.else
+PROG=	gnusort
+
+CLEANFILES+= gnusort.1
+gnusort.1: sort.1
+	cp ${.ALLSRC} ${.TARGET}
+.endif
+
 SRCS=   sort.c \
 	__fpending.c \
 	argmatch.c \

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Fri May 11 12:37:16 2012	(r235267)
+++ head/share/mk/bsd.own.mk	Fri May 11 12:47:21 2012	(r235268)
@@ -413,6 +413,7 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
     BSD_GREP \
+    BSD_SORT \
     BIND_IDN \
     BIND_LARGE_FILE \
     BIND_LIBS \

Added: head/tools/build/options/WITH_BSD_SORT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_BSD_SORT	Fri May 11 12:47:21 2012	(r235268)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Install BSD-licensed sort as 'sort' instead of GNU sort.

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Fri May 11 12:37:16 2012	(r235267)
+++ head/usr.bin/Makefile	Fri May 11 12:47:21 2012	(r235268)
@@ -141,6 +141,7 @@ SUBDIR=	alias \
 	shar \
 	showmount \
 	sockstat \
+	sort \
 	split \
 	stat \
 	stdbuf \