pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Rename the PKGNAME for the OPSYS-specific user package...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aeb7c6f6fccf
branches:  trunk
changeset: 621558:aeb7c6f6fccf
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jul 12 10:41:58 2013 +0000

description:
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:

 mk/platform/Cygwin.mk          |  4 ++--
 mk/platform/Darwin.mk          |  4 ++--
 mk/platform/IRIX.mk            |  4 ++--
 mk/platform/Interix.mk         |  4 ++--
 sysutils/user_cygwin/Makefile  |  4 ++--
 sysutils/user_darwin/Makefile  |  4 ++--
 sysutils/user_interix/Makefile |  4 ++--
 sysutils/user_irix/Makefile    |  4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diffs (124 lines):

diff -r 0f14c0fecd77 -r aeb7c6f6fccf mk/platform/Cygwin.mk
--- a/mk/platform/Cygwin.mk     Fri Jul 12 00:12:08 2013 +0000
+++ b/mk/platform/Cygwin.mk     Fri Jul 12 10:41:58 2013 +0000
@@ -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 @@
 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 -r 0f14c0fecd77 -r aeb7c6f6fccf mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Fri Jul 12 00:12:08 2013 +0000
+++ b/mk/platform/Darwin.mk     Fri Jul 12 10:41:58 2013 +0000
@@ -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 @@
 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 -r 0f14c0fecd77 -r aeb7c6f6fccf mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Fri Jul 12 00:12:08 2013 +0000
+++ b/mk/platform/IRIX.mk       Fri Jul 12 10:41:58 2013 +0000
@@ -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 @@
 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 -r 0f14c0fecd77 -r aeb7c6f6fccf mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Fri Jul 12 00:12:08 2013 +0000
+++ b/mk/platform/Interix.mk    Fri Jul 12 10:41:58 2013 +0000
@@ -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 @@
 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
diff -r 0f14c0fecd77 -r aeb7c6f6fccf sysutils/user_cygwin/Makefile
--- a/sysutils/user_cygwin/Makefile     Fri Jul 12 00:12:08 2013 +0000
+++ b/sysutils/user_cygwin/Makefile     Fri Jul 12 10:41:58 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2013/03/13 12:35:15 obache Exp $
+# $NetBSD: Makefile,v 1.5 2013/07/12 10:41:58 jperkin Exp $
 #
 
-DISTNAME=              user-20130313
+DISTNAME=              user-cygwin-20130712
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 0f14c0fecd77 -r aeb7c6f6fccf sysutils/user_darwin/Makefile
--- a/sysutils/user_darwin/Makefile     Fri Jul 12 00:12:08 2013 +0000
+++ b/sysutils/user_darwin/Makefile     Fri Jul 12 10:41:58 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 19:51:28 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/12 10:41:58 jperkin Exp $
 #
 
-DISTNAME=              user-20101223
+DISTNAME=              user-darwin-20130712
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 0f14c0fecd77 -r aeb7c6f6fccf sysutils/user_interix/Makefile
--- a/sysutils/user_interix/Makefile    Fri Jul 12 00:12:08 2013 +0000
+++ b/sysutils/user_interix/Makefile    Fri Jul 12 10:41:58 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 19:51:28 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/07/12 10:41:58 jperkin Exp $
 #
 
-DISTNAME=              user-20040426
+DISTNAME=              user-interix-20130712
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 0f14c0fecd77 -r aeb7c6f6fccf sysutils/user_irix/Makefile
--- a/sysutils/user_irix/Makefile       Fri Jul 12 00:12:08 2013 +0000
+++ b/sysutils/user_irix/Makefile       Fri Jul 12 10:41:58 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/10/23 19:51:28 asau Exp $
+# $NetBSD: Makefile,v 1.4 2013/07/12 10:41:58 jperkin Exp $
 #
 
-DISTNAME=              user-20110201
+DISTNAME=              user-irix-20130712
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty



Home | Main Index | Thread Index | Old Index