pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Drop tools/bootstrap.mk. It was mostly reunda...
details: https://anonhg.NetBSD.org/pkgsrc/rev/87a24c8fe446
branches: trunk
changeset: 553988:87a24c8fe446
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Feb 05 19:03:29 2009 +0000
description:
Drop tools/bootstrap.mk. It was mostly reundant as the bootstrap
components are correctly registered as dependencies. Move the remaining
two exceptions into the corresponding platform files.
XXX Both the strip and mkdir-sh are currently not registered
diffstat:
mk/tools/bootstrap.mk | 128 ---------------------------------------------
mk/tools/defaults.mk | 3 +-
mk/tools/tools.AIX.mk | 5 +-
mk/tools/tools.UnixWare.mk | 5 +-
4 files changed, 9 insertions(+), 132 deletions(-)
diffs (181 lines):
diff -r b5583a3d8b63 -r 87a24c8fe446 mk/tools/bootstrap.mk
--- a/mk/tools/bootstrap.mk Thu Feb 05 18:53:03 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-# $NetBSD: bootstrap.mk,v 1.8 2006/12/15 12:46:24 martti Exp $
-#
-# Copyright (c) 2005 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Johnny C. Lam.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the NetBSD
-# Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# bootstrap.mk contains settings matching the contents of
-# pkgsrc/bootstrap/bootstrap. Where we install the bootstrap versions
-# of tools, we point TOOLS_PLATFORM.* to them so that pkgsrc knows
-# that they are system-supplied and won't need replacement by pkgsrc
-# versions of those tools.
-#
-# XXX This file should go away and the bootstrap script should be
-# XXX taught to write out the correct TOOLS_PLATFORM.* definitions
-# XXX on its own, based on the configuration used.
-#
-
-.if ${OPSYS} == "AIX"
-TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.strip?= ${LOCALBASE}/bin/strip
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "Darwin"
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "DragonFly"
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "FreeBSD"
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "HPUX"
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "Interix"
-TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "IRIX"
-TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "Linux"
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "NetBSD"
-# NetBSD has everything.
-
-.elif ${OPSYS} == "OpenBSD"
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "OSF1"
-TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "SunOS"
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.elif ${OPSYS} == "UnixWare"
-TOOLS_PLATFORM.mkdir?= ${LOCALBASE}/sbin/mkdir-sh -p
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-
-.else
-TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
-TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
-TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
-TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
-.endif
diff -r b5583a3d8b63 -r 87a24c8fe446 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk Thu Feb 05 18:53:03 2009 +0000
+++ b/mk/tools/defaults.mk Thu Feb 05 19:03:29 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.55 2008/11/15 20:20:44 minskim Exp $
+# $NetBSD: defaults.mk,v 1.56 2009/02/05 19:03:29 joerg Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,7 +43,6 @@
# XXX These should eventually just migrate over to the appropriate
# XXX pkgsrc/mk/platform/${OPSYS}.mk file.
#
-.include "${_PKGSRC_TOPDIR}/mk/tools/bootstrap.mk"
.if exists(${_PKGSRC_TOPDIR}/mk/tools/tools.${OPSYS}.mk)
. include "${_PKGSRC_TOPDIR}/mk/tools/tools.${OPSYS}.mk"
.endif
diff -r b5583a3d8b63 -r 87a24c8fe446 mk/tools/tools.AIX.mk
--- a/mk/tools/tools.AIX.mk Thu Feb 05 18:53:03 2009 +0000
+++ b/mk/tools/tools.AIX.mk Thu Feb 05 19:03:29 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.15 2009/02/02 11:14:11 joerg Exp $
+# $NetBSD: tools.AIX.mk,v 1.16 2009/02/05 19:03:29 joerg Exp $
#
# System-supplied tools for the AIX operating system.
@@ -65,3 +65,6 @@
TOOLS_PLATFORM.tsort?= /usr/bin/tsort
TOOLS_PLATFORM.wc?= /usr/bin/wc
TOOLS_PLATFORM.xargs?= /usr/bin/xargs
+
+# Special bootstrap script:
+TOOLS_PLATFORM.strip?= ${LOCALBASE}/bin/strip
diff -r b5583a3d8b63 -r 87a24c8fe446 mk/tools/tools.UnixWare.mk
--- a/mk/tools/tools.UnixWare.mk Thu Feb 05 18:53:03 2009 +0000
+++ b/mk/tools/tools.UnixWare.mk Thu Feb 05 19:03:29 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.12 2005/06/24 20:59:59 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.13 2009/02/05 19:03:29 joerg Exp $
#
# System-supplied tools for the UnixWare 7 operating system.
@@ -51,3 +51,6 @@
TOOLS_PLATFORM.tsort?= /usr/ccs/bin/tsort
TOOLS_PLATFORM.wc?= /usr/bin/wc
TOOLS_PLATFORM.xargs?= /usr/bin/xargs
+
+# Special bootstrap script
+TOOLS_PLATFORM.mkdir?= ${LOCALBASE}/sbin/mkdir-sh -p
Home |
Main Index |
Thread Index |
Old Index