[Midnightbsd-cvs] src [7260] trunk/usr.bin/tar/Makefile: update makefile for new libarchive

[laffer1 at midnightbsd.org]

Revision: 7260
          http://svnweb.midnightbsd.org/src/?rev=7260
Author:   laffer1
Date:     2015-08-15 12:59:39 -0400 (Sat, 15 Aug 2015)
Log Message:
-----------
update makefile for new libarchive

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

Modified: trunk/usr.bin/tar/Makefile
===================================================================
--- trunk/usr.bin/tar/Makefile	2015-08-15 16:59:11 UTC (rev 7259)
+++ trunk/usr.bin/tar/Makefile	2015-08-15 16:59:39 UTC (rev 7260)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/usr.bin/tar/Makefile,v 1.7 2012/01/14 03:35:43 laffer1 Exp $
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 
@@ -5,23 +5,20 @@
 LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
 
 PROG=	bsdtar
-BSDTAR_VERSION_STRING=3.0.3
+BSDTAR_VERSION_STRING=	3.1.2
 
 .PATH: ${LIBARCHIVEDIR}/tar
 SRCS=	bsdtar.c	\
 	cmdline.c	\
-	getdate.c	\
+	creation_set.c	\
 	read.c		\
 	subst.c		\
-	tree.c		\
 	util.c		\
 	write.c
 
 .PATH: ${LIBARCHIVEDIR}/libarchive_fe
 SRCS+=	err.c		\
-	line_reader.c	\
-	matching.c	\
-	pathmatch.c
+	line_reader.c
 
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
 LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
@@ -33,8 +30,12 @@
 LDADD+= -lmd
 .endif
 
+.if ${MK_ICONV} != "no"
+CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
+.endif
+
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
-CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/config_midnightbsd.h\"
+CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config.h\"
 CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive
 CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
 SYMLINKS=	bsdtar ${BINDIR}/tar