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

@@ -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>
 

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>

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>

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>

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>