2 files changed, 24 insertions, 1 deletions
diff --git a/text_cmds/sort/Makefile b/text_cmds/sort/Makefile
new file mode 100644
index 0000000..e0e1dac
--- /dev/null
+++ b/text_cmds/sort/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PROG=	sort
+
+SRCS=	bwstring.c coll.c commoncrypto.c file.c \
+	mem.c radixsort.c sort.c vsort.c
+
+sort.1: sort.1.in
+	sed ${MAN_SUB} ${.ALLSRC} >${.TARGET}
+
+CLEANFILES+= sort.1
+
+# Enabled here cause not enabling it is a bad default
+CFLAGS+= -DSORT_THREADS
+MAN_SUB+= -e 's|%%THREADS%%||g'
+
+CFLAGS+= -DWITHOUT_NLS
+MAN_SUB+= -e 's|%%NLS%%|\.\\"|g'
+
+# Current text_cmds version
+CFLAGS+=-DSORT_VERSION=\"106\"
+
+.include <bsd.prog.mk>
diff --git a/text_cmds/sort/coll.h b/text_cmds/sort/coll.h
index 6e3f9b4..d74460e 100644
--- a/text_cmds/sort/coll.h
+++ b/text_cmds/sort/coll.h
@@ -91,7 +91,7 @@ struct key_value
 {
 	struct bwstring		*k; /* key string */
 	struct key_hint		 hint[0]; /* key sort hint */
-} __packed;
+};
 
 /*
  * Set of keys container object.