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
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to