diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-11-19 01:07:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-11-19 01:07:58 +0000 |
| commit | 9268022b74279434ed6300244e3f977e56a8ceb5 (patch) | |
| tree | 377ac0ac449528621eb192cd245adadb5fd53668 /usr.bin/sort | |
| parent | 29c34e9d2781cf25403647fb5af7d7ddb23be7e1 (diff) | |
| parent | 8c3d6a4ab2a4a95d864d9a32d0157d7de90498a4 (diff) | |
Notes
Diffstat (limited to 'usr.bin/sort')
| -rw-r--r-- | usr.bin/sort/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/sort/sort.1.in | 2 | ||||
| -rw-r--r-- | usr.bin/sort/sort.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile index c6eef8561010..532e9307caab 100644 --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -13,10 +13,12 @@ CLEANFILES+= sort.1 .if ${MK_SORT_THREADS} != "no" CFLAGS+= -DSORT_THREADS -LDFLAGS+= -lpthread -lmd +LDADD= -lpthread -lmd +DPADD= ${LIBPTHREAD} ${LIBMD} MAN_SUB+= -e 's|%%THREADS%%||g' .else -LDFLAGS+= -lmd +LDADD= -lmd +DPADD= ${LIBMD} MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g' .endif diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in index 11330fb414ec..1a836a893553 100644 --- a/usr.bin/sort/sort.1.in +++ b/usr.bin/sort/sort.1.in @@ -581,7 +581,7 @@ An error occurred. .Sh SEE ALSO .Xr comm 1 , .Xr join 1 , -.Xr uniq 1 . +.Xr uniq 1 .Sh STANDARDS The .Nm diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index d811a868bc6c..372c661d40ee 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -897,7 +897,7 @@ fix_obsolete_keys(int *argc, char **argv) } } } - sprintf(sopt, "-k%d.%d", f1, c1); + sprintf(sopt, "-k%d.%d%s", f1, c1, sopts1); argv[i] = sort_strdup(sopt); } } |