Update to 6.9 and sync patches with sysutils/coreutils following the update

7 files changed, 105 insertions, 60 deletions

diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index dddf0ac8985..2d7aba223c0 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:00 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/20 12:41:29 tnn Exp $
 #
 
-DISTNAME=	coreutils-5.2.1
+DISTNAME=	coreutils-6.9
 PKGNAME=	${DISTNAME:S/coreutils/gnuls/}
-PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=coreutils/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +20,17 @@ BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Interix"
+CONFIGURE_ENV+=		ac_list_mounted_fs=found
+.endif
+
+.if ${OPSYS} != "Linux"
+CONFIGURE_ENV+=		gt_cv_func_gnugettext3_libintl=yes
+.endif
+CONFIGURE_ENV+=		MKDIR_P=${MKDIR:Q}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors \
 		${PREFIX}/bin/${GNU_PROGRAM_PREFIX}dircolors
diff --git a/misc/gnuls/distinfo b/misc/gnuls/distinfo
index f8854b6aeda..4c9af51ba8e 100644
--- a/misc/gnuls/distinfo
+++ b/misc/gnuls/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/01/03 18:02:14 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/07/20 12:41:29 tnn Exp $
 
-SHA1 (coreutils-5.2.1.tar.bz2) = 1028755ae0fa9be840576e4837004cf5a9981c45
-RMD160 (coreutils-5.2.1.tar.bz2) = a72bdb360371c026e77281ae0d543bdcce55a4e6
-Size (coreutils-5.2.1.tar.bz2) = 4270776 bytes
-SHA1 (patch-aa) = 0c671db84fbd6807d186d93898a7398a7bb8c338
-SHA1 (patch-ab) = 98623f76654772ac433ae6af12bbeaf8f4518599
-SHA1 (patch-ac) = 4c067b00acb5546f4de5cb8bf524e97932cd9e88
-SHA1 (patch-ad) = ca9125509ded4d31934eff7c7772717d983ee9e3
-SHA1 (patch-ae) = dfa6030d09550133ae83c7d2b316f6ab0431810f
+SHA1 (coreutils-6.9.tar.bz2) = 10310a78c4e1d9f742f3815ac28e9bf1086a5885
+RMD160 (coreutils-6.9.tar.bz2) = c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7
+Size (coreutils-6.9.tar.bz2) = 5384378 bytes
+SHA1 (patch-aa) = f1c25c1ca167fbd83680d4ea1dc45771f6800fdb
+SHA1 (patch-ab) = ec3f8be38adbf9bdd14d7ec8c64440b09c66a718
+SHA1 (patch-ac) = 676fd4eaeedf8f94ac6d1894fd16491ce8412cb0
diff --git a/misc/gnuls/patches/patch-aa b/misc/gnuls/patches/patch-aa
index 1d0ae68174d..1fd500441aa 100644
--- a/misc/gnuls/patches/patch-aa
+++ b/misc/gnuls/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2004/05/19 16:55:25 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2007/07/20 12:41:29 tnn Exp $
 
---- Makefile.in.orig	2004-03-11 09:57:59.000000000 +0100
+--- Makefile.in.orig	2007-03-22 22:20:26.000000000 +0100
 +++ Makefile.in
-@@ -284,7 +284,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+@@ -520,7 +520,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = lib src doc man m4 po tests
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib src doc man po tests
 +SUBDIRS = lib src
  EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
-   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
-   .x-sc_space_tab .x-sc_sun_os_names \
+   .gitignore \
+   .hgignore \
diff --git a/misc/gnuls/patches/patch-ab b/misc/gnuls/patches/patch-ab
index 1cb2b233e62..0350777b63f 100644
--- a/misc/gnuls/patches/patch-ab
+++ b/misc/gnuls/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/05/19 16:55:25 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2007/07/20 12:41:29 tnn Exp $
 
---- src/Makefile.in.orig	2004-03-11 09:59:23.000000000 +0100
+--- src/Makefile.in.orig	2007-03-22 22:23:20.000000000 +0100
 +++ src/Makefile.in
-@@ -41,7 +41,8 @@ host_triplet = @host@
+@@ -36,7 +36,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)
@@ -12,10 +12,10 @@ $NetBSD: patch-ab,v 1.2 2004/05/19 16:55:25 jmmv Exp $
  	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)
+@@ -1126,7 +1127,8 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+ # otherwise we may get into trouble with distinct strings that the
+ # current locale considers to be equal.
+ ASSORT = LC_ALL=C sort
 -all_programs = \
 +all_programs = $(bin_PROGRAMS)
 +no_all_programs = \
diff --git a/misc/gnuls/patches/patch-ac b/misc/gnuls/patches/patch-ac
index 913dda4c288..c1e49a694a1 100644
--- a/misc/gnuls/patches/patch-ac
+++ b/misc/gnuls/patches/patch-ac
@@ -1,16 +1,78 @@
-$NetBSD: patch-ac,v 1.2 2005/09/08 22:37:54 abs Exp $
+$NetBSD: patch-ac,v 1.3 2007/07/20 12:41:29 tnn 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 @@
+--- lib/mountlist.c.orig	2007-01-26 23:16:55.000000000 +0100
++++ lib/mountlist.c
+@@ -174,6 +174,11 @@
  
  #if MOUNTED_GETMNTINFO
  
-+# if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)
 +# define statfs				statvfs
-+# define HAVE_F_FSTYPENAME_IN_STATFS	1
++# define HAVE_F_FSTYPENAME_IN_STATFS  1
 +# endif
 +
- # if ! HAVE_F_FSTYPENAME_IN_STATFS
+ # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
  static char *
- fstype_to_string (short t)
+ fstype_to_string (short int t)
+@@ -296,6 +301,10 @@ fstype_to_string (int t)
+ }
+ #endif /* MOUNTED_VMOUNT */
+ 
++#ifdef __INTERIX
++# include <dirent.h>
++# include <sys/statvfs.h>
++#endif
+ 
+ #if defined MOUNTED_GETMNTENT1 || defined MOUNTED_GETMNTENT2
+ 
+@@ -859,6 +868,50 @@ read_file_system_list (bool need_fs_type
+   }
+ #endif /* MOUNTED_VMOUNT. */
+ 
++#ifdef __INTERIX		/* Interix. */
++  {
++    DIR *devfs = opendir ("/dev/fs");
++    struct dirent *de;
++    struct statvfs svfs;
++    char fsname[] = "/dev/fs/#"; /* writable */
++
++    if (devfs == NULL)
++      return NULL;
++
++    while ((de = readdir (devfs)) != NULL)
++      {
++	if (strlen (de->d_name) != 1)
++	  {
++	    /* "Drive letters" should all be exactly one character long. */
++	    continue;
++	  }
++
++	fsname[8] = de->d_name[0];
++
++	if (statvfs (fsname, &svfs) != 0)
++	  {
++	    /* Could be an offline network fs or empty removable; don't fail. */
++	    continue;
++	  }
++
++	me = xmalloc (sizeof *me);
++
++	me->me_devname = xstrdup (svfs.f_mntfromname);
++	me->me_mountdir = xstrdup (svfs.f_mntonname);
++	me->me_type = xstrdup (svfs.f_fstypename);
++	me->me_dev = (dev_t)svfs.f_fsid;
++	me->me_dummy = (svfs.f_type == ST_FSTYPE_OFS ? 1 : 0);
++	me->me_remote = ((svfs.f_type == ST_FSTYPE_SAMBA
++			  || svfs.f_type == ST_FSTYPE_NFS) ? 1 : 0);
++	me->me_type_malloced = 1;
++
++	/* Add to the linked list. */
++	*mtail = me;
++	mtail = &me->me_next;
++      }
++  }
++#endif
++
+   *mtail = NULL;
+   return mount_list;
+ 
diff --git a/misc/gnuls/patches/patch-ad b/misc/gnuls/patches/patch-ad
deleted file mode 100644
index 44057d364a7..00000000000
--- a/misc/gnuls/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/03 18:02:15 joerg Exp $
-
---- configure.orig	2006-01-03 17:51:06.000000000 +0000
-+++ configure
-@@ -39680,6 +39680,7 @@ done
- 
- 
-   fp_headers='
-+#     include <stdio.h>
- #     if HAVE_STDIO_EXT_H
- #      include <stdio_ext.h>
- #     endif
diff --git a/misc/gnuls/patches/patch-ae b/misc/gnuls/patches/patch-ae
deleted file mode 100644
index 24bd57e1afa..00000000000
--- a/misc/gnuls/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/03 18:02:15 joerg Exp $
-
---- src/ls.c.orig	2006-01-03 17:15:34.000000000 +0000
-+++ src/ls.c
-@@ -2528,7 +2528,7 @@ gobble_file (const char *name, enum file
-   else
-     {
-       f->filetype = type;
--#if HAVE_STRUCT_DIRENT_D_TYPE
-+#if HAVE_STRUCT_DIRENT_D_TYPE && defined(DTTOIF)
-       f->stat.st_mode = DTTOIF (type);
- #endif
-       blocks = 0;