[Midnightbsd-cvs] src [11287] trunk/usr.bin/tar/Makefile: fix config

[laffer1 at midnightbsd.org]

Revision: 11287
          http://svnweb.midnightbsd.org/src/?rev=11287
Author:   laffer1
Date:     2018-07-04 09:32:34 -0400 (Wed, 04 Jul 2018)
Log Message:
-----------
fix config

Modified Paths:
--------------
    trunk/usr.bin/tar/Makefile

Modified: trunk/usr.bin/tar/Makefile
===================================================================
--- trunk/usr.bin/tar/Makefile	2018-07-04 13:30:55 UTC (rev 11286)
+++ trunk/usr.bin/tar/Makefile	2018-07-04 13:32:34 UTC (rev 11287)
@@ -1,11 +1,11 @@
 # $MidnightBSD$
-
+# $FreeBSD: stable/10/usr.bin/tar/Makefile 321304 2017-07-20 20:16:18Z mm $
 .include <bsd.own.mk>
 
 LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
 
 PROG=	bsdtar
-BSDTAR_VERSION_STRING=	3.2.1
+BSDTAR_VERSION_STRING=	3.3.2
 
 .PATH: ${LIBARCHIVEDIR}/tar
 SRCS=	bsdtar.c	\
@@ -18,11 +18,11 @@
 
 .PATH: ${LIBARCHIVEDIR}/libarchive_fe
 SRCS+=	err.c		\
-	line_reader.c   \
+	line_reader.c	\
 	passphrase.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
@@ -36,10 +36,14 @@
 .endif
 
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
-CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config.h\"
+CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_midnightbsd.h\"
 CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive
 CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
 SYMLINKS=	bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>