Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=617d58bc120c9b0b71e9df9125b1243658d88ced
commit 617d58bc120c9b0b71e9df9125b1243658d88ced Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Fri Feb 8 14:29:35 2008 +0100 coreutils-6.10-1-i686 version bump diff --git a/source/base/coreutils/001_all_coreutils-gen-progress-bar.patch b/source/base/coreutils/001_all_coreutils-gen-progress-bar.patch deleted file mode 100644 index 2d66d95..0000000 --- a/source/base/coreutils/001_all_coreutils-gen-progress-bar.patch +++ /dev/null @@ -1,416 +0,0 @@ -Upstream has been contacted about this a few times ... - -they dont want progress bars in mv/cp: -http://lists.gnu.org/archive/html/bug-coreutils/2003-08/msg00114.html -http://lists.gnu.org/archive/html/bug-coreutils/2003-09/msg00083.html -http://lists.gnu.org/archive/html/bug-coreutils/2003-09/msg00084.html - -but they don't seem to mind a general util ... add this to future patchset: -http://lists.gnu.org/archive/html/bug-coreutils/2003-09/msg00101.html -http://lists.gnu.org/archive/html/bug-coreutils/2004-02/msg00071.html - ---- coreutils/src/copy.c -+++ coreutils/src/copy.c -@@ -17,6 +17,8 @@ - - /* Extracted from cp.c and librarified by Jim Meyering. */ - -+/* Progress bar support added by Miika Pekkarinen. [EMAIL PROTECTED] */ -+ - #include <config.h> - #include <stdio.h> - #include <assert.h> -@@ -29,6 +31,10 @@ - # include <priv.h> - #endif - -+#ifdef GWINSZ_IN_SYS_IOCTL -+# include <sys/ioctl.h> -+#endif -+ - #include "system.h" - #include "acl.h" - #include "backupfile.h" -@@ -50,6 +56,9 @@ - #include "utimens.h" - #include "xreadlink.h" - #include "yesno.h" -+#include "xstrtol.h" -+#include "human.h" -+#include "quotearg.h" - - #ifndef HAVE_FCHOWN - # define HAVE_FCHOWN false -@@ -85,6 +92,8 @@ struct F_triple - /* Initial size of the above hash table. */ - #define DEST_INFO_INITIAL_CAPACITY 61 - -+#define SAMPLE_MAX 10 -+ - static bool copy_internal (char const *src_name, char const *dst_name, - bool new_dst, dev_t device, - struct dir_list *ancestors, -@@ -191,6 +200,31 @@ copy_dir (char const *src_name_in, char - #endif - } - -+/* Shorten a string '/long path/long file' to 'long fi...' -+ Also adds padding bytes to end of the string if necessary */ -+char *shorten_name(const char *str, size_t max_width) -+{ -+ char *shortname; -+ const char *filename; -+ size_t len; -+ -+ filename = base_name (str); -+ len = strlen(filename); -+ shortname = (char *) xmalloc (max_width + 1); -+ strncpy (shortname, filename, max_width); -+ shortname[max_width] = '\0'; -+ if (len > max_width) -+ { -+ memset(shortname + max_width - 3, '.', 3); -+ } -+ else -+ { -+ memset(shortname + len, ' ', max_width - len); -+ } -+ -+ return shortname; -+} -+ - /* Copy a regular file from SRC_NAME to DST_NAME. - If the source file contains holes, copies holes and blocks of zeros - in the source file as holes in the destination file. -@@ -222,6 +287,19 @@ copy_reg (char const *src_name, char con - struct stat sb; - struct stat src_open_sb; - bool return_val = true; -+ time_t t_start; -+ time_t t_last; -+ time_t t_now; -+ off_t last_bytes = 0; -+ int progress_bar_printed = 0; -+ char *shortname = NULL; -+ off_t sample_window[SAMPLE_MAX]; -+ off_t sample_sum = 0; -+ int sample_count = 0; -+ long int line_length = 0; -+#ifdef TIOCGWINSZ -+ struct winsize ws; -+#endif - - source_desc = open (src_name, O_RDONLY | O_BINARY); - if (source_desc < 0) -@@ -326,6 +404,9 @@ copy_reg (char const *src_name, char con - buf_alloc = xmalloc (buf_size + buf_alignment_slop); - buf = ptr_align (buf_alloc, buf_alignment); - -+ time (&t_start); -+ t_last = t_start; -+ - for (;;) - { - word *wp = NULL; -@@ -390,6 +471,110 @@ copy_reg (char const *src_name, char con - if (n_read != buf_size && S_ISREG (src_open_sb.st_mode)) - break; - } -+ -+ time (&t_now); -+ -+ /* Progress bar stuff */ -+ if (! x->pbar_show || t_now - t_start < x->pbar_delay) -+ { -+ continue; -+ } -+ -+ if (! progress_bar_printed) -+ { -+ /* Column width check code copied from ls.c */ -+ char const *p = getenv ("COLUMNS"); -+ if (p && *p) -+ { -+ long int tmp_long; -+ if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK -+ && 0 < tmp_long && tmp_long <= INT_MAX) -+ { -+ line_length = tmp_long; -+ } -+ else -+ { -+ error (0, 0, -+ _("ignoring invalid width in environment \ -+ variable COLUMNS: %s"), -+ quotearg (p)); -+ } -+ } -+ -+#ifdef TIOCGWINSZ -+ if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && ws.ws_col != 0) -+ { -+ line_length = ws.ws_col; -+ } -+#endif -+ if (line_length < 50) -+ { -+ continue; -+ } -+ -+ /* Take a short filename for progress bar */ -+ shortname = shorten_name(src_name, line_length - 48); -+ progress_bar_printed = 1; -+ } -+ -+ if (t_now == t_last) -+ { -+ continue; -+ } -+ -+ if (sample_count == SAMPLE_MAX) -+ { -+ int i; -+ -+ sample_sum -= sample_window[0]; -+ for (i = 0; i < SAMPLE_MAX - 1; i++) -+ { -+ sample_window[i] = sample_window[i + 1]; -+ } -+ } -+ else -+ { -+ sample_count++; -+ } -+ -+ { -+ char str_size[LONGEST_HUMAN_READABLE + 1]; -+ char str_speed[LONGEST_HUMAN_READABLE + 1]; -+ char etabuf[64]; -+ time_t t_temp; -+ -+ sample_window[sample_count - 1] = (n_read_total - last_bytes) / -+ (t_now - t_last); -+ sample_sum += sample_window[sample_count - 1]; -+ -+ /* Calculate the remaining time */ -+ t_temp = (src_open_sb.st_size - n_read_total) / (sample_sum / sample_count); -+ -+ /* Don't print the progress bar if the estimated remaining -+ time is low. */ -+ if (progress_bar_printed == 1 && t_temp < x->pbar_min_est) -+ { -+ continue; -+ } -+ progress_bar_printed = 2; -+ -+ strftime(etabuf, sizeof etabuf, "%H:%M.%S", -+ gmtime(&t_temp)); -+ printf (_("%s | %3lu%% | %9s | %9s/s | ETA %s\r"), shortname, -+ (unsigned long)(n_read_total * 100 / src_open_sb.st_size), -+ human_readable(src_open_sb.st_size, str_size, human_autoscale|human_base_1024|human_space_before_unit|human_SI|human_B, 1, 1), -+ human_readable(sample_sum / sample_count, str_speed, human_autoscale|human_base_1024|human_space_before_unit|human_SI|human_B, 1, 1), -+ etabuf); -+ fflush (stdout); -+ t_last = t_now; -+ last_bytes = n_read_total; -+ } -+ } -+ -+ /* Print a newline if progress bar is enabled and has been shown */ -+ if (progress_bar_printed == 2) -+ { -+ printf ("%s | 100%%\n", shortname); - } - - /* If the file ends with a `hole', we need to do something to record -@@ -488,6 +676,11 @@ close_src_desc: - return_val = false; - } - -+ if (shortname != NULL) -+ { -+ free (shortname); -+ } -+ - free (buf_alloc); - return return_val; - } ---- coreutils/src/copy.h -+++ coreutils/src/copy.h -@@ -175,6 +175,16 @@ struct cp_options - /* If true, display the names of the files before copying them. */ - bool verbose; - -+ /* If true, display a progress bar when the following conditions are -+ * met: -+ - pbar_delay defines how many seconds to wait before considering to -+ display the progress bar -+ - pbar_min_est defines how many seconds estimated operation complete -+ time should be at least to show the progress bar. */ -+ bool pbar_show; -+ int pbar_delay; -+ int pbar_min_est; -+ - /* If true, stdin is a tty. */ - bool stdin_tty; - ---- coreutils/src/cp.c -+++ coreutils/src/cp.c -@@ -81,6 +81,14 @@ enum - /* Initial number of entries in the inode hash table. */ - #define INITIAL_ENTRY_TAB_SIZE 70 - -+/* Initial settings for progress bar when it's enabled. -+ PROGRESS_DELAY defines how many seconds to wait before even -+ considering to display a proggress bar. -+ PROGRESS_MIN_EST defines how many seconds estimated operation -+ complete time should be at least to show the progress bar. */ -+#define PROGRESS_DELAY 5 -+#define PROGRESS_MIN_EST 5 -+ - /* The invocation name of this program. */ - char *program_name; - -@@ -120,6 +128,7 @@ static struct option const long_opts[] = - {"copy-contents", no_argument, NULL, COPY_CONTENTS_OPTION}, - {"dereference", no_argument, NULL, 'L'}, - {"force", no_argument, NULL, 'f'}, -+ {"progress", no_argument, NULL, 'g'}, - {"interactive", no_argument, NULL, 'i'}, - {"link", no_argument, NULL, 'l'}, - {"no-dereference", no_argument, NULL, 'P'}, -@@ -176,6 +185,8 @@ Mandatory arguments to long options are - fputs (_("\ - -f, --force if an existing destination file cannot be\n\ - opened, remove it and try again\n\ -+ -g, --progress show a progress bar if operation is going to\n\ -+ take a long time\n\ - -i, --interactive prompt before overwrite\n\ - -H follow command-line symbolic links\n\ - "), stdout); -@@ -705,6 +716,11 @@ cp_option_init (struct cp_options *x) - - x->update = false; - x->verbose = false; -+ -+ x->pbar_show = false; -+ x->pbar_delay = PROGRESS_DELAY; -+ x->pbar_min_est = PROGRESS_MIN_EST; -+ - x->dest_info = NULL; - x->src_info = NULL; - } -@@ -811,7 +827,7 @@ main (int argc, char **argv) - we'll actually use backup_suffix_string. */ - backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - -- while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T", -+ while ((c = getopt_long (argc, argv, "abdfgHilLprst:uvxPRS:T", - long_opts, NULL)) - != -1) - { -@@ -871,6 +887,10 @@ main (int argc, char **argv) - x.dereference = DEREF_NEVER; - break; - -+ case 'g': -+ x.pbar_show = true; -+ break; -+ - case NO_PRESERVE_ATTRIBUTES_OPTION: - decode_preserve_arg (optarg, &x, false); - break; ---- coreutils/src/mv.c -+++ coreutils/src/mv.c -@@ -45,6 +45,14 @@ - /* Initial number of entries in the inode hash table. */ - #define INITIAL_ENTRY_TAB_SIZE 70 - -+/* Initial settings for progress bar when it's enabled. -+ PROGRESS_DELAY defines how many seconds to wait before even -+ considering to display a proggress bar. -+ PROGRESS_MIN_EST defines how many seconds estimated operation -+ complete time should be at least to show the progress bar. */ -+#define PROGRESS_DELAY 5 -+#define PROGRESS_MIN_EST 5 -+ - /* For long options that have no equivalent short option, use a - non-character as a pseudo short option, starting with CHAR_MAX + 1. */ - enum -@@ -75,6 +83,7 @@ static struct option const long_options[ - { - {"backup", optional_argument, NULL, 'b'}, - {"force", no_argument, NULL, 'f'}, -+ {"progress", no_argument, NULL, 'g'}, - {"interactive", no_argument, NULL, 'i'}, - {"no-target-directory", no_argument, NULL, 'T'}, - {"reply", required_argument, NULL, REPLY_OPTION}, /* Deprecated 2005-07-03, -@@ -104,6 +113,10 @@ rm_option_init (struct rm_options *x) - - x->verbose = false; - -+ x->pbar_show = false; -+ x->pbar_delay = PROGRESS_DELAY; -+ x->pbar_min_est = PROGRESS_MIN_EST; -+ - /* Since this program may well have to process additional command - line arguments after any call to `rm', that function must preserve - the initial working directory, in case one of those is a -@@ -145,6 +158,10 @@ - x->set_mode = false; - x->mode = 0; - x->stdin_tty = isatty (STDIN_FILENO); -+ -+ x->pbar_show = false; -+ x->pbar_delay = PROGRESS_DELAY; -+ x->pbar_min_est = PROGRESS_MIN_EST; - - x->verbose = false; - x->dest_info = NULL; -@@ -312,6 +325,8 @@ Mandatory arguments to long options are - --backup[=CONTROL] make a backup of each existing destination file\n\ - -b like --backup but does not accept an argument\n\ - -f, --force do not prompt before overwriting\n\ -+ -g, --progress show a progress bar if operation is going to\n\ -+ take a long time\n\ - -i, --interactive prompt before overwrite\n\ - "), stdout); - fputs (_("\ -@@ -375,7 +393,7 @@ main (int argc, char **argv) - we'll actually use backup_suffix_string. */ - backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); - -- while ((c = getopt_long (argc, argv, "bfit:uvS:T", long_options, NULL)) -+ while ((c = getopt_long (argc, argv, "bfgit:uvS:T", long_options, NULL)) - != -1) - { - switch (c) -@@ -388,6 +406,9 @@ main (int argc, char **argv) - case 'f': - x.interactive = I_ALWAYS_YES; - break; -+ case 'g': -+ x.pbar_show = true; -+ break; - case 'i': - x.interactive = I_ASK_USER; - break; ---- coreutils/src/remove.h -+++ coreutils/src/remove.h -@@ -48,6 +48,16 @@ struct rm_options - /* If true, display the name of each file removed. */ - bool verbose; - -+ /* If true, display a progress bar when the following conditions are -+ * met: -+ - pbar_delay defines how many seconds to wait before considering to -+ display the progress bar -+ - pbar_min_est defines how many seconds estimated operation complete -+ time should be at least to show the progress bar. */ -+ bool pbar_show; -+ int pbar_delay; -+ int pbar_min_est; -+ - /* If true, treat the failure by the rm function to restore the - current working directory as a fatal error. I.e., if this field - is true and the rm function cannot restore cwd, it must exit with diff --git a/source/base/coreutils/003_all_coreutils-gentoo-uname.patch b/source/base/coreutils/003_all_coreutils-gentoo-uname.patch deleted file mode 100644 index 93cb134..0000000 --- a/source/base/coreutils/003_all_coreutils-gentoo-uname.patch +++ /dev/null @@ -1,173 +0,0 @@ -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges <[EMAIL PROTECTED]>, but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch/<ARCH>/ source tree of the kernel. - ---- coreutils/src/uname.c -+++ coreutils/src/uname.c -@@ -51,6 +51,11 @@ - # include <mach-o/arch.h> - #endif - -+#if defined (__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -138,6 +143,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo (int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -250,10 +344,14 @@ main (int argc, char **argv) - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -306,9 +404,13 @@ main (int argc, char **argv) - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif diff --git a/source/base/coreutils/23-futimens.patch b/source/base/coreutils/23-futimens.patch deleted file mode 100644 index df133f6..0000000 --- a/source/base/coreutils/23-futimens.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur coreutils-5.97.orig/lib/utimens.c coreutils-5.97/lib/utimens.c ---- coreutils-5.97.orig/lib/utimens.c 2006-06-11 09:15:11.000000000 +0200 -+++ coreutils-5.97/lib/utimens.c 2007-05-29 18:57:39.000000000 +0200 -@@ -75,7 +75,7 @@ - Return 0 on success, -1 (setting errno) on failure. */ - - int --futimens (int fd ATTRIBUTE_UNUSED, -+xxfutimens (int fd ATTRIBUTE_UNUSED, - char const *file, struct timespec const timespec[2]) - { - /* There's currently no interface to set file timestamps with -@@ -168,5 +168,5 @@ - int - utimens (char const *file, struct timespec const timespec[2]) - { -- return futimens (-1, file, timespec); -+ return xxfutimens (-1, file, timespec); - } -diff -Naur coreutils-5.97.orig/lib/utimens.h coreutils-5.97/lib/utimens.h ---- coreutils-5.97.orig/lib/utimens.h 2004-11-23 21:41:51.000000000 +0100 -+++ coreutils-5.97/lib/utimens.h 2007-05-29 18:57:43.000000000 +0200 -@@ -1,3 +1,3 @@ - #include "timespec.h" --int futimens (int, char const *, struct timespec const [2]); -+int xxfutimens (int, char const *, struct timespec const [2]); - int utimens (char const *, struct timespec const [2]); -diff -Naur coreutils-5.97.orig/src/copy.c coreutils-5.97/src/copy.c ---- coreutils-5.97.orig/src/copy.c 2006-05-12 09:04:29.000000000 +0200 -+++ coreutils-5.97/src/copy.c 2007-05-29 18:57:48.000000000 +0200 -@@ -420,7 +420,7 @@ - timespec[0] = get_stat_atime (src_sb); - timespec[1] = get_stat_mtime (src_sb); - -- if (futimens (dest_desc, dst_name, timespec) != 0) -+ if (xxfutimens (dest_desc, dst_name, timespec) != 0) - { - error (0, errno, _("preserving times for %s"), quote (dst_name)); - if (x->require_preserve) -diff -Naur coreutils-5.97.orig/src/touch.c coreutils-5.97/src/touch.c ---- coreutils-5.97.orig/src/touch.c 2005-11-02 14:18:47.000000000 +0100 -+++ coreutils-5.97/src/touch.c 2007-05-29 18:57:53.000000000 +0200 -@@ -182,7 +182,7 @@ - t = timespec; - } - -- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); -+ ok = (xxfutimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); - - if (fd == STDIN_FILENO) - { diff --git a/source/base/coreutils/FrugalBuild b/source/base/coreutils/FrugalBuild index d10a0b0..7edbac7 100644 --- a/source/base/coreutils/FrugalBuild +++ b/source/base/coreutils/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=coreutils -pkgver=6.9 -pkgrel=5 +pkgver=6.10 +pkgrel=1 pkgdesc="These are the GNU core utilities, the basic command line programs" url="http://www.gnu.org/software/coreutils"; depends=('bash' 'glibc') @@ -11,25 +11,15 @@ groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz \ - dircolors.1 dircolors.c dircolors.h DIR_COLORS \ - 001_all_coreutils-gen-progress-bar.patch 003_all_coreutils-gentoo-uname.patch \ - 23-futimens.patch) -signatures=($source.sig '' '' '' '' '' '' '') - -# NOTE: 001 and 003 patches from gentoo, 001 adds progressbar (via -g option) to cp and mv -# maybe usefull. 003 adds uname feature that shows CPU/vendor stuff at uname -# if not fit with newer coreutils, just drop them from FB, i'll review them later. -# For more info see the patch headers. -# 23-futimens.patch from UHU-Linux, which fixes build coreutils against glib26 (maybe can be -# removed at new version. -# -krix- + dircolors.1 dircolors.c dircolors.h DIR_COLORS) +signatures=($source.sig '' '' '' '') build() { Fcd cp -f $Fsrcdir/dircolors.{c,h} src/ cp -f $Fsrcdir/dircolors.1 man/ - Fbuild --bindir=/bin --datadir=/usr/share --infodir=/usr/info --mandir=/usr/share/man \ + Fbuild --bindir=/bin --datadir=/usr/share --infodir=/usr/share/info --mandir=/usr/share/man \ --enable-largefile ac_cv_func_openat=no Ffile /etc/DIR_COLORS _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
