sysutils/coreutils: 8.22 -> 8.23

- fix CONFLICTS

PR:		192304
Submitted by:	jharris@widomaker.com (maintainer)

3 files changed, 52 insertions, 86 deletions

diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index e710f369b8a9..d700ef3f8c24 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,9 +1,7 @@
-# Created by: Jason Harris <jharris@widomaker.com>
 # $FreeBSD$
 
 PORTNAME=	coreutils
-PORTVERSION=	8.22
-PORTREVISION=	2
+PORTVERSION=	8.23
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	GNU
 
@@ -13,7 +11,7 @@ COMMENT=	Free Software Foundation core utilities
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	id-utils-[0-9]* linux-gid-[0-9]*
+CONFLICTS=	idutils-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index ad1d2ab1e891..4297a36c0237 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (coreutils-8.22.tar.xz) = 5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212
-SIZE (coreutils-8.22.tar.xz) = 5335124
+SHA256 (coreutils-8.23.tar.xz) = ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d
+SIZE (coreutils-8.23.tar.xz) = 5375612
diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist
index 44b8d0446d86..c0c228f385d9 100644
--- a/sysutils/coreutils/pkg-plist
+++ b/sysutils/coreutils/pkg-plist
@@ -289,83 +289,51 @@ man/man1/gyes.1.gz
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/zh_TW/LC_TIME/coreutils.mo
 @dirrm libexec/coreutils
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_TIME
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_TIME
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/vi/LC_TIME
-%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk/LC_TIME
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr/LC_TIME
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv/LC_TIME
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl/LC_TIME
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk/LC_TIME
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru/LC_TIME
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro/LC_TIME
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_TIME
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt/LC_TIME
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl/LC_TIME
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl/LC_TIME
-%%NLS%%@dirrmtry share/locale/nb/LC_TIME
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ms/LC_TIME
-%%NLS%%@dirrmtry share/locale/lg/LC_TIME
-%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lg/
-%%NLS%%@dirrmtry share/locale/lt/LC_TIME
-%%NLS%%@dirrmtry share/locale/ko/LC_TIME
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk/LC_TIME
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ja/LC_TIME
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it/LC_TIME
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ia/LC_TIME
-%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ia
-%%NLS%%@dirrmtry share/locale/id/LC_TIME
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu/LC_TIME
-%%NLS%%@dirrmtry share/locale/hr/LC_TIME
-%%NLS%%@dirrmtry share/locale/gl/LC_TIME
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ga/LC_TIME
-%%NLS%%@dirrmtry share/locale/ga/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr/LC_TIME
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi/LC_TIME
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu/LC_TIME
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et/LC_TIME
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es/LC_TIME
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eo/LC_TIME
-%%NLS%%@dirrmtry share/locale/el/LC_TIME
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de/LC_TIME
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da/LC_TIME
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs/LC_TIME
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca/LC_TIME
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bg/LC_TIME
-%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be/LC_TIME
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/af/LC_TIME
+@dirrmtry share/locale/af/LC_TIME
+@dirrmtry share/locale/be/LC_TIME
+@dirrmtry share/locale/bg/LC_TIME
+@dirrmtry share/locale/ca/LC_TIME
+@dirrmtry share/locale/cs/LC_TIME
+@dirrmtry share/locale/da/LC_TIME
+@dirrmtry share/locale/de/LC_TIME
+@dirrmtry share/locale/el/LC_TIME
+@dirrmtry share/locale/eo/LC_TIME
+@dirrmtry share/locale/es/LC_TIME
+@dirrmtry share/locale/et/LC_TIME
+@dirrmtry share/locale/eu/LC_TIME
+@dirrmtry share/locale/fi/LC_TIME
+@dirrmtry share/locale/fr/LC_TIME
+@dirrmtry share/locale/ga/LC_TIME
+@dirrmtry share/locale/gl/LC_TIME
+@dirrmtry share/locale/hr/LC_TIME
+@dirrmtry share/locale/hu/LC_TIME
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia/LC_TIME
+@dirrmtry share/locale/ia
+@dirrmtry share/locale/id/LC_TIME
+@dirrmtry share/locale/it/LC_TIME
+@dirrmtry share/locale/ja/LC_TIME
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk/LC_TIME
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ko/LC_TIME
+@dirrmtry share/locale/lg/LC_MESSAGES
+@dirrmtry share/locale/lg/LC_TIME
+@dirrmtry share/locale/lg
+@dirrmtry share/locale/lt/LC_TIME
+@dirrmtry share/locale/ms/LC_TIME
+@dirrmtry share/locale/nb/LC_TIME
+@dirrmtry share/locale/nl/LC_TIME
+@dirrmtry share/locale/pl/LC_TIME
+@dirrmtry share/locale/pt/LC_TIME
+@dirrmtry share/locale/pt_BR/LC_TIME
+@dirrmtry share/locale/ro/LC_TIME
+@dirrmtry share/locale/ru/LC_TIME
+@dirrmtry share/locale/sk/LC_TIME
+@dirrmtry share/locale/sl/LC_TIME
+@dirrmtry share/locale/sv/LC_TIME
+@dirrmtry share/locale/tr/LC_TIME
+@dirrmtry share/locale/uk/LC_TIME
+@dirrmtry share/locale/vi/LC_TIME
+@dirrmtry share/locale/zh_CN/LC_TIME
+@dirrmtry share/locale/zh_TW/LC_TIME