Index: sysutils/user_cygwin/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/user_cygwin/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/user_cygwin/Makefile	13 Mar 2013 12:35:15 -0000	1.4
+++ sysutils/user_cygwin/Makefile	18 Apr 2013 08:53:14 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2013/03/13 12:35:15 obache Exp $
 #
 
-DISTNAME=		user-20130313
+DISTNAME=		user-cygwin-20130313
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
Index: sysutils/user_darwin/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/user_darwin/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sysutils/user_darwin/Makefile	23 Oct 2012 19:51:28 -0000	1.11
+++ sysutils/user_darwin/Makefile	18 Apr 2013 08:53:14 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.11 2012/10/23 19:51:28 asau Exp $
 #
 
-DISTNAME=		user-20101223
+DISTNAME=		user-darwin-20101223
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
Index: sysutils/user_interix/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/user_interix/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- sysutils/user_interix/Makefile	23 Oct 2012 19:51:28 -0000	1.10
+++ sysutils/user_interix/Makefile	18 Apr 2013 08:53:14 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.10 2012/10/23 19:51:28 asau Exp $
 #
 
-DISTNAME=		user-20040426
+DISTNAME=		user-interix-20040426
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
Index: sysutils/user_irix/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/user_irix/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sysutils/user_irix/Makefile	23 Oct 2012 19:51:28 -0000	1.3
+++ sysutils/user_irix/Makefile	18 Apr 2013 08:53:14 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/10/23 19:51:28 asau Exp $
 #
 
-DISTNAME=		user-20110201
+DISTNAME=		user-irix-20110201
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
Index: mk/platform/Cygwin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Cygwin.mk,v
retrieving revision 1.11
diff -u -r1.11 Cygwin.mk
--- mk/platform/Cygwin.mk	13 Mar 2013 12:38:19 -0000	1.11
+++ mk/platform/Cygwin.mk	18 Apr 2013 08:53:14 -0000
@@ -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>=20130313:../../sysutils/user_cygwin
 
 CPP_PRECOMP_FLAGS?=	# unset
 CONFIG_RPATH_OVERRIDE?=	config.rpath */config.rpath */*/config.rpath
Index: mk/platform/Darwin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Darwin.mk,v
retrieving revision 1.50
diff -u -r1.50 Darwin.mk
--- mk/platform/Darwin.mk	4 Feb 2013 15:53:16 -0000	1.50
+++ mk/platform/Darwin.mk	18 Apr 2013 08:53:14 -0000
@@ -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>=20040801:../../sysutils/user_darwin
 
 _OPSYS_EMULDIR.darwin=	# empty
 
Index: mk/platform/IRIX.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/IRIX.mk,v
retrieving revision 1.40
diff -u -r1.40 IRIX.mk
--- mk/platform/IRIX.mk	19 Mar 2012 12:34:17 -0000	1.40
+++ mk/platform/IRIX.mk	18 Apr 2013 08:53:14 -0000
@@ -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-[0-9]*:../../sysutils/user_irix
 
 _OPSYS_EMULDIR.irix=	# empty
 
Index: mk/platform/Interix.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Interix.mk,v
retrieving revision 1.68
diff -u -r1.68 Interix.mk
--- mk/platform/Interix.mk	19 Nov 2012 11:34:15 -0000	1.68
+++ mk/platform/Interix.mk	18 Apr 2013 08:53:14 -0000
@@ -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>=20040426:../../sysutils/user_interix
 
 CPP_PRECOMP_FLAGS?=	# unset
 CONFIG_RPATH_OVERRIDE?=	config.rpath */config.rpath */*/config.rpath