Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22237/10.3/unstable/main/finkinfo/utils
Modified Files:
coreutils.info coreutils.patch
Log Message:
New upstream: coreutils 6.9.
The coreutils-default no longer pollutes /sw/bin.
Instead, the coreutils-default prepends %p/lib/coreutils/bin to PATH
using profile.d mechanism.
For packages (build)depending on fileutils or textutils,
I moved symlinks previously included in coreutils-default into
fileutils, textutils and shellutils. Anyway, those packages should
be updated to use plain coreutils (or remove GNUism).
Index: coreutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/coreutils.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- coreutils.info 21 Jul 2006 07:30:17 -0000 1.10
+++ coreutils.info 12 Apr 2007 12:31:47 -0000 1.11
@@ -1,22 +1,22 @@
Package: coreutils
-Version: 5.96
+Version: 6.9
Epoch: 1
-Revision: 5
+Revision: 1
BuildDepends: expat, help2man, libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev
Depends: libgettext3-shlibs, libiconv
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
Source: mirror:gnu:%n/%n-%v.tar.bz2
-Source-MD5: bf55d069d82128fd754a090ce8b5acff
-Patch: %n.patch
+Source-MD5: c9607d8495f16e98906e7ed2d9751a06
ConfigureParams: --bindir=%p/lib/%N/bin --mandir=%p/lib/%N/share/man
--infodir=%p/share/info
+PatchScript: sed 's|@PREFIX@|%p|g' %a/%n.patch | patch -p1
CompileScript: <<
./configure %c
make
case `uname -r` in [1-7].*) ;; *) make check;; esac
<<
InstallScript: <<
- #!/bin/sh -e
+ #!/bin/sh -ev
go() { echo "$@"; "$@"; }
go make install DESTDIR=%d
@@ -69,9 +69,8 @@
Package: coreutils-default
Description: GNU flavoured basic commands without 'g' prefix
Depends: coreutils (>= %e:%v-%r)
- Conflicts: fileutils (<< 1:5-1), textutils (<< 1:5-1), shellutils (<< 1:5-1)
- Replaces: fileutils (<< 1:5-1), textutils (<< 1:5-1), shellutils (<< 1:5-1)
- Provides: fileutils, textutils, shellutils
+ Conflicts: fileutils (<< 1:6.9-1), textutils (<< 1:6.9-1), shellutils (<<
1:6.9-1)
+ Replaces: fileutils (<< 1:6.9-1), textutils (<< 1:6.9-1), shellutils (<<
1:6.9-1)
DescDetail: <<
The GNU Core Utilities are the basic file, shell and text manipulation
utilities of the GNU operating system. These are the core utilities
@@ -79,59 +78,55 @@
This package serves the commands without 'g' prefix like 'ls' or 'cp'.
<<
- DescPort: <<
-Symlinks to md5sum and readlink are not created, they are already
-contained in the dpkg package.
-
-Symlink to tsort (topological sort) is not created because it breaks
-other packages. The GNU version of tsort doesn't output files that are
-part of a cycle, while the BSD tsort that ships with Darwin does.
- <<
InstallScript: <<
- #!/bin/sh -e
- go() { echo "$@"; "$@"; }
-
- for d in bin share/man/man1; do
- dd=`echo "$d" | sed 's,[^/]*,..,g'`/lib/%N/$d
- go mkdir -p "%i/$d"
- go cd "%I/$d"
- for f in "$dd/"*; do
- ff=`basename "$f"`
- case $ff in
- md5sum*|readlink*|tsort*) ;;
- *) go ln -s "$f" "%i/$d/$ff";;
- esac
- done
- done
-
- go mkdir -p %i/share/doc/installed-packages
- go touch %i/share/doc/installed-packages/%n
- go ln -s %N %i/share/doc/%n
+ mkdir -p %i/etc/profile.d
+ install -c -m 755 fink/%n.sh fink/%n.csh %i/etc/profile.d
+ mkdir -p %i/lib/%n
+ install -c -m 755 fink/prepend-path %i/lib/%n
+ mkdir -p %i/share/doc
+ ln -s %N %i/share/doc/%n
<<
<<
SplitOff2: <<
Package: fileutils
- Description: Placeholder to help migration coreutils
- Depends: coreutils-default (>= %e:%v-%r)
+ Description: Backward compatibility symlinks for coreutils
+ Depends: coreutils (>= %e:%v-%r), fink-obsolete-packages
+ Conflicts: coreutils-default (<< 1:6.9-1)
InstallScript: <<
+ mkdir -p %i/bin
+ set -ex; for f in `cat fink/%n.list`; do ln -s "../lib/%N/bin/$f"
"%i/bin/$f"; done
mkdir -p %i/share/doc
ln -s %N %i/share/doc/%n
<<
<<
SplitOff3: <<
Package: textutils
- Description: Placeholder to help migration coreutils
- Depends: coreutils-default (>= %e:%v-%r)
+ Description: Backward compatibility symlinks for coreutils
+ Depends: coreutils (>= %e:%v-%r), fink-obsolete-packages
+ Conflicts: coreutils-default (<< 1:6.9-1)
InstallScript: <<
+ mkdir -p %i/bin
+ set -ex; for f in `cat fink/%n.list`; do ln -s "../lib/%N/bin/$f"
"%i/bin/$f"; done
mkdir -p %i/share/doc
ln -s %N %i/share/doc/%n
<<
+ DescPort: <<
+Symlinks to md5sum is not created because they are already contained
+in the dpkg package.
+
+Symlink to tsort (topological sort) is not created because it breaks
+other packages. The GNU version of tsort doesn't output files that are
+part of a cycle, while the BSD tsort that ships with Darwin does.
+ <<
<<
SplitOff4: <<
Package: shellutils
- Description: Placeholder to help migration coreutils
- Depends: coreutils-default (>= %e:%v-%r)
+ Description: Backward compatibility symlinks for coreutils
+ Depends: coreutils (>= %e:%v-%r), fink-obsolete-packages
+ Conflicts: coreutils-default (<< 1:6.9-1)
InstallScript: <<
+ mkdir -p %i/bin
+ set -ex; for f in `cat fink/%n.list`; do ln -s "../lib/%N/bin/$f"
"%i/bin/$f"; done
mkdir -p %i/share/doc
ln -s %N %i/share/doc/%n
<<
Index: coreutils.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/coreutils.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- coreutils.patch 21 Jun 2006 03:36:15 -0000 1.4
+++ coreutils.patch 12 Apr 2007 12:31:47 -0000 1.5
@@ -1,10 +1,166 @@
-diff -Naur coreutils-5.96.orig/tests/lang-default
coreutils-5.96/tests/lang-default
---- coreutils-5.96.orig/tests/lang-default 2000-10-31 19:33:30.000000000
+0000
-+++ coreutils-5.96/tests/lang-default 2006-06-21 03:07:22.000000000 +0000
-@@ -4,5 +4,5 @@
-
- for i in \
- LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_TIME;
do
-- eval "$i=; export $i"
-+ eval "$i=C; export $i"
- done
+diff -Naur ./nonexistent/coreutils-default.csh ./fink/coreutils-default.csh
+--- ./nonexistent/coreutils-default.csh 1970-01-01 00:00:00.000000000
+0000
++++ ./fink/coreutils-default.csh 2007-04-12 11:57:21.000000000 +0000
+@@ -0,0 +1,12 @@
++set coreutils_default_newpath="[EMAIL
PROTECTED]@/lib/coreutils-default/prepend-path PATH @PREFIX@/lib/coreutils/bin`"
++if ( "x$coreutils_default_newpath" != x ) then
++ setenv PATH "$coreutils_default_newpath"
++else
++ setenv PATH "@PREFIX@/lib/coreutils/bin:$PATH"
++endif
++unset coreutils_default_newpath
++if ( $?MANPATH ) then
++ if ( "x$MANPATH" != x ) then
++ setenv MANPATH [EMAIL PROTECTED]@/lib/coreutils-default/prepend-path
MANPATH @PREFIX@/lib/coreutils/man`
++ endif
++endif
+diff -Naur ./nonexistent/coreutils-default.sh ./fink/coreutils-default.sh
+--- ./nonexistent/coreutils-default.sh 1970-01-01 00:00:00.000000000 +0000
++++ ./fink/coreutils-default.sh 2007-04-12 09:21:20.000000000 +0000
+@@ -0,0 +1,10 @@
[EMAIL PROTECTED]@/lib/coreutils-default/prepend-path PATH
@PREFIX@/lib/coreutils/bin`
++if test "x$coreutils_default_newpath" != x; then
++ PATH=$coreutils_default_newpath; export PATH
++else
++ PATH="@PREFIX@/lib/coreutils/bin:$PATH"; export PATH
++fi
++unset coreutils_default_path >/dev/null 2>&1 || :
++if test "x$MANPATH" != x; then
++ [EMAIL PROTECTED]@/lib/coreutils-default/prepend-path MANPATH
@PREFIX@/lib/coreutils/man`; export MANPATH
++fi
+diff -Naur ./nonexistent/fileutils.list ./fink/fileutils.list
+--- ./nonexistent/fileutils.list 1970-01-01 00:00:00.000000000 +0000
++++ ./fink/fileutils.list 2007-04-12 09:34:12.000000000 +0000
+@@ -0,0 +1,22 @@
++chgrp
++chmod
++chown
++cp
++dd
++df
++dir
++dircolors
++du
++install
++ln
++ls
++mkdir
++mkfifo
++mknod
++mv
++rm
++rmdir
++shred
++sync
++touch
++vdir
+diff -Naur ./nonexistent/prepend-path ./fink/prepend-path
+--- ./nonexistent/prepend-path 1970-01-01 00:00:00.000000000 +0000
++++ ./fink/prepend-path 2007-04-12 09:03:32.000000000 +0000
+@@ -0,0 +1,42 @@
++#! /bin/sh
++# vim: set sw=4 sts=4 expandtab:
++#
++# Usage: prepend-path ENVNAME "/foo/bin:/white spaces in path/bin"
++#
++# $ VAR=/foo1/bin:/foo2/bin; export VAR
++# $ VAR=`prepend-path VAR "/bar1/bin:/foo1/bin:/bar2/bin"`
++# $ echo "$VAR"
++# /bar1/bin:/bar2/bin:/foo1/bin:/foo2/bin
++#
++# You can use or modify or redistribute or do anything to this script
++# as if it were in public domain, although Japan's laws do not admit
++# to disclaim one's copyright.
++#
++# Author: AIDA Shinra <[EMAIL PROTECTED]>
++#
++eval "result=\$$1"
++IFS=:
++
++case x$2 in
++ x) echo "$result"; exit 0 ;;
++esac
++set x $2; shift
++rlist=$1; shift
++case $# in
++ 0) ;;
++ *)
++ for p in "$@"
++ do
++ rlist=$p:$rlist
++ done ;;
++esac
++
++for p in $rlist
++do
++ case x$result in
++ x) result=$p ;;
++ x"$p"|x"$p":*|x*:"$p"|x*:"$p":*) ;;
++ x*) result=$p:$result ;;
++ esac
++done
++echo "$result"
+diff -Naur ./nonexistent/shellutils.list ./fink/shellutils.list
+--- ./nonexistent/shellutils.list 1970-01-01 00:00:00.000000000 +0000
++++ ./fink/shellutils.list 2007-04-12 09:35:11.000000000 +0000
+@@ -0,0 +1,32 @@
++[
++basename
++chroot
++date
++dirname
++echo
++env
++expr
++factor
++false
++groups
++hostid
++hostname
++id
++logname
++nice
++nohup
++pathchk
++pinky
++printenv
++printf
++pwd
++seq
++sleep
++stty
++tee
++test
++true
++tty
++uname
++whoami
++yes
+diff -Naur ./nonexistent/textutils.list ./fink/textutils.list
+--- ./nonexistent/textutils.list 1970-01-01 00:00:00.000000000 +0000
++++ ./fink/textutils.list 2007-04-12 11:09:35.000000000 +0000
+@@ -0,0 +1,24 @@
++cat
++cksum
++comm
++csplit
++cut
++expand
++fmt
++fold
++head
++join
++nl
++od
++paste
++pr
++ptx
++sort
++split
++sum
++tac
++tail
++tr
++unexpand
++uniq
++wc
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
