summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/tools/defaults.mk3
-rw-r--r--mk/tools/replace.mk14
-rw-r--r--mk/tools/tools.Darwin.mk3
-rw-r--r--mk/tools/tools.DragonFly.mk3
-rw-r--r--mk/tools/tools.FreeBSD.mk3
-rw-r--r--mk/tools/tools.Linux.mk3
-rw-r--r--mk/tools/tools.NetBSD.mk3
-rw-r--r--mk/tools/tools.OpenBSD.mk3
-rw-r--r--mk/tools/tools.SunOS.mk5
-rw-r--r--net/ja-samba/Makefile12
-rw-r--r--net/samba/Makefile12
-rw-r--r--net/samba2/Makefile12
12 files changed, 49 insertions, 27 deletions
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 639d318a033..fc42e657328 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.23 2005/05/26 21:46:13 jlam Exp $
+# $NetBSD: defaults.mk,v 1.24 2005/06/03 22:54:44 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -95,6 +95,7 @@ _TOOLS_VARNAME.ls= LS
_TOOLS_VARNAME.m4= M4
_TOOLS_VARNAME.mail= MAIL_CMD
_TOOLS_VARNAME.mkdir= MKDIR
+_TOOLS_VARNAME.mktemp= MKTEMP
_TOOLS_VARNAME.mtree= MTREE
_TOOLS_VARNAME.mv= MV
_TOOLS_VARNAME.nice= NICE
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 0eac56a0bc0..c8720f86fe1 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.98 2005/06/03 21:11:07 jlam Exp $
+# $NetBSD: replace.mk,v 1.99 2005/06/03 22:54:44 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -748,6 +748,18 @@ TOOLS_${_TOOLS_VARNAME.mkdir}= ${TOOLS_REAL_CMD.mkdir} ${TOOLS_REAL_ARGS.mkdir}
. endif
.endif
+.if !defined(TOOLS_IGNORE.mktemp) && !empty(_USE_TOOLS:Mmktemp)
+. if !empty(PKGPATH:Msysutils/mktemp)
+MAKEFLAGS+= TOOLS_IGNORE.mktemp=
+. elif !empty(_TOOLS_USE_PKGSRC.mktemp:M[yY][eE][sS])
+TOOLS_DEPENDS.mktemp?= mktemp>=1.5:../../sysutils/mktemp
+TOOLS_CREATE+= mktemp
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mktemp=mktemp
+TOOLS_REAL_CMD.mktemp= ${TOOLS_PREFIX.mktemp}/bin/mktemp
+TOOLS_${_TOOLS_VARNAME.mktemp}= ${TOOLS_REAL_CMD.mktemp}
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.mtree) && !empty(_USE_TOOLS:Mmtree)
. if !empty(PKGPATH:Mpkgtools/mtree)
MAKEFLAGS+= TOOLS_IGNORE.mtree=
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 71c9efefe5d..e956df17100 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.12 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.13 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the Darwin (Mac OS X) operating system.
@@ -40,6 +40,7 @@ TOOLS_PLATFORM.ls?= /bin/ls
TOOLS_PLATFORM.m4?= /usr/bin/m4
TOOLS_PLATFORM.mail?= /usr/bin/mail
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
TOOLS_PLATFORM.mv?= /bin/mv
TOOLS_PLATFORM.nice?= /usr/bin/nice
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index 8d8ebe47b0d..970160c1535 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.14 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the DragonFly operating system.
@@ -39,6 +39,7 @@ TOOLS_PLATFORM.ls?= /bin/ls
TOOLS_PLATFORM.m4?= /usr/bin/m4
TOOLS_PLATFORM.mail?= /usr/bin/mail
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
TOOLS_PLATFORM.mv?= /bin/mv
TOOLS_PLATFORM.nice?= /usr/bin/nice
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 4194f24eeed..5c7ff13a90c 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.14 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the FreeBSD operating system.
@@ -41,6 +41,7 @@ TOOLS_PLATFORM.ls?= /bin/ls
TOOLS_PLATFORM.m4?= /usr/bin/m4
TOOLS_PLATFORM.mail?= /usr/bin/mail
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
TOOLS_PLATFORM.mv?= /bin/mv
TOOLS_PLATFORM.nice?= /usr/bin/nice
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 4b383d49552..fff33f60f8d 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.18 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.19 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the Linux operating system.
@@ -95,6 +95,7 @@ TOOLS_PLATFORM.mail?= /bin/mail # RH, Mandrake
TOOLS_PLATFORM.mail?= /usr/bin/mail # Debian, Slackware, SuSE
.endif
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
TOOLS_PLATFORM.mv?= /bin/mv
.if exists(/bin/nice)
TOOLS_PLATFORM.nice?= /bin/nice
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index ca8f0c33adf..03f5f0607bc 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.15 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.16 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -47,6 +47,7 @@ TOOLS_PLATFORM.ls?= /bin/ls
TOOLS_PLATFORM.m4?= /usr/bin/m4
TOOLS_PLATFORM.mail?= /usr/bin/mail
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
TOOLS_PLATFORM.mv?= /bin/mv
TOOLS_PLATFORM.nice?= /usr/bin/nice
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index cbe38f5b303..9ac67f74ac2 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.13 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.14 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the OpenBSD operating system.
@@ -38,6 +38,7 @@ TOOLS_PLATFORM.ls?= /bin/ls
TOOLS_PLATFORM.m4?= /usr/bin/m4
TOOLS_PLATFORM.mail?= /usr/bin/mail
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
TOOLS_PLATFORM.mv?= /bin/mv
TOOLS_PLATFORM.nice?= /usr/bin/nice
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 76147fc8556..5aaea9a55b7 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.14 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
#
# System-supplied tools for the Solaris operating system.
@@ -44,6 +44,9 @@ TOOLS_PLATFORM.ls?= /usr/bin/ls
TOOLS_PLATFORM.m4?= /usr/ccs/bin/m4
TOOLS_PLATFORM.mail?= /usr/bin/mailx
TOOLS_PLATFORM.mkdir?= /usr/bin/mkdir -p
+.if exists(/usr/bin/mktemp)
+TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
+.endif
TOOLS_PLATFORM.mv?= /usr/bin/mv
TOOLS_PLATFORM.nice?= /usr/xpg4/bin/nice
TOOLS_PLATFORM.nroff?= /usr/bin/nroff
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 56b96b31369..3a0b4daffcf 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/06/03 22:54:44 jlam Exp $
.include "Makefile.common"
@@ -52,11 +52,11 @@ RCD_SCRIPTS= samba nmbd smbd
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
-.if !defined(MKTEMP)
-MKTEMP!= ${TYPE} mktemp 2>&1 | \
- ${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
-MAKEFLAGS+= MKTEMP=${MKTEMP:Q}
-.endif
+# mktemp is useful for the replacement adduser script, but don't require
+# a full dependency since it's not actually needed by samba.
+#
+USE_TOOLS+= mktemp
+
.if !defined(PWD_MKDB)
PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 3a96931ad01..588c8f9f95c 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.142 2005/06/03 22:54:44 jlam Exp $
DISTNAME= samba-3.0.10
PKGREVISION= 2
@@ -64,11 +64,11 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
.include "options.mk"
-.if !defined(MKTEMP)
-MKTEMP!= ${TYPE} mktemp 2>&1 | \
- ${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
-MAKEFLAGS+= MKTEMP=${MKTEMP:Q}
-.endif
+# mktemp is useful for the replacement adduser script, but don't require
+# a full dependency since it's not actually needed by samba.
+#
+USE_TOOLS+= mktemp
+
.if !defined(PWD_MKDB)
PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index 14deeba278b..e8b9cc617dd 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/02 09:48:43 salo Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/03 22:54:44 jlam Exp $
.include "Makefile.common"
PKGREVISION= # empty1
@@ -42,11 +42,11 @@ RCD_SCRIPTS= samba nmbd smbd
OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
-.if !defined(MKTEMP)
-MKTEMP!= ${TYPE} mktemp 2>&1 | \
- ${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
-MAKEFLAGS+= MKTEMP=${MKTEMP:Q}
-.endif
+# mktemp is useful for the replacement adduser script, but don't require
+# a full dependency since it's not actually needed by samba.
+#
+USE_TOOLS+= mktemp
+
.if !defined(PWD_MKDB)
PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-12 18:20:05 +0000