diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 11 | ||||
| -rw-r--r-- | mk/defs.Darwin.mk | 5 | ||||
| -rw-r--r-- | mk/defs.Linux.mk | 5 | ||||
| -rw-r--r-- | mk/defs.NetBSD.mk | 4 | ||||
| -rw-r--r-- | mk/defs.SunOS.mk | 5 |
5 files changed, 13 insertions, 17 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 67856ec9355..e73e7ac74a3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.851 2001/11/19 16:01:03 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.852 2001/11/21 12:42:23 agc Exp $ # # This file is in the public domain. # @@ -28,15 +28,6 @@ MAKE_ENV+= USETOOLS="${USETOOLS}" ##### Build crypto packages by default. MKCRYPTO?= yes -##### Some overrides of defaults below on a per-OS basis. -.if (${OPSYS} == "SunOS") -DEF_UMASK?= 022 -.elif (${OPSYS} == "Linux") -DEF_UMASK?= 022 -NOMANCOMPRESS?= yes -.endif - -DEF_UMASK?= 0022 CLEANDEPENDS?= NO DEINSTALLDEPENDS?= NO # add -R to pkg_delete REINSTALL?= NO # reinstall upon update diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 941b395118b..9f2e4689a0f 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.4 2001/11/20 16:19:20 jlam Exp $ +# $NetBSD: defs.Darwin.mk,v 1.5 2001/11/21 12:42:24 agc Exp $ # # Variable definitions for the Darwin operating system. @@ -51,9 +51,10 @@ TYPE?= type # Shell builtin WC?= /usr/bin/wc XARGS?= /usr/bin/xargs -USERADD?= ${FALSE} # XXX - Fix me! +DEF_UMASK?= 0022 GROUPADD?= ${FALSE} # XXX - Fix me! NOLOGIN?= ${FALSE} +USERADD?= ${FALSE} # XXX - Fix me! ROOT_USER?= root ROOT_GROUP?= wheel diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index a32759cd3a0..d63bc1f798d 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.10 2001/11/20 16:19:20 jlam Exp $ +# $NetBSD: defs.Linux.mk,v 1.11 2001/11/21 12:42:24 agc Exp $ # # Variable definitions for the Linux operating system. @@ -55,9 +55,10 @@ TYPE?= type WC?= /usr/bin/wc XARGS?= /usr/bin/xargs -r -USERADD?= /usr/sbin/useradd +DEF_UMASK?= 022 GROUPADD?= /usr/sbin/groupadd NOLOGIN?= ${FALSE} +USERADD?= /usr/sbin/useradd ROOT_USER?= root ROOT_GROUP?= wheel diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index fd3c761e191..6ce1b0b5341 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.8 2001/11/20 16:53:44 jlam Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.9 2001/11/21 12:42:24 agc Exp $ # # Variable definitions for the NetBSD operating system. @@ -61,6 +61,8 @@ GROUPADD?= ${LOCALBASE}/sbin/groupadd DEPENDS+= user>=20000313:../../sysutils/user .endif .endif + +DEF_UMASK?= 0022 NOLOGIN?= /sbin/nologin ROOT_USER?= root diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 3d204ab491a..9f6b5f4aa3e 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.7 2001/11/20 16:19:20 jlam Exp $ +# $NetBSD: defs.SunOS.mk,v 1.8 2001/11/21 12:42:24 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -62,9 +62,10 @@ TYPE?= /usr/bin/type WC?= /usr/bin/wc XARGS?= /usr/bin/xargs -USERADD?= /usr/sbin/useradd +DEF_UMASK?= 022 GROUPADD?= /usr/sbin/groupadd NOLOGIN?= ${FALSE} +USERADD?= /usr/sbin/useradd ROOT_USER?= root ROOT_GROUP?= root |