[Pkg-kde-commits] rev 328 - people/dato/kde-common/patches

[Adeodato Sim??]

Author: dato-guest
Date: 2004-12-17 07:58:29 -0700 (Fri, 17 Dec 2004)
New Revision: 328

Modified:
   people/dato/kde-common/patches/02_autotools_update.diff
Log:
Updating patch.

Modified: people/dato/kde-common/patches/02_autotools_update.diff
===================================================================
--- people/dato/kde-common/patches/02_autotools_update.diff	2004-12-17 14:12:22 UTC (rev 327)
+++ people/dato/kde-common/patches/02_autotools_update.diff	2004-12-17 14:58:29 UTC (rev 328)
@@ -6,13 +6,13 @@
  # Wrapper for compilers which do not understand `-c -o'.
  
 -# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
 +
 +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
  # Written by Tom Tromey <tromey@cygnus.com>.
  #
  # This program is free software; you can redistribute it and/or modify
-@@ -24,76 +25,116 @@
+@@ -24,76 +25,118 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -164,6 +164,8 @@
  if test -f "$cofile"; then
 -   mv "$cofile" "$ofile"
 +  mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  mv "${cofile}bj" "$ofile"
  fi
  
 -rmdir $lockdir
@@ -722,7 +724,7 @@
  # install - install a program, script, or datafile
 -# This comes from X11R5 (mit/util/scripts/install.sh).
 +
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-22.00
 +
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
@@ -781,7 +783,7 @@
  # put in absolute paths if you don't have them in your path; or use env. vars.
  
  mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
  rmprog="${RMPROG-rm}"
  mkdirprog="${MKDIRPROG-mkdir}"
  
@@ -1155,7 +1157,7 @@
 +  fi
 +
 +  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 +
 +  # Make sure that the destination directory exists.
 +
@@ -1168,7 +1170,8 @@
 +    oIFS=$IFS
 +    # Some sh's can't handle IFS=/ for some reason.
 +    IFS='%'
-+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
 +    IFS=$oIFS
 +
 +    pathcomp=