From 4cbbc3a35ef8331ff37baa7e8fbc32724d90fa9a Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 12 Apr 2004 00:13:23 +0000
Subject: [PATCH] Add DPADD to Makefile (thanks to Andrey for pointing this
 out).

Generally clean up Makefile, remove dmalloc references from source
(there are better ways to do this than pollute the FreeBSD src tree).
---
 usr.bin/tar/Makefile   | 14 ++------------
 usr.bin/tar/bsdtar.c   |  3 ---
 usr.bin/tar/matching.c |  3 ---
 usr.bin/tar/read.c     |  3 ---
 usr.bin/tar/write.c    |  3 ---
 5 files changed, 2 insertions(+), 24 deletions(-)

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 <bsd.prog.mk>
 
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 <archive.h>
 #include <archive_entry.h>
 #include <dirent.h>
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
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 <dmalloc.h>
-#endif
 #include <errno.h>
 #include <fnmatch.h>
 #include <stdlib.h>
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 <archive.h>
 #include <archive_entry.h>
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
 #include <errno.h>
 #include <grp.h>
 #include <limits.h>
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 <archive.h>
 #include <archive_entry.h>
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>