MFC r207842, r207844, r208099:

MFC r207842:
Import of liblzma, xz, xzdec, lzmainfo from vendor branch
Add support for xz and lzma to lesspipe.sh (xzless, lzless)

MFC r207844:
Add two public headers missing in r207842
Adjust CFLAGS for lzmainfo, xz, xzdec

MFC r208099:
Add versioned symbols to liblzma
Use default SHLIB_MAJOR.

Approved by:	delphij (mentor)

6 files changed, 112 insertions, 1 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 6497743..f143a48 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -114,6 +114,7 @@ SUBDIR=	alias \
 	look \
 	lorder \
 	lsvfs \
+	lzmainfo \
 	m4 \
 	${_mail} \
 	${_make} \
@@ -228,6 +229,8 @@ SUBDIR=	alias \
 	xinstall \
 	${_xlint} \
 	${_xstr} \
+	xz \
+	xzdec \
 	${_yacc} \
 	yes \
 	${_ypcat} \
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index 451202a..3bfadfa 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -11,7 +11,9 @@ SCRIPTSNAME_lesspipe.sh=lesspipe.sh
 DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap
 LINKS=	${BINDIR}/less ${BINDIR}/more \
-	${BINDIR}/zless ${BINDIR}/bzless
+	${BINDIR}/zless ${BINDIR}/bzless \
+	${BINDIR}/zless ${BINDIR}/xzless \
+	${BINDIR}/zless ${BINDIR}/lzless
 MLINKS=	less.1 more.1
 CLEANFILES= less.1
 
diff --git a/usr.bin/less/lesspipe.sh b/usr.bin/less/lesspipe.sh
index f8202ff..acae7da 100644
--- a/usr.bin/less/lesspipe.sh
+++ b/usr.bin/less/lesspipe.sh
@@ -13,4 +13,10 @@ case "$1" in
 	*.bz2)
 		exec bzip2 -d -c "$1"	2>/dev/null
 		;;
+	*.xz)
+		exec xz -d -c "$1"	2>/dev/null
+		;;
+	*.lzma)
+		exec lzma -d -c "$1"	2>/dev/null
+		;;
 esac
diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile
new file mode 100644
index 0000000..2b8396b
--- /dev/null
+++ b/usr.bin/lzmainfo/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PROG=	lzmainfo
+
+XZDIR=	${.CURDIR}/../../contrib/xz/src
+LZMALIBDIR=	${.CURDIR}/../../lib/liblzma
+
+.PATH: ${XZDIR}/lzmainfo
+SRCS+=	lzmainfo.c
+
+.PATH: ${XZDIR}/common
+SRCS+=	tuklib_progname.c \
+	tuklib_exit.c
+
+WARNS?=	3
+
+CFLAGS+=	-DHAVE_CONFIG_H \
+		-I${LZMALIBDIR} \
+		-I${XZDIR}/common
+
+DPADD=	${LIBLZMA}
+LDADD=	-llzma
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
new file mode 100644
index 0000000..707ad09
--- /dev/null
+++ b/usr.bin/xz/Makefile
@@ -0,0 +1,46 @@
+# $FreeBSD$
+
+PROG=	xz
+
+LINKS=	${BINDIR}/xz ${BINDIR}/unxz
+LINKS+=	${BINDIR}/xz ${BINDIR}/lzma
+LINKS+=	${BINDIR}/xz ${BINDIR}/unlzma
+LINKS+=	${BINDIR}/xz ${BINDIR}/xzcat
+LINKS+=	${BINDIR}/xz ${BINDIR}/lzcat
+
+MLINKS= xz.1 unxz.1 xz.1 lzma.1 xz.1 unlzma.1 xz.1 xzcat.1 xz.1 lzcat.1
+
+XZDIR=	${.CURDIR}/../../contrib/xz/src
+LZMALIBDIR=	${.CURDIR}/../../lib/liblzma
+
+.PATH: ${XZDIR}/xz
+
+SRCS=	args.c \
+	coder.c \
+	file_io.c \
+	hardware.c \
+	list.c \
+	main.c \
+	message.c \
+	options.c \
+	signals.c \
+	suffix.c \
+	util.c
+
+.PATH: ${XZDIR}/common
+
+SRCS+=	tuklib_open_stdxxx.c \
+	tuklib_progname.c \
+	tuklib_exit.c \
+	tuklib_cpucores.c
+
+WARNS?=	3
+
+CFLAGS+=	-DHAVE_CONFIG_H \
+		-I${LZMALIBDIR} \
+		-I${XZDIR}/common
+
+DPADD=	${LIBLZMA}
+LDADD=	-llzma
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile
new file mode 100644
index 0000000..6f38a65
--- /dev/null
+++ b/usr.bin/xzdec/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PROG=	xzdec
+
+LINKS=	${BINDIR}/xzdec ${BINDIR}/lzdec
+
+MLINKS= xzdec.1 lzmadec.1
+
+XZDIR=	${.CURDIR}/../../contrib/xz/src
+LZMALIBDIR=	${.CURDIR}/../../lib/liblzma
+
+.PATH: ${XZDIR}/xzdec
+
+SRCS=	xzdec.c
+
+.PATH: ${XZDIR}/common
+
+SRCS+=	tuklib_progname.c \
+	tuklib_exit.c
+
+WARNS?=	3
+
+CFLAGS+=	-DHAVE_CONFIG_H \
+		-I${LZMALIBDIR} \
+		-I${XZDIR}/common
+
+DPADD=	${LIBLZMA}
+LDADD=	-llzma
+
+.include <bsd.prog.mk>