diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-07-12 10:41:58 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-07-12 10:41:58 +0000 |
| commit | d94ce393d3a1580661c6762e8fd325cf53115378 (patch) | |
| tree | a3451082e1560b738d75f804e29d005c0e979e6c /mk | |
| parent | 20a0ee1bdc9f1b71b30da6a90ce9aa145d7c0288 (diff) | |
| download | pkgsrc-d94ce393d3a1580661c6762e8fd325cf53115378.tar.gz | |
Rename the PKGNAME for the OPSYS-specific user packages to include the OPSYS,
so that they are correctly calculated as independent.
This avoids issues in bulk builds where the package version was taking
precedence and causing the wrong user package to be depended upon.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/platform/Cygwin.mk | 4 | ||||
| -rw-r--r-- | mk/platform/Darwin.mk | 4 | ||||
| -rw-r--r-- | mk/platform/IRIX.mk | 4 | ||||
| -rw-r--r-- | mk/platform/Interix.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk index d611a931e32..b13f51f82b6 100644 --- a/mk/platform/Cygwin.mk +++ b/mk/platform/Cygwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Cygwin.mk,v 1.12 2013/04/28 12:53:56 obache Exp $ +# $NetBSD: Cygwin.mk,v 1.13 2013/07/12 10:41:58 jperkin Exp $ # # Variable definitions for the Windows with Cygwin. @@ -17,7 +17,7 @@ TYPE?= type # Shell builtin USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _PKG_USER_HOME?= # empty by default -_USER_DEPENDS= user>=20130313:../../sysutils/user_cygwin +_USER_DEPENDS= user-cygwin>=20130712:../../sysutils/user_cygwin CPP_PRECOMP_FLAGS?= # unset CONFIG_RPATH_OVERRIDE?= config.rpath */config.rpath */*/config.rpath diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 5f37c4b7663..5e7082f340c 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.52 2013/04/28 12:53:56 obache Exp $ +# $NetBSD: Darwin.mk,v 1.53 2013/07/12 10:41:58 jperkin Exp $ # # Variable definitions for the Darwin operating system. @@ -67,7 +67,7 @@ ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` GROUPADD?= ${LOCALBASE}/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd _PKG_USER_HOME?= /var/empty # to match other system accounts -_USER_DEPENDS= user>=20040801:../../sysutils/user_darwin +_USER_DEPENDS= user-darwin>=20130712:../../sysutils/user_darwin _OPSYS_EMULDIR.darwin= # empty diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index f0ae18a8c84..cb98b78ef6a 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.mk,v 1.41 2013/04/28 12:53:56 obache Exp $ +# $NetBSD: IRIX.mk,v 1.42 2013/07/12 10:41:58 jperkin Exp $ # # Variable definitions for the IRIX operating system. @@ -33,7 +33,7 @@ ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v` USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _PKG_USER_HOME?= /dev/null # to match other system accounts -_USER_DEPENDS= user-[0-9]*:../../sysutils/user_irix +_USER_DEPENDS= user-irix>=20130712:../../sysutils/user_irix _OPSYS_EMULDIR.irix= # empty diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk index c3019e4456a..e18dc427cc5 100644 --- a/mk/platform/Interix.mk +++ b/mk/platform/Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.mk,v 1.69 2013/04/28 12:53:56 obache Exp $ +# $NetBSD: Interix.mk,v 1.70 2013/07/12 10:41:58 jperkin Exp $ # # Variable definitions for the Interix operating system. @@ -85,7 +85,7 @@ TYPE?= type # Shell builtin USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _PKG_USER_HOME?= # empty by default -_USER_DEPENDS= user>=20040426:../../sysutils/user_interix +_USER_DEPENDS= user-interix>=20130712:../../sysutils/user_interix CPP_PRECOMP_FLAGS?= # unset CONFIG_RPATH_OVERRIDE?= config.rpath */config.rpath */*/config.rpath |