+ Remove pkgtools/pax and pkgtools/tnftp as they are no longer different

  from archivers/pax and net/tnftp, respectively.  In the past, the
  pkgtools version of these packages installed into ${PKG_TOOLS_BIN},
  but this was changed in:

	pkgtools/pax/Makefile:1.15
	pkgtools/tnftp/Makefile:1.3

+ Get rid of archivers/pax/Makefile.common and net/tnftp/Makefile.common
  by merging them into their respective Makefiles.  The Makefile.common
  files existed solely for inclusion by the pkgtools versions of these
  packages, but with the removal of those packages, these files are
  now unnecessary.

+ Add full DESTDIR support to archivers/pax and net/tnftp.

+ Modify the bootstrap to build archivers/pax and net/tnftp instead of
  the pkgtools versions of these packages.

3 files changed, 37 insertions, 49 deletions

diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 10aebd8dfda..7d65d03fac8 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,17 +1,32 @@
-# $NetBSD: Makefile,v 1.34 2008/02/07 22:27:53 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2008/03/06 04:45:58 jlam Exp $
 
-USE_FEATURES=	nbcompat
+DISTNAME=		pax-20080110
+CATEGORIES=		archivers
+MASTER_SITES=		# empty
+DISTFILES=		# empty
 
-.include "Makefile.common"
+MAINTAINER=		grant@NetBSD.org
+HOMEPAGE=		http://www.NetBSD.org/
+COMMENT=		POSIX standard archiver with many extensions
 
-CATEGORIES=	archivers
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_FEATURES=		nbcompat
+
+.include "../../mk/bsd.prefs.mk"
 
 # pax installs "tar" and "cpio"
-.if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+=	gcpio-[0-9]*
+.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX)
+CONFLICTS+=		gcpio-[0-9]*
 .endif
-.if defined(GTAR_PROGRAM_PREFIX) && ${GTAR_PROGRAM_PREFIX} == ""
-CONFLICTS+=	gtar-base-[0-9]*
+.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX)
+CONFLICTS+=		gtar-base-[0-9]*
 .endif
 
+GNU_CONFIGURE=		yes
+NO_CHECKSUM=		yes
+
+do-extract:
+	${CP} -R ${FILESDIR} ${WRKSRC}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pax/Makefile.common b/archivers/pax/Makefile.common
deleted file mode 100644
index a2d44d79b63..00000000000
--- a/archivers/pax/Makefile.common
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2008/02/07 22:27:53 joerg Exp $
-#
-# This Makefile fragment is included by:
-#
-#	pkgsrc/archivers/pax/Makefile
-#	pkgsrc/pkgtools/pax/Makefile
-#
-
-DISTNAME=		pax-20080110
-MASTER_SITES=		# empty
-DISTFILES=		# empty
-
-MAINTAINER=		grant@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/
-COMMENT=		POSIX standard archiver with many extensions
-
-GNU_CONFIGURE=		yes
-
-NO_CHECKSUM=		yes
-NO_MTREE=		yes
-
-FILESDIR=		${.CURDIR}/../../archivers/pax/files
-PKGDIR=			${.CURDIR}/../../archivers/pax
-
-.include "../../mk/bsd.prefs.mk"
-
-do-extract:
-	${CP} -R ${FILESDIR} ${WRKSRC}
diff --git a/archivers/pax/files/Makefile.in b/archivers/pax/files/Makefile.in
index 4b26ee7cf9f..3576de8590b 100644
--- a/archivers/pax/files/Makefile.in
+++ b/archivers/pax/files/Makefile.in
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile.in,v 1.9 2005/12/01 03:00:01 minskim Exp $
+#	$NetBSD: Makefile.in,v 1.10 2008/03/06 04:45:58 jlam Exp $
 
 srcdir=		@srcdir@
 
+DESTDIR=	
 prefix=		@prefix@
 exec_prefix=	@exec_prefix@
 bindir=		@bindir@
@@ -43,15 +44,15 @@ distclean: clean
 	rm -f configure.lineno config.log
 
 install:
-	$(INSTALL) -m 755 -d $(bindir)
-	$(INSTALL) -m 755 -d $(man1dir)
-	$(INSTALL) -m 755 -d $(cat1dir)
-	$(INSTALL) $(PROG) $(bindir)
-	ln -f $(bindir)/$(PROG) $(bindir)/cpio
-	ln -f $(bindir)/$(PROG) $(bindir)/tar
-	$(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1
-	$(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0
-	$(INSTALL) -m 444 cpio.1 $(man1dir)/cpio.1
-	$(INSTALL) -m 444 cpio.cat1 $(cat1dir)/cpio.0
-	$(INSTALL) -m 444 tar.1 $(man1dir)/tar.1
-	$(INSTALL) -m 444 tar.cat1 $(cat1dir)/tar.0
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(man1dir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir)
+	$(INSTALL) $(PROG) $(DESTDIR)$(bindir)
+	ln -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(bindir)/cpio
+	ln -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(bindir)/tar
+	$(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$(PROG).1
+	$(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$(PROG).0
+	$(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/cpio.1
+	$(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/cpio.0
+	$(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/tar.1
+	$(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/tar.0