pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/coreutils Update to coreutils-6.9 and reset m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c00fb8b14b6a
branches: trunk
changeset: 531038:c00fb8b14b6a
user: tnn <tnn%pkgsrc.org@localhost>
date: Wed Jul 18 11:25:19 2007 +0000
description:
Update to coreutils-6.9 and reset maintainer to tech-pkg@
This is a major update from 5.2.1 and the ChangeLog is far too long to
include here. The update includes many bugfixes, POSIX.1 conformance fixes,
various GNU extensions to command line syntax, translations and some new
tools: gbase64, gsha224sum, gsha256sum, gsha384sum, gsha512sum, gshuf.
diffstat:
sysutils/coreutils/Makefile | 25 +++++++-----
sysutils/coreutils/PLIST | 22 +++++++++-
sysutils/coreutils/distinfo | 29 +++++---------
sysutils/coreutils/patches/patch-aa | 13 ------
sysutils/coreutils/patches/patch-ab | 29 +++++++-------
sysutils/coreutils/patches/patch-ac | 10 ++--
sysutils/coreutils/patches/patch-ad | 18 ++++----
sysutils/coreutils/patches/patch-ae | 15 -------
sysutils/coreutils/patches/patch-af | 15 -------
sysutils/coreutils/patches/patch-ag | 34 +++++------------
sysutils/coreutils/patches/patch-ah | 8 ++--
sysutils/coreutils/patches/patch-ai | 8 ++--
sysutils/coreutils/patches/patch-aj | 13 ------
sysutils/coreutils/patches/patch-ak | 73 -------------------------------------
sysutils/coreutils/patches/patch-ba | 15 -------
sysutils/coreutils/patches/patch-bb | 17 --------
sysutils/coreutils/patches/patch-ca | 36 ------------------
sysutils/coreutils/patches/patch-cb | 24 ------------
18 files changed, 89 insertions(+), 315 deletions(-)
diffs (truncated from 667 to 300 lines):
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile Wed Jul 18 09:18:57 2007 +0000
+++ b/sysutils/coreutils/Makefile Wed Jul 18 11:25:19 2007 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2007/02/22 19:27:11 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/07/18 11:25:19 tnn Exp $
-DISTNAME= coreutils-5.2.1
-PKGREVISION= 2
+DISTNAME= coreutils-6.9
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= recht%NetBSD.org@localhost
+MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.gnu.org/software/coreutils/
COMMENT= GNU basic file, shell and text manipulation utilities
@@ -15,20 +14,18 @@
CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
GNU_CONFIGURE= YES
-USE_TOOLS+= msgfmt perl
+USE_TOOLS+= msgfmt msgmerge perl xgettext
USE_PKGLOCALEDIR= YES
INFO_FILES= # PLIST
TEST_TARGET= check
-SUBST_CLASSES+= root
-SUBST_MESSAGE.root= Fixing hardcoded root.
-SUBST_STAGE.root= post-patch
-SUBST_FILES.root= src/Makefile.in
-SUBST_SED.root= -e 's, root , ${ROOT_USER} ,g'
+.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Interix"
+CONFIGURE_ENV+= ac_list_mounted_fs=found
+.endif
# Exclude programs from PLIST which aren't built on a platform.
.if ${OPSYS} == "Interix"
@@ -37,6 +34,12 @@
PLIST_SUBST+= COREUTILS_HAVE_HOSTID=""
.endif
+# XXX - this hack is bound to cause fallout on some platform at some point.
+# How can we determine the API version of the builtin gettext?
+.if ${OPSYS} != "Linux"
+CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes
+.endif
+
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
# if GNU_PROGRAM_PREFIX == 'g'
# devel/id-utils installs a 'gid' program, so conflict with it
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/PLIST
--- a/sysutils/coreutils/PLIST Wed Jul 18 09:18:57 2007 +0000
+++ b/sysutils/coreutils/PLIST Wed Jul 18 11:25:19 2007 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/07/18 11:25:19 tnn Exp $
bin/${GNU_PROGRAM_PREFIX}[
+bin/${GNU_PROGRAM_PREFIX}base64
bin/${GNU_PROGRAM_PREFIX}basename
bin/${GNU_PROGRAM_PREFIX}cat
bin/${GNU_PROGRAM_PREFIX}chgrp
@@ -60,7 +61,12 @@
bin/${GNU_PROGRAM_PREFIX}rmdir
bin/${GNU_PROGRAM_PREFIX}seq
bin/${GNU_PROGRAM_PREFIX}sha1sum
+bin/${GNU_PROGRAM_PREFIX}sha224sum
+bin/${GNU_PROGRAM_PREFIX}sha256sum
+bin/${GNU_PROGRAM_PREFIX}sha384sum
+bin/${GNU_PROGRAM_PREFIX}sha512sum
bin/${GNU_PROGRAM_PREFIX}shred
+bin/${GNU_PROGRAM_PREFIX}shuf
bin/${GNU_PROGRAM_PREFIX}sleep
bin/${GNU_PROGRAM_PREFIX}sort
bin/${GNU_PROGRAM_PREFIX}split
@@ -90,6 +96,7 @@
bin/${GNU_PROGRAM_PREFIX}whoami
bin/${GNU_PROGRAM_PREFIX}yes
info/coreutils.info
+man/man1/${GNU_PROGRAM_PREFIX}base64.1
man/man1/${GNU_PROGRAM_PREFIX}basename.1
man/man1/${GNU_PROGRAM_PREFIX}cat.1
man/man1/${GNU_PROGRAM_PREFIX}chgrp.1
@@ -150,7 +157,12 @@
man/man1/${GNU_PROGRAM_PREFIX}rmdir.1
man/man1/${GNU_PROGRAM_PREFIX}seq.1
man/man1/${GNU_PROGRAM_PREFIX}sha1sum.1
+man/man1/${GNU_PROGRAM_PREFIX}sha224sum.1
+man/man1/${GNU_PROGRAM_PREFIX}sha256sum.1
+man/man1/${GNU_PROGRAM_PREFIX}sha384sum.1
+man/man1/${GNU_PROGRAM_PREFIX}sha512sum.1
man/man1/${GNU_PROGRAM_PREFIX}shred.1
+man/man1/${GNU_PROGRAM_PREFIX}shuf.1
man/man1/${GNU_PROGRAM_PREFIX}sleep.1
man/man1/${GNU_PROGRAM_PREFIX}sort.1
man/man1/${GNU_PROGRAM_PREFIX}split.1
@@ -181,6 +193,7 @@
man/man1/${GNU_PROGRAM_PREFIX}yes.1
share/locale/af/LC_MESSAGES/coreutils.mo
share/locale/be/LC_MESSAGES/coreutils.mo
+share/locale/bg/LC_MESSAGES/coreutils.mo
share/locale/ca/LC_MESSAGES/coreutils.mo
share/locale/cs/LC_MESSAGES/coreutils.mo
share/locale/da/LC_MESSAGES/coreutils.mo
@@ -188,6 +201,7 @@
share/locale/el/LC_MESSAGES/coreutils.mo
share/locale/es/LC_MESSAGES/coreutils.mo
share/locale/et/LC_MESSAGES/coreutils.mo
+share/locale/eu/LC_MESSAGES/coreutils.mo
share/locale/fi/LC_MESSAGES/coreutils.mo
share/locale/fr/LC_MESSAGES/coreutils.mo
share/locale/ga/LC_MESSAGES/coreutils.mo
@@ -196,7 +210,6 @@
share/locale/it/LC_MESSAGES/coreutils.mo
share/locale/ja/LC_MESSAGES/coreutils.mo
share/locale/ko/LC_MESSAGES/coreutils.mo
-share/locale/lg/LC_MESSAGES/coreutils.mo
share/locale/ms/LC_MESSAGES/coreutils.mo
share/locale/nb/LC_MESSAGES/coreutils.mo
share/locale/nl/LC_MESSAGES/coreutils.mo
@@ -205,6 +218,7 @@
share/locale/pt/LC_MESSAGES/coreutils.mo
share/locale/pt_BR/LC_MESSAGES/coreutils.mo
share/locale/ru/LC_MESSAGES/coreutils.mo
+share/locale/rw/LC_MESSAGES/coreutils.mo
share/locale/sk/LC_MESSAGES/coreutils.mo
share/locale/sl/LC_MESSAGES/coreutils.mo
share/locale/sv/LC_MESSAGES/coreutils.mo
@@ -213,6 +227,7 @@
share/locale/zh_TW/LC_MESSAGES/coreutils.mo
share/locale/af/LC_TIME/coreutils.mo
share/locale/be/LC_TIME/coreutils.mo
+share/locale/bg/LC_TIME/coreutils.mo
share/locale/ca/LC_TIME/coreutils.mo
share/locale/cs/LC_TIME/coreutils.mo
share/locale/da/LC_TIME/coreutils.mo
@@ -220,6 +235,7 @@
share/locale/el/LC_TIME/coreutils.mo
share/locale/es/LC_TIME/coreutils.mo
share/locale/et/LC_TIME/coreutils.mo
+share/locale/eu/LC_TIME/coreutils.mo
share/locale/fi/LC_TIME/coreutils.mo
share/locale/fr/LC_TIME/coreutils.mo
share/locale/ga/LC_TIME/coreutils.mo
@@ -228,7 +244,6 @@
share/locale/it/LC_TIME/coreutils.mo
share/locale/ja/LC_TIME/coreutils.mo
share/locale/ko/LC_TIME/coreutils.mo
-share/locale/lg/LC_TIME/coreutils.mo
share/locale/ms/LC_TIME/coreutils.mo
share/locale/nb/LC_TIME/coreutils.mo
share/locale/nl/LC_TIME/coreutils.mo
@@ -237,6 +252,7 @@
share/locale/pt/LC_TIME/coreutils.mo
share/locale/pt_BR/LC_TIME/coreutils.mo
share/locale/ru/LC_TIME/coreutils.mo
+share/locale/rw/LC_TIME/coreutils.mo
share/locale/sk/LC_TIME/coreutils.mo
share/locale/sl/LC_TIME/coreutils.mo
share/locale/sv/LC_TIME/coreutils.mo
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/distinfo
--- a/sysutils/coreutils/distinfo Wed Jul 18 09:18:57 2007 +0000
+++ b/sysutils/coreutils/distinfo Wed Jul 18 11:25:19 2007 +0000
@@ -1,20 +1,11 @@
-$NetBSD: distinfo,v 1.11 2006/01/09 22:45:08 joerg Exp $
+$NetBSD: distinfo,v 1.12 2007/07/18 11:25:19 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) = 36c3a4a810bdc9efd7b0c3a6dc4203e0cfcbfae5
-SHA1 (patch-ab) = 630fad1a3b044b99cb8cefeb3518631e71e46db9
-SHA1 (patch-ac) = b7a527c55bba56f01f02692dc113bd912b6e7dce
-SHA1 (patch-ad) = 3b61ead0225d17667d27a6a0e379d5aabc75b0df
-SHA1 (patch-ae) = 1dda20cdc03336694b2c8dd42de159168de1f28d
-SHA1 (patch-af) = cd7deba7a8ecdf17b39668a9d5a80323e1a02c06
-SHA1 (patch-ag) = 20deb326e88b2d0a275b4a16b84ea43a9e280d79
-SHA1 (patch-ah) = 3f56cd4e1c657551f4967928ebea19df23c0d850
-SHA1 (patch-ai) = e9964ba9e3fd6ec8f2728e53439a960a6dd0a32f
-SHA1 (patch-aj) = dfa6030d09550133ae83c7d2b316f6ab0431810f
-SHA1 (patch-ak) = 2ad4d42f852db0efc9d3dee37bee43dc7d499f8d
-SHA1 (patch-ba) = 3867a17e0ad8f7c87c91ec8e511972a6255062dd
-SHA1 (patch-bb) = ade6f8e0aa73478270f568dba25e79f825374c02
-SHA1 (patch-ca) = 4d99367f5d4b35f6897b4321f2166c94ab93f9d8
-SHA1 (patch-cb) = de1896d77504b8fd82da8e2cdf6b8a82a31ba09f
+SHA1 (coreutils-6.9.tar.bz2) = 10310a78c4e1d9f742f3815ac28e9bf1086a5885
+RMD160 (coreutils-6.9.tar.bz2) = c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7
+Size (coreutils-6.9.tar.bz2) = 5384378 bytes
+SHA1 (patch-ab) = 676fd4eaeedf8f94ac6d1894fd16491ce8412cb0
+SHA1 (patch-ac) = bed05fb1ba7102e9042357caea32767c88bff332
+SHA1 (patch-ad) = eb10a960047957b4142e06aff363cf35249df70c
+SHA1 (patch-ag) = 3e24b8e025a151eb7bed4c778a326da5eed09ded
+SHA1 (patch-ah) = 3a101d45bb5fc502dd5402e0df587494d1844597
+SHA1 (patch-ai) = 6b05293d6d151ca28ed897c47a1dad729306b770
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/patches/patch-aa
--- a/sysutils/coreutils/patches/patch-aa Wed Jul 18 09:18:57 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/03/29 09:22:51 recht Exp $
-
---- lib/Makefile.in.orig 2004-03-11 09:57:59.000000000 +0100
-+++ lib/Makefile.in 2004-03-13 14:29:07.000000000 +0100
-@@ -905,7 +905,7 @@
-
- install-data-am:
-
--install-exec-am: install-exec-local
-+install-exec-am:
-
- install-info: install-info-am
-
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/patches/patch-ab
--- a/sysutils/coreutils/patches/patch-ab Wed Jul 18 09:18:57 2007 +0000
+++ b/sysutils/coreutils/patches/patch-ab Wed Jul 18 11:25:19 2007 +0000
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.7 2005/08/28 09:07:21 tron Exp $
+$NetBSD: patch-ab,v 1.8 2007/07/18 11:25:20 tnn Exp $
---- lib/mountlist.c.orig Mon Jan 26 03:58:12 2004
+--- lib/mountlist.c.orig 2007-01-26 23:16:55.000000000 +0100
+++ lib/mountlist.c
-@@ -173,6 +173,11 @@ xatoi (char *cp)
+@@ -174,6 +174,11 @@
#if MOUNTED_GETMNTINFO
+# 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)
-@@ -296,6 +301,11 @@ fstype_to_string (int t)
+ fstype_to_string (short int t)
+@@ -296,6 +301,10 @@ fstype_to_string (int t)
}
#endif /* MOUNTED_VMOUNT */
@@ -22,15 +22,13 @@
+# include <dirent.h>
+# include <sys/statvfs.h>
+#endif
-+
- /* Return a list of the currently mounted filesystems, or NULL on error.
- Add each entry to the tail of the list so that they stay in order.
- If NEED_FS_TYPE is nonzero, ensure that the filesystem type fields in
-@@ -804,6 +814,50 @@ read_filesystem_list (int need_fs_type)
- free (entries);
+
+ #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");
@@ -74,6 +72,7 @@
+ }
+ }
+#endif
-
++
*mtail = NULL;
return mount_list;
+
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/patches/patch-ac
--- a/sysutils/coreutils/patches/patch-ac Wed Jul 18 09:18:57 2007 +0000
+++ b/sysutils/coreutils/patches/patch-ac Wed Jul 18 11:25:19 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.6 2005/08/28 09:07:21 tron Exp $
+$NetBSD: patch-ac,v 1.7 2007/07/18 11:25:20 tnn Exp $
---- src/stat.c.orig Thu Feb 5 08:46:12 2004
+--- src/stat.c.orig 2007-03-18 22:36:43.000000000 +0100
+++ src/stat.c
-@@ -86,6 +86,12 @@
- # endif
- #endif
+@@ -148,6 +148,12 @@ statfs (char const *filename, struct fs_
+ #define hextobin(c) ((c) >= 'a' && (c) <= 'f' ? (c) - 'a' + 10 : \
+ (c) >= 'A' && (c) <= 'F' ? (c) - 'A' + 10 : (c) - '0')
+#if (defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)) || defined(__INTERIX)
+#include <sys/statvfs.h>
diff -r 04219b5bf189 -r c00fb8b14b6a sysutils/coreutils/patches/patch-ad
--- a/sysutils/coreutils/patches/patch-ad Wed Jul 18 09:18:57 2007 +0000
Home |
Main Index |
Thread Index |
Old Index