pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Teach the new tools framework about INSTALL and set...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e431b1558550
branches: trunk
changeset: 493353:e431b1558550
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue May 03 20:41:53 2005 +0000
description:
Teach the new tools framework about INSTALL and set the appropriate
default value for each platform. Currently, the replacement tools
comes from sysutils/coreutils, but where there is no native BSD install
program, bootstrap-pkgsrc should probably be made to provide an install
shell script as an alternative, and mk/tools/bootstrap.mk should be
amended accordingly.
Also remove one use of ${TYPE} in pkgsrc (bsd.pkg.mk) under the new tools
framework.
diffstat:
mk/bsd.pkg.mk | 19 +++++++++++++------
mk/platform/AIX.mk | 8 ++++----
mk/platform/OSF1.mk | 4 ++--
mk/tools/defaults.mk | 3 ++-
mk/tools/replace.mk | 13 ++++++++++++-
mk/tools/tools.BSDOS.mk | 3 ++-
mk/tools/tools.Darwin.mk | 3 ++-
mk/tools/tools.DragonFly.mk | 3 ++-
mk/tools/tools.FreeBSD.mk | 3 ++-
mk/tools/tools.IRIX.mk | 3 ++-
mk/tools/tools.Interix.mk | 3 ++-
mk/tools/tools.Linux.mk | 3 ++-
mk/tools/tools.NetBSD.mk | 3 ++-
mk/tools/tools.OpenBSD.mk | 3 ++-
mk/tools/tools.SunOS.mk | 3 ++-
mk/tools/tools.UnixWare.mk | 3 ++-
16 files changed, 55 insertions(+), 25 deletions(-)
diffs (truncated from 330 to 300 lines):
diff -r 946dfcb5188c -r e431b1558550 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/bsd.pkg.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1623 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1624 2005/05/03 20:41:53 jlam Exp $
#
# This file is in the public domain.
#
@@ -941,9 +941,10 @@
#
USE_TOOLS+= [ awk basename cat chgrp chmod chown cmp cp cut date \
dirname echo egrep env expr false fgrep file find grep \
- gtar gunzip gzcat gzip head hostname id ldconfig ln ls \
- m4 mkdir mtree mv nice pax pwd rm rmdir sed sh shlock \
- sort tail tee test touch tr true tsort wc xargs
+ gtar gunzip gzcat gzip head hostname id install \
+ ldconfig ln ls m4 mkdir mtree mv nice pax pwd rm rmdir \
+ sed sh shlock sort tail tee test touch tr true tsort wc \
+ xargs
# We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
.if !empty(PKGSRC_MESSAGE_RECIPIENTS)
@@ -2124,6 +2125,12 @@
pre-configure-override: ${_CONFIGURE_PREREQ}
@${DO_NADA}
+.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+_INSTALL_CMD= ${INSTALL}
+.else
+_INSTALL_CMD= `${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`
+.endif
+
.PHONY: do-configure
.if !target(do-configure)
do-configure:
@@ -2131,8 +2138,8 @@
. for DIR in ${CONFIGURE_DIRS}
${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} \
AWK="${AWK}" \
- INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \
- ac_given_INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \
+ INSTALL="${_INSTALL_CMD} -c -o ${BINOWN} -g ${BINGRP}" \
+ ac_given_INSTALL="${_INSTALL_CMD} -c -o ${BINOWN} -g ${BINGRP}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_GAME="${INSTALL_GAME}" \
diff -r 946dfcb5188c -r e431b1558550 mk/platform/AIX.mk
--- a/mk/platform/AIX.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/platform/AIX.mk Tue May 03 20:41:53 2005 +0000
@@ -1,12 +1,9 @@
-# $NetBSD: AIX.mk,v 1.15 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: AIX.mk,v 1.16 2005/05/03 20:41:53 jlam Exp $
#
# Variable definitions for the AIX operating system.
CPP?= ${LOCALBASE}/bin/cpp
ECHO_N?= ${ECHO} -n
-#.if ${INSTALL} == "install"
-INSTALL= ${LOCALBASE}/bin/install-sh
-#.endif
PKGLOCALEDIR?= share
PS?= /bin/ps
# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
@@ -68,6 +65,9 @@
HEAD?= /usr/bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
+#.if ${INSTALL} == "install"
+INSTALL= ${LOCALBASE}/bin/install-sh
+#.endif
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/platform/OSF1.mk
--- a/mk/platform/OSF1.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/platform/OSF1.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.5 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: OSF1.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
#
# Variable definitions for the OSF1 operating system.
@@ -12,7 +12,6 @@
CPP?= /usr/bin/cpp
ECHO_N?= ${SETENV} CMD_ENV=bsd /usr/bin/echo -n
FETCH_CMD?= ${LOCALBASE}/bin/ftp
-INSTALL= ${LOCALBASE}/bin/install-sh
PKGLOCALEDIR= share
PS?= /bin/ps
STRIP?= /usr/bin/strip
@@ -51,6 +50,7 @@
HEAD?= /usr/bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
+INSTALL= ${LOCALBASE}/bin/install-sh
LDCONFIG?= ${TRUE}
LN?= /bin/ln
LS?= /bin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/defaults.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: defaults.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
.if !defined(TOOLS_DEFAULTS_MK)
TOOLS_DEFAULTS_MK= defined
@@ -48,6 +48,7 @@
_TOOLS_VARNAME.hostname= HOSTNAME_CMD
_TOOLS_VARNAME.id= ID
_TOOLS_VARNAME.imake= IMAKE
+_TOOLS_VARNAME.install= INSTALL
_TOOLS_VARNAME.ldconfig= LDCONFIG
_TOOLS_VARNAME.lex= LEX
_TOOLS_VARNAME.ln= LN
diff -r 946dfcb5188c -r e431b1558550 mk/tools/replace.mk
--- a/mk/tools/replace.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/replace.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.60 2005/05/03 17:14:14 jlam Exp $
+# $NetBSD: replace.mk,v 1.61 2005/05/03 20:41:53 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions. The replacements are placed under
@@ -473,6 +473,17 @@
. endif
.endif
+.if !defined(TOOLS_IGNORE.install) && !empty(_USE_TOOLS:Minstall)
+. if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+= TOOLS_IGNORE.install=
+. elif !empty(_TOOLS_USE_PKGSRC.install:M[yY][eE][sS])
+TOOLS_DEPENDS.install?= coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_SYMLINK+= install
+TOOLS_REAL_CMD.install= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}install
+${_TOOLS_VARNAME.install}= ${TOOLS_REAL_CMD.install}
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.lex) && !empty(_USE_TOOLS:Mlex)
. if !empty(PKGPATH:Mdevel/flex)
MAKEFLAGS+= TOOLS_IGNORE.lex=
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.6 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.7 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the BSD/OS operating system.
@@ -30,6 +30,7 @@
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /usr/bin/install
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
TOOLS_PLATFORM.ln?= /bin/ln
TOOLS_PLATFORM.ls?= /bin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.Darwin.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the Darwin (Mac OS X) operating system.
@@ -31,6 +31,7 @@
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /usr/bin/install
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
TOOLS_PLATFORM.ln?= /bin/ln
TOOLS_PLATFORM.ls?= /bin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the DragonFly operating system.
@@ -31,6 +31,7 @@
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /usr/bin/install
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
TOOLS_PLATFORM.lex?= /usr/bin/lex
TOOLS_PLATFORM.ln?= /bin/ln
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the FreeBSD operating system.
@@ -33,6 +33,7 @@
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /usr/bin/install
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
TOOLS_PLATFORM.lex?= /usr/bin/lex
TOOLS_PLATFORM.ln?= /bin/ln
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.IRIX.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the IRIX operating system.
@@ -33,6 +33,7 @@
TOOLS_PLATFORM.head?= /usr/bsd/head
TOOLS_PLATFORM.hostname?= /usr/bsd/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /sbin/install
TOOLS_PLATFORM.ldconfig?= ${TOOLS_PLATFORM.true}
TOOLS_PLATFORM.ln?= /sbin/ln
TOOLS_PLATFORM.ls?= /sbin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.Interix.mk
--- a/mk/tools/tools.Interix.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.Interix.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the Interix operating system.
@@ -29,6 +29,7 @@
TOOLS_PLATFORM.head?= /bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /bin/id
+TOOLS_PLATFORM.install?= /bin/install
TOOLS_PLATFORM.ldconfig?= /bin/true
TOOLS_PLATFORM.ln?= /bin/ln
TOOLS_PLATFORM.ls?= /bin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.Linux.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.8 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.9 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the Linux operating system.
@@ -83,6 +83,7 @@
.elif exists(/usr/bin/id)
TOOLS_PLATFORM.id?= /usr/bin/id
.endif
+TOOLS_PLATFORM.install?= /usr/bin/install
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
TOOLS_PLATFORM.ln?= /bin/ln
TOOLS_PLATFORM.ls?= /bin/ls
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -41,6 +41,7 @@
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /usr/bin/install
.if exists(/sbin/ldconfig)
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
.else
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.OpenBSD.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.6 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.7 2005/05/03 20:41:53 jlam Exp $
#
# System-supplied tools for the OpenBSD operating system.
@@ -34,6 +34,7 @@
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
+TOOLS_PLATFORM.install?= /usr/bin/install
TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
TOOLS_PLATFORM.lex?= /usr/bin/lex
TOOLS_PLATFORM.ln?= /bin/ln
diff -r 946dfcb5188c -r e431b1558550 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk Tue May 03 20:08:24 2005 +0000
+++ b/mk/tools/tools.SunOS.mk Tue May 03 20:41:53 2005 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index