diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2012-05-11 12:47:21 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2012-05-11 12:47:21 +0000 |
| commit | 85d7de106cd1eb8f6c4d97fc4542bf6df17ff6c3 (patch) | |
| tree | 051de9c11eb2cfc3d761225e1c0ac15748116135 | |
| parent | c66bbc91434501b889413241e8f1bd1487a92c5b (diff) | |
Notes
| -rw-r--r-- | gnu/usr.bin/sort/Makefile | 11 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/options/WITH_BSD_SORT | 2 | ||||
| -rw-r--r-- | usr.bin/Makefile | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/gnu/usr.bin/sort/Makefile b/gnu/usr.bin/sort/Makefile index e3a005dfbbca..a116a637dec8 100644 --- a/gnu/usr.bin/sort/Makefile +++ b/gnu/usr.bin/sort/Makefile @@ -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 \ diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6b5180a4b31d..9802e79eebf1 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -413,6 +413,7 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ + BSD_SORT \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ diff --git a/tools/build/options/WITH_BSD_SORT b/tools/build/options/WITH_BSD_SORT new file mode 100644 index 000000000000..a9e654d2209f --- /dev/null +++ b/tools/build/options/WITH_BSD_SORT @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Install BSD-licensed sort as 'sort' instead of GNU sort. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index ce8e48c19927..bcdfbcda485b 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -141,6 +141,7 @@ SUBDIR= alias \ shar \ showmount \ sockstat \ + sort \ split \ stat \ stdbuf \ |