diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 5679f3d4b2e..811efc48dbc 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,21 +1,11 @@ -# Makefile for bsdtar -# # $FreeBSD$ -# -DEBUG_FLAGS= -g PROG= bsdtar SRCS= bsdtar.c matching.c read.c util.c write.c -MAN = bsdtar.1 -BINDIR?= /usr/bin WARNS?= 6 -LDADD += -larchive -lz -lbz2 - -.if defined(DMALLOC) -CFLAGS += -DDMALLOC -I/usr/local/include -LDADD += -L/usr/local/lib -ldmalloc -.endif +LDADD+= -larchive -lbz2 -lz +DPADD+= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} .include diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c index f85a1474d24..528a6dd5f46 100644 --- a/usr.bin/tar/bsdtar.c +++ b/usr.bin/tar/bsdtar.c @@ -32,9 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef DMALLOC -#include -#endif #include #include #include diff --git a/usr.bin/tar/matching.c b/usr.bin/tar/matching.c index 36c73ce137c..9b4e7255ae9 100644 --- a/usr.bin/tar/matching.c +++ b/usr.bin/tar/matching.c @@ -27,9 +27,6 @@ #include "bsdtar_platform.h" __FBSDID("$FreeBSD$"); -#ifdef DMALLOC -#include -#endif #include #include #include diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c index 481238d78d7..684a7ae8225 100644 --- a/usr.bin/tar/read.c +++ b/usr.bin/tar/read.c @@ -32,9 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef DMALLOC -#include -#endif #include #include #include diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c index 5bf9884e869..d2eed4bf4d2 100644 --- a/usr.bin/tar/write.c +++ b/usr.bin/tar/write.c @@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); #endif #include #include -#ifdef DMALLOC -#include -#endif #include #include #include