From 84fa8ca684e2c11c16bfc96037368a57ade877f5 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 6 Mar 2008 04:45:58 +0000 Subject: + 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. --- bootstrap/bootstrap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index cbe5e450f11..a9dd4ffc448 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.120 2008/01/30 22:57:31 tron Exp $ +# $NetBSD: bootstrap,v 1.121 2008/03/06 04:45:58 jlam Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -1026,10 +1026,10 @@ case "$need_extras" in yes) build_package "pkgtools/bootstrap-extras";; esac case "$need_ftp" in -yes) build_package "pkgtools/tnftp";; +yes) build_package "net/tnftp";; esac case "$need_pax" in -yes) build_package "pkgtools/pax";; +yes) build_package "archivers/pax";; esac build_package "pkgtools/pkg_install" -- cgit v1.2.3