Merge from head@274682

3 files changed, 6 insertions, 4 deletions

diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index c6eef85610101..532e9307caab6 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 11330fb414ec7..1a836a8935535 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 d811a868bc6cc..372c661d40ee4 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);
 			}
 		}