From owner-svn-src-head@FreeBSD.ORG  Sat Oct 13 18:40:39 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 C76B0A83;
 Sat, 13 Oct 2012 18:40:39 +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 95C478FC0C;
 Sat, 13 Oct 2012 18:40:39 +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 q9DIedTd082240;
 Sat, 13 Oct 2012 18:40:39 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9DIedeg082236;
 Sat, 13 Oct 2012 18:40:39 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201210131840.q9DIedeg082236@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 13 Oct 2012 18:40:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241511 - in head: . contrib/gnu-sort gnu/usr.bin
 gnu/usr.bin/sort tools/build/options usr.bin/sort
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 13 Oct 2012 18:40:39 -0000

Author: gabor
Date: Sat Oct 13 18:40:39 2012
New Revision: 241511
URL: http://svn.freebsd.org/changeset/base/241511

Log:
  - Remove GNU sort and the WITH_GNU_SORT knob

Deleted:
  head/contrib/gnu-sort/
  head/gnu/usr.bin/sort/
  head/tools/build/options/WITH_GNU_SORT
Modified:
  head/UPDATING
  head/gnu/usr.bin/Makefile
  head/usr.bin/sort/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Oct 13 18:24:52 2012	(r241510)
+++ head/UPDATING	Sat Oct 13 18:40:39 2012	(r241511)
@@ -24,6 +24,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20121013:
+	The GNU sort(1) program has been removed since the BSD-licensed
+	sort(1) has been the default for quite some time and no serious
+	problems have been reported.  The corresponding WITH_GNU_SORT
+	knob has als gone.
+
 20121006:
 	The pfil(9) API/ABI for AF_INET family has been changed. Packet
 	filtering modules: pf(4), ipfw(4), ipfilter(4) need to be recompiled

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sat Oct 13 18:24:52 2012	(r241510)
+++ head/gnu/usr.bin/Makefile	Sat Oct 13 18:40:39 2012	(r241511)
@@ -17,7 +17,6 @@ SUBDIR= ${_binutils} \
 	${_rcs} \
 	sdiff \
 	send-pr \
-	sort \
 	${_texinfo}
 
 .if ${MK_CXX} != "no"

Modified: head/usr.bin/sort/Makefile
==============================================================================
--- head/usr.bin/sort/Makefile	Sat Oct 13 18:24:52 2012	(r241510)
+++ head/usr.bin/sort/Makefile	Sat Oct 13 18:40:39 2012	(r241511)
@@ -2,15 +2,7 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_GNU_SORT} != "yes"
 PROG=	sort
-.else
-PROG=	bsdsort
-CLEANFILES+= bsdsort.1
-
-bsdsort.1: sort.1
-	cp ${.ALLSRC} ${.TARGET}
-.endif
 
 SRCS=	bwstring.c coll.c file.c mem.c radixsort.c sort.c vsort.c