From 897a072717635ed1cdd491bcd112147e58f4de0d Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Tue, 22 Dec 2015 08:03:23 +0000
Subject: MFC: xz 5.2.2.

Relnotes:	yes
---
 usr.bin/cpio/Makefile     | 4 ++--
 usr.bin/grep/Makefile     | 4 ++--
 usr.bin/gzip/Makefile     | 4 ++--
 usr.bin/lzmainfo/Makefile | 4 ++--
 usr.bin/mkulzma/Makefile  | 4 ++--
 usr.bin/tar/Makefile      | 4 ++--
 usr.bin/xz/Makefile       | 5 +++--
 usr.bin/xzdec/Makefile    | 4 ++--
 8 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index eeed435..2f2d65a 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -23,8 +23,8 @@ CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
 # statically linked, cannot use -lcrypto, and are size sensitive.
 CFLAGS+= -DSMALLER
 .endif
-DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
-LDADD=	-larchive -lz -lbz2 -llzma -lbsdxml
+DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}
+LDADD=	-larchive -lz -lbz2 -llzma -lpthread -lbsdxml
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+= -lcrypto
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index feb30db..ad90d2e 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -38,8 +38,8 @@ LDADD=	-lz
 DPADD=	${LIBZ}
 
 .if !defined(WITHOUT_LZMA_SUPPORT)
-LDADD+=	-llzma
-DPADD+=	${LIBLZMA}
+LDADD+=	-llzma -lpthread
+DPADD+=	${LIBLZMA} ${LIBPTHREAD}
 
 LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgrep \
 	${BINDIR}/${PROG} ${BINDIR}/xzegrep \
diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile
index 6d3aaa6..3bbbaa2 100644
--- a/usr.bin/gzip/Makefile
+++ b/usr.bin/gzip/Makefile
@@ -6,8 +6,8 @@
 PROG=		gzip
 MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
 
-DPADD=		${LIBZ} ${LIBLZMA}
-LDADD=		-lz -llzma
+DPADD=		${LIBZ} ${LIBLZMA} ${LIBPTHREAD}
+LDADD=		-lz -llzma -lpthread
 
 .if ${MK_BZIP2_SUPPORT} != "no"
 DPADD+=		${LIBBZ2}
diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile
index b92b46c..30242ea 100644
--- a/usr.bin/lzmainfo/Makefile
+++ b/usr.bin/lzmainfo/Makefile
@@ -16,7 +16,7 @@ CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-DPADD=	${LIBLZMA}
-LDADD=	-llzma
+DPADD=	${LIBLZMA} ${LIBPTHREAD}
+LDADD=	-llzma -lpthread
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkulzma/Makefile b/usr.bin/mkulzma/Makefile
index 8147ebf..4129dc1 100644
--- a/usr.bin/mkulzma/Makefile
+++ b/usr.bin/mkulzma/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mkulzma
 MAN=	mkulzma.8
-DPADD=	${LIBLZMA}
-LDADD=	-llzma
+DPADD=	${LIBLZMA} ${LIBPTHREAD}
+LDADD=	-llzma -lpthread
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 06d9629..0aaff2e 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -19,8 +19,8 @@ SRCS=	bsdtar.c	\
 SRCS+=	err.c		\
 	line_reader.c
 
-DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
-LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
+DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}
+LDADD=	-larchive -lbz2 -lz -llzma -lpthread -lbsdxml
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+= -lcrypto
diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
index 13703fd..6195552 100644
--- a/usr.bin/xz/Makefile
+++ b/usr.bin/xz/Makefile
@@ -22,6 +22,7 @@ SRCS=	args.c \
 	list.c \
 	main.c \
 	message.c \
+	mytime.c \
 	options.c \
 	signals.c \
 	suffix.c \
@@ -42,7 +43,7 @@ CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-DPADD=	${LIBLZMA}
-LDADD=	-llzma
+DPADD=	${LIBLZMA} ${LIBPTHREAD}
+LDADD=	-llzma -lpthread
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile
index daef296..6a38e60 100644
--- a/usr.bin/xzdec/Makefile
+++ b/usr.bin/xzdec/Makefile
@@ -22,7 +22,7 @@ CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-DPADD=	${LIBLZMA}
-LDADD=	-llzma
+DPADD=	${LIBLZMA} ${LIBPTHREAD}
+LDADD=	-llzma -lpthread
 
 .include <bsd.prog.mk>
-- 
cgit v1.1