summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/platform/AIX.mk37
-rw-r--r--mk/platform/BSDOS.mk33
-rw-r--r--mk/platform/Darwin.mk31
-rw-r--r--mk/platform/DragonFly.mk21
-rw-r--r--mk/platform/FreeBSD.mk19
-rw-r--r--mk/platform/IRIX.mk21
-rw-r--r--mk/platform/Interix.mk20
-rw-r--r--mk/platform/Linux.mk23
-rw-r--r--mk/platform/NetBSD.mk25
-rw-r--r--mk/platform/OSF1.mk23
-rw-r--r--mk/platform/OpenBSD.mk21
-rw-r--r--mk/platform/SunOS.mk21
-rw-r--r--mk/platform/UnixWare.mk21
13 files changed, 178 insertions, 138 deletions
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 1266e388ee2..55afb23b4ac 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,7 +1,25 @@
-# $NetBSD: AIX.mk,v 1.14 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: AIX.mk,v 1.15 2005/05/03 18:30:12 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
+# and remove this comment.
+RSH?= /usr/bin/rsh
+# AIX strip fails too easily. Use a wrapper script instead
+.if exists(${LOCALBASE}/bin/strip)
+STRIP?= ${LOCALBASE}/bin/strip
+.endif
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,12 +28,10 @@ CHOWN?= /usr/bin/chown
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-CPP?= ${LOCALBASE}/bin/cpp
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
.if exists(${LOCALBASE}/bin/gegrep)
EGREP?= ${LOCALBASE}/bin/gegrep
.else
@@ -52,9 +68,6 @@ GZIP_CMD?= ${LOCALBASE}/bin/gzip -nf ${GZIP}
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
@@ -75,14 +88,9 @@ PERL5?= ${LOCALBASE}/bin/perl
.else
PERL5?= /usr/bin/perl
.endif
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
.if exists(${LOCALBASE}/bin/nbsed)
SED?= ${LOCALBASE}/bin/nbsed
.else
@@ -92,11 +100,6 @@ SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-# AIX strip fails too easily. Use a wrapper script instead
-.if exists(${LOCALBASE}/bin/strip)
-STRIP?= ${LOCALBASE}/bin/strip
-.endif
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(${LOCALBASE}/bin/tar)
TAR?= ${LOCALBASE}/bin/tar
@@ -109,9 +112,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 0022
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 9d2a086964f..995d93e6483 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,7 +1,23 @@
-# $NetBSD: BSDOS.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the BSD/OS operating system.
+#CPP= /usr/bin/cpp
+# BSD/OS doesn't have c++ command
+.if !exists(${CXX})
+CXX= /usr/bin/g++
+.endif
+ECHO_N?= ${ECHO} -n
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+# sh doesn't have built-in type
+TYPE?= which
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,16 +26,10 @@ CHOWN?= /usr/sbin/chown
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-#CPP= /usr/bin/cpp
-# BSD/OS doesn't have c++ command
-.if !exists(${CXX})
-CXX= /usr/bin/g++
-.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -60,14 +70,9 @@ PATCH?= /usr/contrib/bin/patch
# native /bin/pax doesn't support -O
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
# native sh and ksh both have problems under BSD/OS 4.3.1
@@ -75,7 +80,6 @@ SETENV?= /usr/bin/env
SH?= /bin/bash
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(/bin/tar)
TAR?= /bin/tar
@@ -88,10 +92,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-# sh doesn't have built-in type
-TYPE?= which
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 0022
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 735df7beae7..4a6120ba3a8 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,7 +1,22 @@
-# $NetBSD: Darwin.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the Darwin operating system.
+.if !defined(CPP) || ${CPP} == "cpp"
+CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
+.endif
+ECHO_N?= ${ECHO} -n
+LDD?= /usr/bin/otool -L
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,14 +25,10 @@ CHOWN?= /usr/sbin/chown
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-.if !defined(CPP) || ${CPP} == "cpp"
-CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
-.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -34,9 +45,7 @@ HEAD?= /usr/bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /sbin/ldconfig
-LDD?= /usr/bin/otool -L
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
@@ -52,20 +61,14 @@ PAX?= ${LOCALBASE}/bin/pax
PAX?= /bin/pax
.endif
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(${LOCALBASE}/bin/tar)
TAR?= ${LOCALBASE}/bin/tar
@@ -78,9 +81,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
.if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
CPP_PRECOMP_FLAGS?= -no-cpp-precomp # use the GNU cpp, not the OS X cpp
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index bb30bfb4882..37129ab93f7 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,10 +1,19 @@
-# $NetBSD: DragonFly.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: DragonFly.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the DragonFly operating system.
+BRANDELF?= /usr/bin/brandelf # used by linux compat layer
+ECHO_N?= ${ECHO} -n
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
-BRANDELF?= /usr/bin/brandelf # used by linux compat layer
CAT?= /bin/cat
CHMOD?= /bin/chmod
CHOWN?= /usr/sbin/chown
@@ -15,7 +24,6 @@ CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= /usr/bin/false
@@ -36,7 +44,6 @@ HEAD?= /usr/bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
@@ -57,18 +64,14 @@ PAX?= ${LOCALBASE}/bin/pax
PAX?= /bin/pax
.endif
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(${LOCALBASE}/bin/tar)
TAR?= ${LOCALBASE}/bin/tar
@@ -81,9 +84,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= /usr/bin/true
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 0022
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 47dbba8dbbe..0829436ec30 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,7 +1,16 @@
-# $NetBSD: FreeBSD.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the FreeBSD operating system.
+ECHO_N?= ${ECHO} -n
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
BRANDELF?= /usr/bin/brandelf # used by linux compat layer
@@ -15,7 +24,6 @@ CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -36,7 +44,6 @@ HEAD?= /usr/bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /usr/bin/id
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
@@ -57,18 +64,14 @@ PAX?= ${LOCALBASE}/bin/pax
PAX?= /bin/pax
.endif
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(${LOCALBASE}/bin/tar)
TAR?= ${LOCALBASE}/bin/tar
@@ -81,9 +84,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 0022
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 718ce6d06dc..fe7b3b41b3b 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,7 +1,17 @@
-# $NetBSD: IRIX.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the IRIX operating system.
+ECHO_N?= ${ECHO} -n
+IMAKEOPTS+= -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
+IMAKEOPTS+= -DManUsr=${PREFIX}
+PKGLOCALEDIR?= share
+PS?= /sbin/ps
+RSH?= /usr/bsd/rsh
+SU?= /sbin/su
+TYPE?= /sbin/type
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/nawk
BASENAME?= /sbin/basename
CAT?= /sbin/cat
@@ -14,7 +24,6 @@ CUT?= /usr/bin/cut
DATE?= /sbin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -41,8 +50,6 @@ HEAD?= /usr/bsd/head
HOSTNAME_CMD?= /usr/bsd/hostname
ID?= /usr/bin/id
IMAKE?= /usr/bin/X11/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
-IMAKEOPTS+= -DManUsr=${PREFIX}
LDCONFIG?= /usr/bin/true
LN?= /sbin/ln
LS?= /sbin/ls
@@ -66,18 +73,14 @@ PATCH?= /usr/sbin/patch -b
.endif
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /sbin/ps
PWD_CMD?= /sbin/pwd # needs to print physical path
RM?= /sbin/rm
RMDIR?= /usr/bin/rmdir
-RSH?= /usr/bsd/rsh
SED?= /sbin/sed
SETENV?= /sbin/env
SH?= /bin/ksh
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /usr/bin/sort
-SU?= /sbin/su
TAIL?= /usr/bin/tail
TAR?= ${LOCALBASE}/bin/tar
TEE?= /usr/bin/tee
@@ -86,9 +89,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= /sbin/type
WC?= /sbin/wc
XARGS?= /sbin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 022
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 0c8a11a443d..27d37625831 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.32 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: Interix.mk,v 1.33 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the Interix operating system.
@@ -40,6 +40,16 @@ BULK_PREREQ+= lang/gawk sysutils/coreutils
MANINSTALL= maninstall
MAKE_FLAGS+= MKCATPAGES=no NOLINT=1
+ECHO_N?= /bin/printf %s # does not support "echo -n"
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+RSH?= /usr/bin/rsh
+SU?= /bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+
# Use some pkgsrc versions as "better" replacements, if installed
.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk)
AWK?= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
@@ -60,7 +70,6 @@ CUT?= /bin/cut
DATE?= /bin/date
DIRNAME?= /bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= /bin/printf %s # does not support "echo -n"
EGREP?= /bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -77,7 +86,6 @@ HEAD?= /bin/head
HOSTNAME_CMD?= /bin/hostname
ID?= /bin/id
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /bin/true
LN?= /bin/ln
LS?= /bin/ls
@@ -90,18 +98,14 @@ NICE?= /bin/nice
PATCH?= ${LOCALBASE}/bin/gpatch
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-RSH?= /usr/bin/rsh
SED?= ${LOCALBASE}/bin/nbsed
SETENV?= /bin/env
SH?= /bin/sh
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /bin/sort
-SU?= /bin/su
TAIL?= /bin/tail
TAR?= ${LOCALBASE}/bin/tar
TEE?= /bin/tee
@@ -110,9 +114,9 @@ TOUCH?= /bin/touch
TR?= /bin/tr
TRUE?= true # Shell builtin
TSORT?= /bin/tsort
-TYPE?= type # Shell builtin
WC?= /bin/wc
XARGS?= /bin/xargs
+.endif
USERADD?= ${LOCALBASE}/sbin/useradd
GROUPADD?= ${LOCALBASE}/sbin/groupadd
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 0fd98c1d43d..92c064b61ba 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,7 +1,18 @@
-# $NetBSD: Linux.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: Linux.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the Linux operating system.
+ECHO_N?= ${ECHO} -n
+IMAKEOPTS+= -DBuildHtmlManPages=NO
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
.if exists(/bin/basename)
BASENAME?= /bin/basename
@@ -22,7 +33,6 @@ CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
.if exists(/bin/egrep)
EGREP?= /bin/egrep
.elif exists(/usr/bin/egrep)
@@ -72,7 +82,6 @@ ID?= /bin/id
ID?= /usr/bin/id
.endif
IMAKE?= ${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+= -DBuildHtmlManPages=NO
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
@@ -93,14 +102,9 @@ NICE?= /usr/bin/nice
PATCH?= /usr/bin/patch
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
.if exists(/bin/sed)
SED?= /bin/sed
.elif exists(/usr/bin/sed)
@@ -114,7 +118,6 @@ SORT?= /bin/sort
.else
SORT?= /usr/bin/sort
.endif
-SU?= /bin/su
TAIL?= /usr/bin/tail
TAR?= ${LOCALBASE}/bin/tar
TEE?= /usr/bin/tee
@@ -127,9 +130,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs -r
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 022
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index bbe8c540e57..9dac42b8138 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,7 +1,19 @@
-# $NetBSD: NetBSD.mk,v 1.11 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.12 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the NetBSD operating system.
+# Needed for 1.6.1 and earlier due to rpcgen bugs and paths
+.if defined(CPP) && ${CPP} == "cpp"
+CPP= /usr/bin/cpp
+.endif
+ECHO_N?= ${ECHO} -n
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -10,15 +22,10 @@ CHOWN?= /usr/sbin/chown
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-# Needed for 1.6.1 and earlier due to rpcgen bugs and paths
-.if defined(CPP) && ${CPP} == "cpp"
-CPP= /usr/bin/cpp
-.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
@@ -54,18 +61,14 @@ NICE?= /usr/bin/nice
PATCH?= /usr/bin/patch
PAX?= /bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= /usr/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(/bin/tar)
TAR?= /bin/tar
@@ -78,9 +81,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
.if exists(/usr/sbin/user)
USERADD?= /usr/sbin/useradd
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 4bab45f05b0..6fb7898818b 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.4 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: OSF1.mk,v 1.5 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the OSF1 operating system.
@@ -9,6 +9,17 @@
# echo="set -v" quiet="set +v" filter="set +v" \
# echoFlag=v errFlag=e
+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
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -17,16 +28,13 @@ CHOWN?= /bin/chown
CHGRP?= /usr/bin/chgrp
CMP?= /usr/bin/cmp
CP?= /bin/cp
-CPP?= /usr/bin/cpp
CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/bin/echo
-ECHO_N?= ${SETENV} CMD_ENV=bsd /usr/bin/echo -n
EGREP?= /usr/bin/grep -E
EXPR?= /bin/expr
FALSE?= false # Shell builtin
-FETCH_CMD?= ${LOCALBASE}/bin/ftp
FGREP?= /usr/bin/grep -F
FILE_CMD?= /usr/bin/file
FIND?= /usr/bin/find
@@ -43,7 +51,6 @@ GZIP_CMD?= /usr/bin/gzip -nf ${GZIP}
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
@@ -60,8 +67,6 @@ PERL5?= ${LOCALBASE}/bin/perl
.else
PERL5?= /usr/bin/perl
.endif
-PKGLOCALEDIR= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
@@ -70,8 +75,6 @@ SETENV?= /usr/bin/env
SH?= /bin/ksh # recommendend on Tru64
#SHLOCK= ${LOCALBASE}/bin/shlock # need to make this work
SORT?= /usr/bin/sort
-STRIP?= /usr/bin/strip
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
TAR?= /usr/bin/tar
TEE?= /usr/bin/tee
@@ -80,9 +83,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
USERADD?= /usr/sbin/useradd
GROUPADD?= /usr/sbin/groupadd
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 05ca4cc855b..682e4cedde6 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,7 +1,17 @@
-# $NetBSD: OpenBSD.mk,v 1.13 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.14 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the OpenBSD operating system.
+ECHO_N?= ${ECHO} -n
+PKGLOCALEDIR?= share
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= type # Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/awk
BASENAME?= /usr/bin/basename
CAT?= /bin/cat
@@ -14,7 +24,6 @@ CUT?= /usr/bin/cut
DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FGREP?= /usr/bin/fgrep
@@ -46,20 +55,14 @@ NICE?= /usr/bin/nice
PATCH?= /usr/bin/patch
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= share
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /bin/rm
RMDIR?= /bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
.if exists(/bin/tar)
TAR?= /bin/tar
@@ -72,9 +75,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= true # Shell builtin
TSORT?= /usr/bin/tsort
-TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
.if exists(/usr/sbin/user)
USERADD?= /usr/sbin/useradd
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index b96518ebfc4..e1322cc7584 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,7 +1,17 @@
-# $NetBSD: SunOS.mk,v 1.11 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.12 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
+ECHO_N?= ${ECHO} -n
+PKGLOCALEDIR?= lib
+PS?= /bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= /usr/bin/type
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/nawk
BASENAME?= /usr/bin/basename
CAT?= /usr/bin/cat
@@ -14,7 +24,6 @@ CUT?= /usr/bin/cut
DATE?= /usr/xpg4/bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/ucb/echo
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/xpg4/bin/grep -E
EXPR?= /usr/xpg4/bin/expr
FALSE?= /usr/bin/false
@@ -58,14 +67,9 @@ PATCH?= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
.endif
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= lib
-PS?= /bin/ps
PWD_CMD?= /bin/pwd # needs to print physical path
RM?= /usr/bin/rm
RMDIR?= /usr/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
.if exists(${LOCALBASE}/bin/nbsed)
SED?= ${LOCALBASE}/bin/nbsed
.else
@@ -75,7 +79,6 @@ SETENV?= /usr/bin/env
SH?= /bin/ksh
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/xpg4/bin/tail
TAR?= ${LOCALBASE}/bin/tar
TEE?= /usr/bin/tee
@@ -84,9 +87,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= /usr/bin/true
TSORT?= /usr/ccs/bin/tsort
-TYPE?= /usr/bin/type
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 022
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index fd9dd0caf09..3d01d445824 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,7 +1,17 @@
-# $NetBSD: UnixWare.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
#
# Variable definitions for the UnixWare 7 operating system.
+ECHO_N?= ${ECHO} -n
+PKGLOCALEDIR?= lib
+PS?= /usr/bin/ps
+# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
+# and remove this comment.
+RSH?= /usr/bin/rsh
+SU?= /usr/bin/su
+TYPE?= /usr/bin/type
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
AWK?= /usr/bin/nawk
BASENAME?= /usr/bin/basename
CAT?= /usr/bin/cat
@@ -14,7 +24,6 @@ CUT?= /usr/bin/cut
DATE?= /usr/bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/ucb/echo
-ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/grep -E
EXPR?= /usr/bin/expr
FALSE?= /usr/bin/false
@@ -54,14 +63,9 @@ NICE?= /usr/bin/nice
PATCH?= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
PAX?= ${LOCALBASE}/bin/pax
PERL5?= ${LOCALBASE}/bin/perl
-PKGLOCALEDIR?= lib
-PS?= /usr/bin/ps
PWD_CMD?= /usr/bin/pwd # needs to print physical path
RM?= /usr/bin/rm
RMDIR?= /usr/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk. Verify/corerct for this platform
-# and remove this comment.
-RSH?= /usr/bin/rsh
.if exists(${LOCALBASE}/bin/nbsed)
SED?= ${LOCALBASE}/bin/nbsed
.else
@@ -71,7 +75,6 @@ SETENV?= /usr/bin/env
SH?= /usr/bin/ksh
SHLOCK= ${LOCALBASE}/bin/shlock
SORT?= /usr/bin/sort
-SU?= /usr/bin/su
TAIL?= /usr/bin/tail
TAR?= ${LOCALBASE}/bin/tar
TEE?= /usr/bin/tee
@@ -80,9 +83,9 @@ TOUCH?= /usr/bin/touch
TR?= /usr/bin/tr
TRUE?= /usr/bin/true
TSORT?= /usr/ccs/bin/tsort
-TYPE?= /usr/bin/type
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
+.endif
CPP_PRECOMP_FLAGS?= # unset
DEF_UMASK?= 022