Author: pebender
Date: Fri Feb 27 21:32:38 2009
New Revision: 4412
Added:
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-disable_man.patch
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-perl.patch.gar
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-sysinfo.patch
Removed:
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-6.12-disable_man.patch
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-6.12-perl.patch.gar
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-6.12-sysinfo.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/utils/coreutils/Makefile
trunk/gar-minimyth/script/utils/coreutils/checksums
Log:
- Updated package utils/coreutils.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Feb 27
21:32:38 2009
@@ -66,6 +66,7 @@
Updated system/lirc.
Updated system/zoneinfo.
Updated utils/bash.
+ Updated utils/coreutils.
Updated utils/ed.
Updated utils/file.
Updated utils/grep.
Modified: trunk/gar-minimyth/script/utils/coreutils/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/coreutils/Makefile (original)
+++ trunk/gar-minimyth/script/utils/coreutils/Makefile Fri Feb 27 21:32:38
2009
@@ -1,5 +1,5 @@
GARNAME = coreutils
-GARVERSION = 6.12
+GARVERSION = 7.1
CATEGORIES = utils
MASTER_SITES = ftp://ftp.gnu.org/gnu/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
Modified: trunk/gar-minimyth/script/utils/coreutils/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/coreutils/checksums (original)
+++ trunk/gar-minimyth/script/utils/coreutils/checksums Fri Feb 27 21:32:38
2009
@@ -1,4 +1,4 @@
-2ca9ac69823dbd567b905a9e9f53c4f6 download/coreutils-6.12.tar.gz
-6c08a52ab0be3c6d0d3bc24b3f992c7f download/coreutils-6.12-perl.patch.gar
-a7dd57f283634fd97f5d19627a40c1c5 download/coreutils-6.12-sysinfo.patch
-c082a444a8554460251b4d9d218b9b16 download/coreutils-6.12-disable_man.patch
+cbb2b3d1718ee1237b808e00b5c11b1e download/coreutils-7.1.tar.gz
+8ed056c926f8d7b7792f461abd9af96a download/coreutils-7.1-perl.patch.gar
+ead1ec8e92c333e95304a72635020e99 download/coreutils-7.1-sysinfo.patch
+010fc5bddeff2b436878a4ea39a97ea3 download/coreutils-7.1-disable_man.patch
Added:
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-disable_man.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-disable_man.patch
Fri Feb 27 21:32:38 2009
@@ -0,0 +1,24 @@
+diff -Naur coreutils-7.1-old/Makefile.am coreutils-7.1-new/Makefile.am
+--- coreutils-7.1-old/Makefile.am 2009-02-26 08:38:08.000000000 -0800
++++ coreutils-7.1-new/Makefile.am 2009-02-26 08:39:19.000000000 -0800
+@@ -15,7 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-SUBDIRS = lib src doc man po tests gnulib-tests
++SUBDIRS = lib src doc po tests gnulib-tests
+ EXTRA_DIST = cfg.mk maint.mk \
+ .prev-version THANKS-to-translators THANKStt.in \
+ .version \
+diff -Naur coreutils-7.1-old/Makefile.in coreutils-7.1-new/Makefile.in
+--- coreutils-7.1-old/Makefile.in 2009-02-26 08:38:08.000000000 -0800
++++ coreutils-7.1-new/Makefile.in 2009-02-26 08:39:19.000000000 -0800
+@@ -918,7 +918,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib src doc man po tests gnulib-tests
++SUBDIRS = lib src doc po tests gnulib-tests
+ EXTRA_DIST = cfg.mk maint.mk \
+ .prev-version THANKS-to-translators THANKStt.in \
+ .version \
Added:
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-perl.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-perl.patch.gar
Fri Feb 27 21:32:38 2009
@@ -0,0 +1,72 @@
+diff -Naur coreutils-7.1-old/build-aux/announce-gen
coreutils-7.1-new/build-aux/announce-gen
+--- coreutils-7.1-old/build-aux/announce-gen 2009-01-11 03:46:32.000000000
-0800
++++ coreutils-7.1-new/build-aux/announce-gen 2009-02-26 08:36:47.000000000
-0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
+...@gar_build_destdir@@GAR_build_bindir@/perl -w
+ # Generate a release announcement message.
+
+ my $VERSION = '2008-12-02 16:28'; # UTC
+diff -Naur coreutils-7.1-old/build-aux/cvsu
coreutils-7.1-new/build-aux/cvsu
+--- coreutils-7.1-old/build-aux/cvsu 2008-09-18 00:06:57.000000000 -0700
++++ coreutils-7.1-new/build-aux/cvsu 2009-02-26 08:36:47.000000000 -0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#! @GAR_build_DESTDIR@@GAR_build_bindir@/perl -w
+
+ # cvsu - do a quick check to see what files are out of date.
+ #
+diff -Naur coreutils-7.1-old/build-aux/useless-if-before-free
coreutils-7.1-new/build-aux/useless-if-before-free
+--- coreutils-7.1-old/build-aux/useless-if-before-free 2009-01-31
00:37:16.000000000 -0800
++++ coreutils-7.1-new/build-aux/useless-if-before-free 2009-02-26
08:36:47.000000000 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
+...@gar_build_destdir@@GAR_build_bindir@ -T
+ # Detect instances of "if (p) free (p);".
+ # Likewise for "if (p != NULL) free (p);". And with braces.
+ # Also detect "if (NULL != p) free (p);".
+diff -Naur coreutils-7.1-old/man/help2man coreutils-7.1-new/man/help2man
+--- coreutils-7.1-old/man/help2man 2009-02-10 03:11:56.000000000 -0800
++++ coreutils-7.1-new/man/help2man 2009-02-26 08:36:47.000000000 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
+...@gar_build_destdir@@GAR_build_bindir@/perl -w
+
+ # Generate a short man page from --help and --version output.
+ # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009
+diff -Naur coreutils-7.1-old/src/dcgen coreutils-7.1-new/src/dcgen
+--- coreutils-7.1-old/src/dcgen 2008-09-18 00:06:57.000000000 -0700
++++ coreutils-7.1-new/src/dcgen 2009-02-26 08:36:47.000000000 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
+...@gar_build_destdir@@GAR_build_bindir@/perl -w
+ # dcgen -- convert dircolors.hin to dircolors.h.
+
+ # Copyright (C) 1996, 1998, 2004, 2005, 2006 Free Software Foundation,
Inc.
+diff -Naur coreutils-7.1-old/src/extract-magic
coreutils-7.1-new/src/extract-magic
+--- coreutils-7.1-old/src/extract-magic 2008-09-18 00:06:57.000000000
-0700
++++ coreutils-7.1-new/src/extract-magic 2009-02-26 08:36:47.000000000
-0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
+...@gar_build_destdir@@GAR_build_bindir@/perl -w
+ # Derive #define directives from specially formatted `case ...:'
statements.
+
+ # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+diff -Naur coreutils-7.1-old/src/wheel-gen.pl
coreutils-7.1-new/src/wheel-gen.pl
+--- coreutils-7.1-old/src/wheel-gen.pl 2008-09-18 00:06:57.000000000 -0700
++++ coreutils-7.1-new/src/wheel-gen.pl 2009-02-26 08:36:47.000000000 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
+...@gar_build_destdir@@GAR_build_bindir@/perl -w
+ # Generate the spokes of a wheel, for wheel factorization.
+
+ # Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+@@ -16,7 +16,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
++eval 'exec @GAR_build_DESTDIR@@GAR_build_bindir@/perl -S $0 ${1+"$@"}'
+ if 0;
+
+ use strict;
Added:
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-sysinfo.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/coreutils/files/coreutils-7.1-sysinfo.patch
Fri Feb 27 21:32:38 2009
@@ -0,0 +1,56 @@
+diff -Naur coreutils-7.1-old/src/uname.c coreutils-7.1-new/src/uname.c
+--- coreutils-7.1-old/src/uname.c 2009-02-26 08:36:32.000000000 -0800
++++ coreutils-7.1-new/src/uname.c 2009-02-26 08:38:31.000000000 -0800
+@@ -308,6 +308,28 @@
+ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
+ element = processor;
+ }
++#else
++ {
++ struct utsname u;
++ uname(&u);
++ element = u.machine;
++#ifdef linux
++ if(!strcmp(element, "i686")) { /* Check for Athlon */
++ char cinfo[1024];
++ FILE *f=fopen("/proc/cpuinfo", "r");
++ if(f) {
++ while(fgets(cinfo, 1024, f)) {
++ if(!strncmp(cinfo, "vendor_id", 9)) {
++ if(strstr(cinfo, "AuthenticAMD"))
++ element="athlon";
++ break;
++ }
++ }
++ fclose(f);
++ }
++ }
++#endif
++ }
+ #endif
+ #ifdef UNAME_PROCESSOR
+ if (element == unknown)
+@@ -345,7 +367,7 @@
+
+ if (toprint & PRINT_HARDWARE_PLATFORM)
+ {
+- char const *element = unknown;
++ char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_PLATFORM
+ {
+ static char hardware_platform[257];
+@@ -353,6 +375,14 @@
+ hardware_platform, sizeof hardware_platform))
+ element = hardware_platform;
+ }
++#else
++ {
++ struct utsname u;
++ uname(&u);
++ element = u.machine;
++ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' &&
element[3]=='6')
++ element[1]='3';
++ }
+ #endif
+ #ifdef UNAME_HARDWARE_PLATFORM
+ if (element == unknown)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
