Update to 5.2.1 and fix build under NetBSD current (post 2.0D). Also change

categories to 'misc'.  From Kibum Han in PR pkg/25642.

Changes since 5.0 include:

* When given -l and similar options, ls now adjusts the output column
  widths to fit the data, so that output lines are shorter and have
  columns that line up better.  This may adversely affect shell
  scripts that expect fixed-width columns, but such shell scripts were
  not portable anyway, even with old GNU ls where the columns became
  ragged when a datum was too wide.

* ls --width=N (for very large N) is no longer subject to an address
  arithmetic bug that could result in bounds violations.

* ls --width=N (with -x or -C) no longer allocates more space
  (potentially much more) than necessary for a given directory.

5 files changed, 47 insertions, 30 deletions

diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 5119dc6f275..92c4ace0861 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/04/24 18:21:42 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/19 16:55:25 jmmv Exp $
 #
 
-DISTNAME=	coreutils-5.0
+DISTNAME=	coreutils-5.2.1
 PKGNAME=	${DISTNAME:S/coreutils/gnuls/}
-CATEGORIES=	sysutils
+CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=coreutils/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/misc/gnuls/distinfo b/misc/gnuls/distinfo
index cb12ada56c7..cc34c2f4120 100644
--- a/misc/gnuls/distinfo
+++ b/misc/gnuls/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/11 23:00:52 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/05/19 16:55:25 jmmv Exp $
 
-SHA1 (coreutils-5.0.tar.bz2) = ce67aacedfc917a92b5be62dd32095393c2f220c
-Size (coreutils-5.0.tar.bz2) = 3952653 bytes
-SHA1 (patch-aa) = c3f6def9f66fc3b680529cbdf72b14d9b5d25499
-SHA1 (patch-ab) = efbd6a22ae20bec21d112f39ffeb7434a04c8a8d
+SHA1 (coreutils-5.2.1.tar.bz2) = 1028755ae0fa9be840576e4837004cf5a9981c45
+Size (coreutils-5.2.1.tar.bz2) = 4270776 bytes
+SHA1 (patch-aa) = 0c671db84fbd6807d186d93898a7398a7bb8c338
+SHA1 (patch-ab) = 98623f76654772ac433ae6af12bbeaf8f4518599
+SHA1 (patch-ac) = a38174cf4c85cdddc23f3b59c7c04679c898c232
diff --git a/misc/gnuls/patches/patch-aa b/misc/gnuls/patches/patch-aa
index 53a4ed128f9..1d0ae68174d 100644
--- a/misc/gnuls/patches/patch-aa
+++ b/misc/gnuls/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2004/02/11 23:06:42 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/19 16:55:25 jmmv Exp $
 
---- Makefile.in.orig	2003-04-02 16:28:41.000000000 +0200
+--- Makefile.in.orig	2004-03-11 09:57:59.000000000 +0100
 +++ Makefile.in
-@@ -149,7 +149,7 @@ sharedstatedir = @sharedstatedir@
+@@ -284,7 +284,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
 -SUBDIRS = lib src doc man m4 po tests
 +SUBDIRS = lib src
  EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
    .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
-   announce-gen \
+   .x-sc_space_tab .x-sc_sun_os_names \
diff --git a/misc/gnuls/patches/patch-ab b/misc/gnuls/patches/patch-ab
index c94dcf687d6..1cb2b233e62 100644
--- a/misc/gnuls/patches/patch-ab
+++ b/misc/gnuls/patches/patch-ab
@@ -1,24 +1,24 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/11 23:00:52 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/19 16:55:25 jmmv Exp $
 
---- src/Makefile.in.orig	2003-04-02 16:46:19.000000000 +0200
+--- src/Makefile.in.orig	2004-03-11 09:59:23.000000000 +0100
 +++ src/Makefile.in
-@@ -267,7 +267,8 @@ BUILT_SOURCES = dircolors.h false.c whee
- # Tell automake to exempt it from that installcheck test.
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false
- 
+@@ -41,7 +41,8 @@ host_triplet = @host@
+ EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
+ 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
+ 	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
+-bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
++bin_PROGRAMS = dircolors$(EXEEXT) ls$(EXEEXT)
++no_bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
+ 	cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
+ 	ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
+ 	vdir$(EXEEXT) ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) \
+@@ -899,7 +900,8 @@ wheel_size = 5
+ # Tell automake to exempt then from that installcheck test.
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false test
+ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 -all_programs = \
 +all_programs = $(bin_PROGRAMS)
 +no_all_programs = \
      $(bin_PROGRAMS) \
      $(bin_SCRIPTS) \
-   $(EXTRA_PROGRAMS) \
-@@ -291,7 +292,8 @@ CONFIG_CLEAN_FILES =
- EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
- 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
- 	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
--bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \
-+bin_PROGRAMS = dircolors$(EXEEXT) ls$(EXEEXT)
-+no_bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \
- 	dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) ginstall$(EXEEXT) \
- 	link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) \
- 	ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) mknod$(EXEEXT) \
+   $(EXTRA_PROGRAMS)
diff --git a/misc/gnuls/patches/patch-ac b/misc/gnuls/patches/patch-ac
new file mode 100644
index 00000000000..d89c97e7f65
--- /dev/null
+++ b/misc/gnuls/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2004/05/19 16:55:25 jmmv Exp $
+
+--- lib/mountlist.c.orig	2004-01-26 09:58:12.000000000 +0100
++++ lib/mountlist.c	2004-05-18 20:56:57.000000000 +0200
+@@ -173,6 +173,11 @@
+ 
+ #if MOUNTED_GETMNTINFO
+ 
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++# define statfs				statvfs
++# define HAVE_F_FSTYPENAME_IN_STATFS	1
++# endif
++
+ # if ! HAVE_F_FSTYPENAME_IN_STATFS
+ static char *
+ fstype_to_string (short t)