+ 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, 43 insertions, 38 deletions

diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index 8c4930fad49..22d624a075e 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,12 +1,44 @@
-# $NetBSD: Makefile,v 1.22 2007/08/07 04:59:52 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2008/03/06 04:45:58 jlam Exp $
 
-.include "Makefile.common"
+DISTNAME=		tnftp-20070806
+SVR4_PKGNAME=		tnftp
+CATEGORIES=		net
+MASTER_SITES=		# empty
+DISTFILES=		# empty
 
-CATEGORIES=	net
+# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
 
-CONFLICTS+=	kth-krb4-[0-9]*
-CONFLICTS+=	lukemftp-[0-9]*
+CONFLICTS+=		kth-krb4-[0-9]*
+CONFLICTS+=		lukemftp-[0-9]*
+
+MAINTAINER=		lukem@NetBSD.org
+COMMENT=		The enhanced FTP client in NetBSD
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+NO_CHECKSUM=		yes
+
+OPSYSVARS+=		MAKE_ENV
+MAKE_ENV.SunOS+=	CPPFLAGS=""
 
 .include "options.mk"
 
+do-extract:
+	@${CP} -R ${FILESDIR} ${WRKSRC}
+	@${RM} -f ${WRKSRC}/INSTALL
+
+# Use readline/builtin.mk to check for an editline library on the
+# system.  If we use the system editline library, then use the built-in
+# termcap library.
+#
+CHECK_BUILTIN.readline:=	yes
+.include "../../devel/readline/builtin.mk"
+CHECK_BUILTIN.readline:=	no
+
+.if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
+USE_BUILTIN.termcap=	yes
+.endif
+
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tnftp/Makefile.common b/net/tnftp/Makefile.common
deleted file mode 100644
index a388e7c9190..00000000000
--- a/net/tnftp/Makefile.common
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2007/08/07 04:56:22 lukem Exp $
-
-DISTNAME=		tnftp-20070806
-SVR4_PKGNAME=		tnftp
-MASTER_SITES=		# empty
-DISTFILES=		# empty
-
-# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
-
-MAINTAINER=		lukem@NetBSD.org
-COMMENT=		The enhanced FTP client in NetBSD
-
-GNU_CONFIGURE=		YES
-
-NO_CHECKSUM=		yes
-NO_MTREE=		yes
-
-FILESDIR=		${.CURDIR}/../../net/tnftp/files
-PKGDIR=			${.CURDIR}/../../net/tnftp
-
-OPSYSVARS+=		MAKE_ENV
-MAKE_ENV.SunOS+=	CPPFLAGS=""
-
-.include "../../mk/bsd.prefs.mk"
-
-do-extract:
-	@${CP} -R ${FILESDIR} ${WRKSRC}
-	@${RM} -f ${WRKSRC}/INSTALL
diff --git a/net/tnftp/files/src/Makefile.in b/net/tnftp/files/src/Makefile.in
index ac763418e43..6ea18fb8b2e 100644
--- a/net/tnftp/files/src/Makefile.in
+++ b/net/tnftp/files/src/Makefile.in
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile.in,v 1.5 2007/08/07 02:07:01 lukem Exp $
+#	$NetBSD: Makefile.in,v 1.6 2008/03/06 04:45:58 jlam Exp $
 #
 
 srcdir	= @srcdir@
 VPATH	= @srcdir@
 SHELL	= /bin/sh
 
+DESTDIR	=
 prefix	= @prefix@
 exec_prefix = @exec_prefix@
 bindir	= @bindir@
@@ -39,10 +40,10 @@ ${OBJS}: ${srcdir}/../tnftp.h ../config.h
 	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
 
 install: all
-	-mkdir -p ${bindir}
-	${INSTALL} -m 555 ${PROG} ${bindir}/`echo ${PROG}|sed '$(transform)'`
-	-mkdir -p ${mandircat1}
-	${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0
+	-mkdir -p ${DESTDIR}${bindir}
+	${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'`
+	-mkdir -p ${DESTDIR}${mandircat1}
+	${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0
 
 clean:
 	rm -f core ${PROG} ${OBJS}