diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-03 22:54:44 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-03 22:54:44 +0000 |
| commit | c55f2fb31985d8271fc8194f2f72db9fb106cf01 (patch) | |
| tree | 4c6644b89c16942f91bbcf6d43651ec7f43e1e22 /net | |
| parent | dd2b1cf65395f28808e4c0030c35322ca8e438e0 (diff) | |
| download | pkgsrc-c55f2fb31985d8271fc8194f2f72db9fb106cf01.tar.gz | |
Teach the tools framework about mktemp. Replace explicit tests for
mktemp with USE_TOOLS+=mktemp in the samba packages.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ja-samba/Makefile | 12 | ||||
| -rw-r--r-- | net/samba/Makefile | 12 | ||||
| -rw-r--r-- | net/samba2/Makefile | 12 |
3 files changed, 18 insertions, 18 deletions
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 }' |