pkg-kde: commit - rev 164 - in people/dato: . kde-common kde-common/patches
Author: dato-guest
Date: 2004-10-30 15:03:49 -0600 (Sat, 30 Oct 2004)
New Revision: 164
Added:
people/dato/kde-common/
people/dato/kde-common/README
people/dato/kde-common/list-packages
people/dato/kde-common/patches.sh
people/dato/kde-common/patches/
people/dato/kde-common/patches/02_autotools_update.diff
people/dato/kde-common/patches/03_libtool_arm.diff
people/dato/kde-common/patches/04_am_maintainer_mode.diff
people/dato/kde-common/patches/05_pedantic-errors.diff
people/dato/kde-common/patches/06_automake-1.9.diff
people/dato/kde-common/patches/README
people/dato/kde-common/rules.mk
people/dato/kde-common/substvars.sh
people/dato/kde-common/vars.mk
Log:
I'm on an experimenting mood. Criticism accepted, suggestions welcome.
Packages using this may follow soon.
Added: people/dato/kde-common/README
===================================================================
--- people/dato/kde-common/README 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/README 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,4 @@
+The kde-common directory in svn://pkg-kde/people/dato
+=====================================================
+
+ - to be written, catch me on IRC if you want to chat
Added: people/dato/kde-common/list-packages
===================================================================
--- people/dato/kde-common/list-packages 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/list-packages 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,85 @@
+#!/usr/bin/perl -w
+
+# This is /usr/lib/cdbs/list-packages from the cdbs package, as
+# of 0.4.25-1. Needed by substvars.sh.
+
+# -*- mode: cperl; coding: utf-8 -*-
+# Most of this code was stolen from Debhelper 4.1. which is:
+# Joey Hess, GPL copyright 1997-2000.
+# Adapted for CDBS purposes by Colin Walters <walters@debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+sub error {
+ my $err = shift;
+ print STDERR $err;
+ exit 1;
+}
+
+# stolen from debhelper
+sub GetPackages {
+ my $type=shift;
+
+ $type="" if ! defined $type;
+
+ # Look up the build arch if we need to.
+ my $buildarch='';
+ if ($type eq 'same') {
+ $buildarch=`dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null` || die "dpkg-architecture failed: $!";
+ chomp $buildarch;
+ }
+
+ my $package="";
+ my $arch="";
+ my @list=();
+ my %seen;
+ open (CONTROL, 'debian/control') ||
+ error("cannot read debian/control: $!\n");
+ while (<CONTROL>) {
+ chomp;
+ s/\s+$//;
+ if (/^Package:\s*(.*)/) {
+ $package=$1;
+ # Detect duplicate package names in the same control file.
+ if (! $seen{$package}) {
+ $seen{$package}=1;
+ }
+ else {
+ error("debian/control has a duplicate entry for $package");
+ }
+ }
+ if (/^Architecture:\s*(.*)/) {
+ $arch=$1;
+ }
+
+ if (!$_ or eof) { # end of stanza.
+ if ($package &&
+ (($type eq 'indep' && $arch eq 'all') ||
+ ($type eq 'arch' && $arch ne 'all') ||
+ ($type eq 'same' && ($arch eq 'any' || $arch =~ /\b$buildarch\b/)) ||
+ ! $type)) {
+ push @list, $package;
+ $package="";
+ $arch="";
+ }
+ }
+ }
+ close CONTROL;
+
+ return @list;
+}
+
+print join(' ', GetPackages($ARGV[0])) . "\n";
Property changes on: people/dato/kde-common/list-packages
___________________________________________________________________
Name: svn:keywords
+ Id
Added: people/dato/kde-common/patches/02_autotools_update.diff
===================================================================
--- people/dato/kde-common/patches/02_autotools_update.diff 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches/02_autotools_update.diff 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,1937 @@
+--- a/admin/compile
++++ b/admin/compile
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+-
+ # Wrapper for compilers which do not understand `-c -o'.
+
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++scriptversion=2004-09-10.20
++
++# 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 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
+-# Usage:
+-# compile PROGRAM [ARGS]...
+-# `-o FOO.o' is removed from the args passed to the actual compile.
+-
+-prog=$1
+-shift
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit 0
++ ;;
++ -v | --v*)
++ echo "compile $scriptversion"
++ exit 0
++ ;;
++esac
+
+ ofile=
+ cfile=
+-args=
+-while test $# -gt 0; do
+- case "$1" in
+- -o)
+- # configure might choose to run compile as `compile cc -o foo foo.c'.
+- # So we do something ugly here.
+- ofile=$2
+- shift
+- case "$ofile" in
+- *.o | *.obj)
+- ;;
+- *)
+- args="$args -o $ofile"
+- ofile=
+- ;;
+- esac
+- ;;
+- *.c)
+- cfile=$1
+- args="$args $1"
+- ;;
+- *)
+- args="$args $1"
+- ;;
+- esac
+- shift
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
++ shift
+ done
+
+ if test -z "$ofile" || test -z "$cfile"; then
+- # If no `-o' option was seen then we might have been invoked from a
+- # pattern rule where we don't need one. That is ok -- this is a
+- # normal compilation that the losing compiler can handle. If no
+- # `.c' file was seen then we are probably linking. That is also
+- # ok.
+- exec "$prog" $args
++ # If no `-o' option was seen then we might have been invoked from a
++ # pattern rule where we don't need one. That is ok -- this is a
++ # normal compilation that the losing compiler can handle. If no
++ # `.c' file was seen then we are probably linking. That is also
++ # ok.
++ exec "$@"
+ fi
+
+ # Name of file we expect compiler to create.
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file. Also, base the name on the expected
+ # object file name, since that is what matters with a parallel build.
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+ while true; do
+- if mkdir $lockdir > /dev/null 2>&1; then
+- break
+- fi
+- sleep 1
++ if mkdir "$lockdir" >/dev/null 2>&1; then
++ break
++ fi
++ sleep 1
+ done
+ # FIXME: race condition here if user kills between mkdir and trap.
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ mv "$cofile" "$ofile"
+ fi
+
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/config.guess
++++ b/admin/config.guess
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+-timestamp='2004-06-24'
++timestamp='2004-08-13'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -203,9 +203,6 @@
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- arc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -230,18 +227,12 @@
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- pmax:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ sgi:OpenBSD:*:*)
+- echo mipseb-unknown-openbsd${UNAME_RELEASE}
++ echo mips64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- wgrisc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -1081,7 +1072,7 @@
+ exit 0 ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -1179,9 +1170,10 @@
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+- case `uname -p` in
++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+- powerpc) UNAME_PROCESSOR=powerpc ;;
++ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+--- a/admin/depcomp
++++ b/admin/depcomp
+@@ -1,7 +1,9 @@
+ #! /bin/sh
+-
+ # depcomp - compile a program generating dependencies as side-effects
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++scriptversion=2004-05-31.23
++
++# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -25,13 +27,45 @@
+
+ # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++ depmode Dependency tracking mode.
++ source Source file read by `PROGRAMS ARGS'.
++ object Object file output by `PROGRAMS ARGS'.
++ DEPDIR directory where to store dependencies.
++ depfile Dependency file to output.
++ tmpdepfile Temporary file to use when outputing dependencies.
++ libtool Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit 0
++ ;;
++ -v | --v*)
++ echo "depcomp $scriptversion"
++ exit 0
++ ;;
++esac
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+ fi
+-# `libtool' can also be set to `yes' or `no'.
+
+-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+ rm -f "$tmpdepfile"
+@@ -163,19 +197,25 @@
+
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+- # in a .u file. This file always lives in the current directory.
+- # Also, the AIX compiler puts `$object:' at the start of each line;
+- # $object doesn't have directory information.
+- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
++ # in a .u file. In older versions, this file always lives in the
++ # current directory. Also, the AIX compiler puts `$object:' at the
++ # start of each line; $object doesn't have directory information.
++ # Version 6 uses the directory in both cases.
++ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
+- outname="$stripped.o"
+ if test "$libtool" = yes; then
+ "$@" -Wc,-M
+ else
+ "$@" -M
+ fi
+-
+ stat=$?
++
++ if test -f "$tmpdepfile"; then :
++ else
++ stripped=`echo "$stripped" | sed 's,^.*/,,'`
++ tmpdepfile="$stripped.u"
++ fi
++
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+@@ -183,6 +223,7 @@
+ fi
+
+ if test -f "$tmpdepfile"; then
++ outname="$stripped.o"
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+@@ -198,11 +239,9 @@
+ ;;
+
+ icc)
+- # Must come before tru64.
+-
+- # Intel's C compiler understands `-MD -MF file'. However
++ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+- # will fill foo.d with something like
++ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+@@ -210,6 +249,12 @@
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
++ # ICC 7.1 will output
++ # foo.o: sub/foo.c sub/foo.h
++ # and will wrap long lines using \ :
++ # foo.o: sub/foo.c ... \
++ # sub/foo.h ... \
++ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+@@ -219,45 +264,63 @@
+ exit $stat
+ fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h'.
++ # Each line is of the form `foo.o: dependent.h',
++ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++ # Some versions of the HPUX 10.20 sed can't process this invocation
++ # correctly. Breaking it into two sed invocations is a workaround.
++ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
++ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+ tru64)
+- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
++ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in `foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+- tmpdepfile1="$object.d"
+- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
+ if test "$libtool" = yes; then
++ # Dependencies are output in .lo.d with libtool 1.4.
++ # With libtool 1.5 they are output both in $dir.libs/$base.o.d
++ # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the
++ # latter, because the former will be cleaned when $dir.libs is
++ # erased.
++ tmpdepfile1="$dir.libs/$base.lo.d"
++ tmpdepfile2="$dir$base.o.d"
++ tmpdepfile3="$dir.libs/$base.d"
+ "$@" -Wc,-MD
+ else
++ tmpdepfile1="$dir$base.o.d"
++ tmpdepfile2="$dir$base.d"
++ tmpdepfile3="$dir$base.d"
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile1" "$tmpdepfile2"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ if test -f "$tmpdepfile1"; then
+ tmpdepfile="$tmpdepfile1"
+- else
++ elif test -f "$tmpdepfile2"; then
+ tmpdepfile="$tmpdepfile2"
++ else
++ tmpdepfile="$tmpdepfile3"
+ fi
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a space and a tab in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+@@ -270,34 +333,42 @@
+
+ dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- test -z "$dashmflag" && dashmflag=-M
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*) # this is libtool, let us make it quiet
+- for arg
+- do # cycle over the arguments
+- case "$arg" in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout, regardless of -o.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove `-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++
++ test -z "$dashmflag" && dashmflag=-M
++ # Require at least two characters before searching for `:'
++ # in the target name. This is to cope with DOS-style filenames:
++ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++ "$@" $dashmflag |
++ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ tr ' ' '
+@@ -315,36 +386,40 @@
+ ;;
+
+ makedepend)
+- # X makedepend
+- (
+- shift
+- cleared=no
+- for arg in "$@"; do
+- case $cleared in no)
+- set ""; shift
+- cleared=yes
+- esac
+- case "$arg" in
+- -D*|-I*)
+- set fnord "$@" "$arg"; shift;;
+- -*)
+- ;;
+- *)
+- set fnord "$@" "$arg"; shift;;
+- esac
++ "$@" || exit $?
++ # Remove any Libtool call
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
+ done
+- obj_suffix="`echo $object | sed 's/^.*\././'`"
+- touch "$tmpdepfile"
+- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ shift
++ fi
++ # X makedepend
++ shift
++ cleared=no
++ for arg in "$@"; do
++ case $cleared in
++ no)
++ set ""; shift
++ cleared=yes ;;
++ esac
++ case "$arg" in
++ -D*|-I*)
++ set fnord "$@" "$arg"; shift ;;
++ # Strip any option that makedepend may not understand. Remove
++ # the object too, otherwise makedepend will parse it as a source file.
++ -*|$object)
++ ;;
++ *)
++ set fnord "$@" "$arg"; shift ;;
++ esac
++ done
++ obj_suffix="`echo $object | sed 's/^.*\././'`"
++ touch "$tmpdepfile"
++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- tail +3 "$tmpdepfile" | tr ' ' '
++ sed '1,2d' "$tmpdepfile" | tr ' ' '
+ ' | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+@@ -354,35 +429,39 @@
+
+ cpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
+- # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
+- set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
++ # always write the preprocessed file to stdout.
++ "$@" || exit $?
++
++ # Remove the call to Libtool.
++ if test "$libtool" = yes; then
++ while test $1 != '--mode=compile'; do
++ shift
++ done
++ shift
++ fi
++
++ # Remove `-o $object'.
++ IFS=" "
++ for arg
++ do
++ case $arg in
++ -o)
++ shift
++ ;;
++ $object)
++ shift
++ ;;
++ *)
++ set fnord "$@" "$arg"
++ shift # fnord
++ shift # $arg
+ ;;
+ esac
+- "$@" -E |
++ done
++
++ "$@" -E |
+ sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+@@ -392,34 +471,27 @@
+
+ msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the proprocessed file to stdout, regardless of -o,
++ # always write the preprocessed file to stdout, regardless of -o,
+ # because we must use -o when running libtool.
+- ( IFS=" "
+- case " $* " in
+- *" --mode=compile "*)
+- for arg
+- do # cycle over the arguments
+- case $arg in
+- "--mode=compile")
+- # insert --quiet before "--mode=compile"
+- set fnord "$@" --quiet
+- shift # fnord
+- ;;
+- esac
++ "$@" || exit $?
++ IFS=" "
++ for arg
++ do
++ case "$arg" in
++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++ set fnord "$@"
++ shift
++ shift
++ ;;
++ *)
+ set fnord "$@" "$arg"
+- shift # fnord
+- shift # "$arg"
+- done
+- ;;
++ shift
++ shift
++ ;;
+ esac
+- "$@" -E |
+- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+- ) &
+- proc=$!
+- "$@"
+- stat=$?
+- wait "$proc"
+- if test "$stat" != 0; then exit $stat; fi
++ done
++ "$@" -E |
++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+@@ -439,3 +511,12 @@
+ esac
+
+ exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/install-sh
++++ b/admin/install-sh
+@@ -1,19 +1,38 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2004-09-10.20
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission. M.I.T. makes no representations about the
+-# suitability of this software for any purpose. It is provided "as is"
+-# without express or implied warranty.
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+@@ -23,13 +42,11 @@
+ # from scratch. It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+
+-
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+
+ mvprog="${MVPROG-mv}"
+@@ -41,236 +58,265 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+- case $1 in
+- -c) instcmd=$cpprog
+- shift
+- continue;;
+-
+- -d) dir_arg=true
+- shift
+- continue;;
+-
+- -m) chmodcmd="$chmodprog $2"
+- shift
+- shift
+- continue;;
+-
+- -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+- shift
+- continue;;
+-
+- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+- shift
+- continue;;
+-
+- *) if [ x"$src" = x ]
+- then
+- src=$1
+- else
+- # this colon is to work around a 386BSD /bin/sh bug
+- :
+- dst=$1
+- fi
+- shift
+- continue;;
+- esac
+-done
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c (ignored)
++-d create directories instead of installing files.
++-g GROUP $chgrpprog installed files to GROUP.
++-m MODE $chmodprog installed files to MODE.
++-o USER $chownprog installed files to USER.
++-s $stripprog installed files.
++-t DIRECTORY install into DIRECTORY.
++-T report an error if DSTFILE is a directory.
++--help display this help and exit.
++--version display version info and exit.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++ case $1 in
++ -c) shift
++ continue;;
++
++ -d) dir_arg=true
++ shift
++ continue;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift
++ shift
++ continue;;
++
++ --help) echo "$usage"; exit 0;;
++
++ -m) chmodcmd="$chmodprog $2"
++ shift
++ shift
++ continue;;
++
++ -o) chowncmd="$chownprog $2"
++ shift
++ shift
++ continue;;
++
++ -s) stripcmd=$stripprog
++ shift
++ continue;;
+
+-if [ x"$src" = x ]
+-then
+- echo "$0: no input file specified" >&2
+- exit 1
+-else
+- :
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+- dst=$src
+- src=""
+-
+- if [ -d "$dst" ]; then
+- instcmd=:
+- chmodcmd=""
+- else
+- instcmd=$mkdirprog
+- fi
+-else
+-
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad
+-# if $src (and thus $dsttmp) contains '*'.
+-
+- if [ -f "$src" ] || [ -d "$src" ]
+- then
+- :
+- else
+- echo "$0: $src does not exist" >&2
+- exit 1
+- fi
+-
+- if [ x"$dst" = x ]
+- then
+- echo "$0: no destination specified" >&2
+- exit 1
+- else
+- :
+- fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+- if [ -d "$dst" ]
+- then
+- dst=$dst/`basename "$src"`
+- else
+- :
+- fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-# this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+- '
+-IFS="${IFS-$defaultIFS}"
+-
+-oIFS=$IFS
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS=$oIFS
+-
+-pathcomp=''
++ -t) dstarg=$2
++ shift
++ shift
++ continue;;
+
+-while [ $# -ne 0 ] ; do
+- pathcomp=$pathcomp$1
++ -T) no_target_directory=true
+ shift
++ continue;;
+
+- if [ ! -d "$pathcomp" ] ;
+- then
+- $mkdirprog "$pathcomp"
+- else
+- :
+- fi
++ --version) echo "$0 $scriptversion"; exit 0;;
+
+- pathcomp=$pathcomp/
++ *) # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ test -n "$dir_arg$dstarg" && break
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd "$dst" &&
+
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- dstfile=`basename "$dst" $transformbasename |
+- sed $transformarg`$transformbasename
+- fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- :
+- fi
+-
+-# Make a couple of temp file names in the proper directory.
+-
+- dsttmp=$dstdir/#inst.$$#
+- rmtmp=$dstdir/#rm.$$#
+-
+-# Trap to clean up temp files at exit.
+-
+- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+- trap '(exit $?); exit' 1 2 13 15
+-
+-# Move or copy the file name to the temp name
+-
+- $doit $instcmd "$src" "$dsttmp" &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing. If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+-
+-# Now remove or move aside any old file at destination location. We try this
+-# two ways since rm can't unlink itself on some systems and the destination
+-# file might be busy for other reasons. In this case, the final cleanup
+-# might fail but the new file should still install successfully.
+-
+-{
+- if [ -f "$dstdir/$dstfile" ]
+- then
+- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+- {
+- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+- (exit 1); exit
+- }
+- else
+- :
+- fi
+-} &&
+-
+-# Now rename the file to the real destination.
++if test -z "$1"; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
++fi
+
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src ;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ src=
++
++ if test -d "$dst"; then
++ mkdircmd=:
++ chmodcmd=
++ else
++ mkdircmd=$mkdirprog
++ fi
++ else
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dstarg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dstarg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst ;;
++ esac
+
+-fi &&
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dstarg: Is a directory" >&2
++ exit 1
++ fi
++ dst=$dst/`basename "$src"`
++ fi
++ fi
++
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++
++ # Make sure that the destination directory exists.
++
++ # Skip lots of stat calls in the usual case.
++ if test ! -d "$dstdir"; then
++ defaultIFS='
++ '
++ IFS="${IFS-$defaultIFS}"
++
++ oIFS=$IFS
++ # Some sh's can't handle IFS=/ for some reason.
++ IFS='%'
++ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ IFS=$oIFS
++
++ pathcomp=
++
++ while test $# -ne 0 ; do
++ pathcomp=$pathcomp$1
++ shift
++ if test ! -d "$pathcomp"; then
++ $mkdirprog "$pathcomp"
++ # mkdir can fail with a `File exist' error in case several
++ # install-sh are creating the directory concurrently. This
++ # is OK.
++ test -d "$pathcomp" || exit
++ fi
++ pathcomp=$pathcomp/
++ done
++ fi
++
++ if test -n "$dir_arg"; then
++ $doit $mkdircmd "$dst" \
++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
++ else
++ dstfile=`basename "$dst"`
++
++ # Make a couple of temp file names in the proper directory.
++ dsttmp=$dstdir/_inst.$$_
++ rmtmp=$dstdir/_rm.$$_
++
++ # Trap to clean up those temp files at exit.
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Copy the file name to the temp name.
++ $doit $cpprog "$src" "$dsttmp" &&
++
++ # and set any options; do chmod last to preserve setuid bits.
++ #
++ # If any of these fail, we abort the whole thing. If we want to
++ # ignore errors from any of these, just make sure not to ignore
++ # errors from the above "$doit $cpprog $src $dsttmp" command.
++ #
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++ # Now rename the file to the real destination.
++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++ || {
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ if test -f "$dstdir/$dstfile"; then
++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++ || {
++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++ (exit 1); exit
++ }
++ else
++ :
++ fi
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++ }
++ }
++ fi || { (exit 1); exit; }
++done
+
+ # The final little trick to "correctly" pass the exit status to the exit trap.
+-
+ {
+- (exit 0); exit
++ (exit 0); exit
+ }
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/missing
++++ b/admin/missing
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
++
++scriptversion=2004-09-07.08
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -38,18 +42,24 @@
+ configure_ac=configure.in
+ fi
+
++msg="missing on your system"
++
+ case "$1" in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
++ # Exit code 63 means version mismatch. This often happens
++ # when the user try to use an ancient version of a tool on
++ # a file that requires a minimum version. In this case we
++ # we should proceed has if the program had been absent, or
++ # if --run hadn't been passed.
++ if test $? = 63; then
++ run=:
++ msg="probably too old"
++ fi
+ ;;
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -74,11 +84,15 @@
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
++ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake@gnu.org>."
++ exit 0
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+- echo "missing 0.4 - GNU automake"
++ echo "missing $scriptversion (GNU Automake)"
++ exit 0
+ ;;
+
+ -*)
+@@ -87,14 +101,44 @@
+ exit 1
+ ;;
+
+- aclocal*)
++esac
++
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case "$1" in
++ lex|yacc)
++ # Not GNU programs, they don't have --version.
++ ;;
++
++ tar)
++ if test -n "$run"; then
++ echo 1>&2 "ERROR: \`tar' requires --run"
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ exit 1
++ fi
++ ;;
++
++ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running `$TOOL --version' or `$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
+ fi
++ ;;
++esac
+
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++ aclocal*)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+@@ -102,13 +146,8 @@
+ ;;
+
+ autoconf)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+@@ -116,13 +155,8 @@
+ ;;
+
+ autoheader)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+@@ -140,13 +174,8 @@
+ ;;
+
+ automake*)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+@@ -156,16 +185,11 @@
+ ;;
+
+ autom4te)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, but is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them.
+- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
++ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+@@ -185,7 +209,7 @@
+
+ bison|yacc)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+@@ -215,7 +239,7 @@
+
+ lex|flex)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+@@ -237,13 +261,8 @@
+ ;;
+
+ help2man)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+@@ -262,13 +281,8 @@
+ ;;
+
+ makeinfo)
+- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+- # We have makeinfo, but it failed.
+- exit 1
+- fi
+-
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+@@ -284,10 +298,6 @@
+
+ tar)
+ shift
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -323,10 +333,10 @@
+
+ *)
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+- it often tells you about the needed prerequirements for installing
++ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+@@ -334,3 +344,10 @@
+ esac
+
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
+@@ -1,20 +1,32 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++
++scriptversion=2004-02-15.20
++
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+ # Created: 1993-05-16
+-# Public domain
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
+
+ errstatus=0
+ dirmode=""
+
+ usage="\
+-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+- echo "$usage" 1>&2
++ echo "$usage"
+ exit 0
+ ;;
+ -m) # -m PERM arg
+@@ -23,6 +35,10 @@
+ dirmode=$1
+ shift
+ ;;
++ --version)
++ echo "$0 $scriptversion"
++ exit 0
++ ;;
+ --) # stop option processing
+ shift
+ break
+@@ -50,17 +66,37 @@
+ 0) exit 0 ;;
+ esac
+
++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error. This is a problem when calling mkinstalldirs
++# from a parallel make. We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+ '')
+- if mkdir -p -- . 2>/dev/null; then
++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
++ else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ test -d ./-p && rmdir ./-p
++ test -d ./--version && rmdir ./--version
+ fi
+ ;;
+ *)
+- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++ test ! -d ./--version; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
++ else
++ # Clean up after NextStep and OpenStep mkdir.
++ for d in ./-m ./-p ./--version "./$dirmode";
++ do
++ test -d $d && rmdir $d
++ done
+ fi
+ ;;
+ esac
+@@ -84,17 +120,17 @@
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+- errstatus=$lasterr
++ errstatus=$lasterr
+ else
+- if test ! -z "$dirmode"; then
++ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+- lasterr=""
+- chmod "$dirmode" "$pathcomp" || lasterr=$?
++ lasterr=""
++ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+- if test ! -z "$lasterr"; then
+- errstatus=$lasterr
+- fi
+- fi
++ if test ! -z "$lasterr"; then
++ errstatus=$lasterr
++ fi
++ fi
+ fi
+ fi
+
+@@ -107,5 +143,8 @@
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
+ # End:
+-# mkinstalldirs ends here
+--- a/admin/ylwrap
++++ b/admin/ylwrap
+@@ -1,6 +1,11 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++
++scriptversion=2004-09-10.20
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 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
+@@ -22,44 +27,65 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
+-# Usage:
+-# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+-# * INPUT is the input file
+-# * OUTPUT is file PROG generates
+-# * DESIRED is file we actually want
+-# * PROGRAM is program to run
+-# * ARGS are passed to PROG
+-# Any number of OUTPUT,DESIRED pairs may be used.
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++case "$1" in
++ '')
++ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
++ exit 1
++ ;;
++ --basedir)
++ basedir=$2
++ shift 2
++ ;;
++ -h|--h*)
++ cat <<\EOF
++Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
++
++Wrapper for lex/yacc invocations, renaming files as desired.
++
++ INPUT is the input file
++ OUTPUT is one file PROG generates
++ DESIRED is the file we actually want instead of OUTPUT
++ PROGRAM is program to run
++ ARGS are passed to PROG
++
++Any number of OUTPUT,DESIRED pairs may be used.
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit 0
++ ;;
++ -v|--v*)
++ echo "ylwrap $scriptversion"
++ exit 0
++ ;;
++esac
++
+
+ # The input.
+ input="$1"
+ shift
+ case "$input" in
+- [\\/]* | ?:[\\/]*)
++ [\\/]* | ?:[\\/]*)
+ # Absolute path; do nothing.
+ ;;
+- *)
++ *)
+ # Relative path. Make it absolute.
+ input="`pwd`/$input"
+ ;;
+ esac
+
+-# The directory holding the input.
+-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+-# Quote $INPUT_DIR so we can use it in a regexp.
+-# FIXME: really we should care about more than `.' and `\'.
+-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
+-
+-echo "got $input_rx"
+-
+ pairlist=
+ while test "$#" -ne 0; do
+- if test "$1" = "--"; then
+- shift
+- break
+- fi
+- pairlist="$pairlist $1"
+- shift
++ if test "$1" = "--"; then
++ shift
++ break
++ fi
++ pairlist="$pairlist $1"
++ shift
+ done
+
+ # The program to run.
+@@ -67,8 +93,8 @@
+ shift
+ # Make any relative path in $prog absolute.
+ case "$prog" in
+- [\\/]* | ?:[\\/]*) ;;
+- *[\\/]*) prog="`pwd`/$prog" ;;
++ [\\/]* | ?:[\\/]*) ;;
++ *[\\/]*) prog="`pwd`/$prog" ;;
+ esac
+
+ # FIXME: add hostname here for parallel makes that run commands on
+@@ -79,65 +105,118 @@
+
+ cd $dirname
+
+-$prog ${1+"$@"} "$input"
+-status=$?
++case $# in
++ 0) $prog "$input" ;;
++ *) $prog "$@" "$input" ;;
++esac
++ret=$?
+
+-if test $status -eq 0; then
+- set X $pairlist
+- shift
+- first=yes
+- # Since DOS filename conventions don't allow two dots,
+- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+- y_tab_nodot="no"
+- if test -f y_tab.c || test -f y_tab.h; then
+- y_tab_nodot="yes"
+- fi
+-
+- while test "$#" -ne 0; do
+- from="$1"
+- # Handle y_tab.c and y_tab.h output by DOS
+- if test $y_tab_nodot = "yes"; then
+- if test $from = "y.tab.c"; then
+- from="y_tab.c"
+- else
+- if test $from = "y.tab.h"; then
+- from="y_tab.h"
+- fi
+- fi
+- fi
+- if test -f "$from"; then
+- # If $2 is an absolute path name, then just use that,
+- # otherwise prepend `../'.
+- case "$2" in
+- [\\/]* | ?:[\\/]*) target="$2";;
+- *) target="../$2";;
+- esac
+-
+- # Edit out `#line' or `#' directives. We don't want the
+- # resulting debug information to point at an absolute srcdir;
+- # it is better for it to just mention the .y file with no
+- # path.
+- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
++ set X $pairlist
++ shift
++ first=yes
++ # Since DOS filename conventions don't allow two dots,
++ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
++ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
++ y_tab_nodot="no"
++ if test -f y_tab.c || test -f y_tab.h; then
++ y_tab_nodot="yes"
++ fi
++
++ # The directory holding the input.
++ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
++ # Quote $INPUT_DIR so we can use it in a regexp.
++ # FIXME: really we should care about more than `.' and `\'.
++ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
++
++ while test "$#" -ne 0; do
++ from="$1"
++ # Handle y_tab.c and y_tab.h output by DOS
++ if test $y_tab_nodot = "yes"; then
++ if test $from = "y.tab.c"; then
++ from="y_tab.c"
+ else
+- # A missing file is only an error for the first file. This
+- # is a blatant hack to let us support using "yacc -d". If -d
+- # is not specified, we don't want an error when the header
+- # file is "missing".
+- if test $first = yes; then
+- status=1
+- fi
++ if test $from = "y.tab.h"; then
++ from="y_tab.h"
++ fi
+ fi
+- shift
+- shift
+- first=no
+- done
++ fi
++ if test -f "$from"; then
++ # If $2 is an absolute path name, then just use that,
++ # otherwise prepend `../'.
++ case "$2" in
++ [\\/]* | ?:[\\/]*) target="$2";;
++ *) target="../$2";;
++ esac
++
++ # We do not want to overwrite a header file if it hasn't
++ # changed. This avoid useless recompilations. However the
++ # parser itself (the first file) should always be updated,
++ # because it is the destination of the .y.c rule in the
++ # Makefile. Divert the output of all other files to a temporary
++ # file so we can compare them to existing versions.
++ if test $first = no; then
++ realtarget="$target"
++ target="tmp-`echo $target | sed s/.*[\\/]//g`"
++ fi
++ # Edit out `#line' or `#' directives.
++ #
++ # We don't want the resulting debug information to point at
++ # an absolute srcdir; it is better for it to just mention the
++ # .y file with no path.
++ #
++ # We want to use the real output file name, not yy.lex.c for
++ # instance.
++ #
++ # We want the include guards to be adjusted too.
++ FROM=`echo "$from" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++ TARGET=`echo "$2" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++
++ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
++ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
++
++ # Check whether header files must be updated.
++ if test $first = no; then
++ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
++ echo "$2" is unchanged
++ rm -f "$target"
++ else
++ echo updating "$2"
++ mv -f "$target" "$realtarget"
++ fi
++ fi
++ else
++ # A missing file is only an error for the first file. This
++ # is a blatant hack to let us support using "yacc -d". If -d
++ # is not specified, we don't want an error when the header
++ # file is "missing".
++ if test $first = yes; then
++ ret=1
++ fi
++ fi
++ shift
++ shift
++ first=no
++ done
+ else
+- status=$?
++ ret=$?
+ fi
+
+ # Remove the directory.
+ cd ..
+ rm -rf $dirname
+
+-exit $status
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
Added: people/dato/kde-common/patches/03_libtool_arm.diff
===================================================================
--- people/dato/kde-common/patches/03_libtool_arm.diff 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches/03_libtool_arm.diff 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,21 @@
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
+@@ -2180,17 +2180,7 @@
+
+ # This must be Linux ELF.
+ linux*)
+- case $host_cpu in
+- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+- arm* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- *)
+- # glibc up to 2.1.1 does not perform some relocations on ARM
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+- esac
+- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ netbsd*)
Added: people/dato/kde-common/patches/04_am_maintainer_mode.diff
===================================================================
--- people/dato/kde-common/patches/04_am_maintainer_mode.diff 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches/04_am_maintainer_mode.diff 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,11 @@
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -19,6 +19,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
++
+ AC_PROG_INSTALL
+
+ dnl generate the config header
Added: people/dato/kde-common/patches/05_pedantic-errors.diff
===================================================================
--- people/dato/kde-common/patches/05_pedantic-errors.diff 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches/05_pedantic-errors.diff 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2087,9 +2087,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
Added: people/dato/kde-common/patches/06_automake-1.9.diff
===================================================================
--- people/dato/kde-common/patches/06_automake-1.9.diff 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches/06_automake-1.9.diff 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,11 @@
+--- a/admin/detect-autoconf.sh
++++ b/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
+
+ # We don't use variable here for remembering the type ... strings. Local
+ # variables are not that portable, but we fear namespace issues with our
Added: people/dato/kde-common/patches/README
===================================================================
--- people/dato/kde-common/patches/README 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches/README 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,4 @@
+The patches under debian/common/patches are meant to be applied to all
+packages using the kde-common subdirectory. If it's regarded necessary
+in the future, a method to skip some patches for some packages shall be
+introduced.
Added: people/dato/kde-common/patches.sh
===================================================================
--- people/dato/kde-common/patches.sh 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/patches.sh 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,55 @@
+#! /bin/sh
+# Very simple patching system with uu-encoded patches support
+# $Id$
+
+set -e
+
+dir=`pwd`
+patchesdirs="debian/common/patches debian/patches" # it's ok if they don't exist
+
+case $1 in
+ apply)
+ # Decode uu-encoded patches
+ for uu in $(find $patchesdirs -name '*.uu'); do
+ cd `dirname $uu`
+ uudecode `basename $uu`
+ cd $dir
+ done
+
+ # List of patches
+ patches=$(find $patchesdirs -name '*.diff' | sort)
+
+ # Apply
+ if test ! -f patch-stamp; then
+ for patch in $patches; do
+ echo "APPLYING PATCH: ${patch##*/}"
+ patch -p1 < "$patch"
+ done
+
+ touch patch-stamp
+ fi
+
+ ;;
+
+ unapply)
+ # List of patches
+ patches=$(find $patchesdirs -name '*.diff' | sort -r)
+
+ # Unapply
+ if test -f patch-stamp; then
+ for patch in $patches; do
+ echo "REMOVING PATCH: ${patch##*/}"
+ patch -p1 -R < "$patch"
+ done
+
+ # Remove decoded patches
+ for uu in $(find $patchesdirs -name '*.uu'); do
+ rm -f "${uu%%.uu}"
+ done
+
+ # Remove stamp
+ rm -f patch-stamp
+ fi
+ ;;
+
+esac
Property changes on: people/dato/kde-common/patches.sh
___________________________________________________________________
Name: svn:keywords
+ Id
Added: people/dato/kde-common/rules.mk
===================================================================
--- people/dato/kde-common/rules.mk 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/rules.mk 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,169 @@
+# Common makefile bits for KDE packages.
+# Creation date: 2004-10-30.
+# $Id$
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+ perl -w admin/debianrules echodirs > debian/debiandirs
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ # Apply Debian specific patches
+ sh debian/common/patches.sh apply
+
+ # KDE CVS does not have aclocal.m4 or configure
+ if test ! -f configure; then \
+ $(MAKE) -f admin/Makefile.common dist ;\
+ fi
+
+ # ensure configure is executable
+ chmod +x configure
+
+ # make build directory
+ -mkdir $(objdir)
+
+ # run configure with build tree $(objdir)
+ cd $(objdir) && \
+ ../configure $(configkde) $(CONFIGURE_FLAGS) --disable-dependency-tracking
+
+ touch configure-stamp
+
+# Build targets
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+ dh_testdir
+
+ cd $(objdir) && $(MAKE) $(BUILD_ARCH_MAKE_TARGETS)
+
+ # Generate manpages from sgml (if present)
+ for man in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$man > `dirname $$man`/`basename $$man .sgml`.1; \
+ done
+
+ touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
+ dh_testdir
+
+ cd $(objdir) && $(MAKE) $(BUILD_INDEP_MAKE_TARGETS)
+
+ touch build-indep-stamp
+
+# Clean targets
+debian-clean:
+ dh_testdir
+ dh_testroot
+
+ dh_clean
+
+clean::
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp configure-stamp \
+ debian/debiandirs debian/substvars
+
+ # Remove manpages *iff* they were generated from sgml
+ for man in $$(find debian/man -name '*.sgml'); do \
+ rm -f `dirname $$man`/`basename $$man .sgml`.1; \
+ done
+
+ # Remove Debian specific patches
+ sh debian/common/patches.sh unapply
+
+ # Remove build tree
+ rm -rf $(objdir)
+
+ # if Makefile exists run distclean
+ if test -f Makefile; then \
+ $(MAKE) distclean; \
+ fi
+
+ if test -d CVS; then \
+ $(MAKE) -f admin/Makefile.common cvs-clean ;\
+ fi
+
+ dh_clean
+
+# Install targets
+install: install-arch install-indep
+
+install-arch::
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ cd $(objdir) && \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ dh_install -s
+
+install-indep::
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ cd $(objdir) && \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ dh_install -i
+
+# Binary targets
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installxfonts
+ dh_installchangelogs
+ dh_installdocs
+# dh_installexamples
+ dh_installmenu
+ dh_installdebconf
+ dh_installlogrotate
+# dh_installemacsen
+ dh_installpam
+ dh_installmime
+ dh_installinit $(DH_INSTALLINIT_ARGS)
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress $(DH_COMPRESS_ARGS)
+ dh_fixperms $(DH_FIXPERMS_ARGS)
+ dh_perl
+ dh_python
+ dh_makeshlibs $(DH_MAKESHLIBS_ARGS)
+ dh_installdeb
+ dh_shlibdeps $(DH_SHLIBDEPS_ARGS)
+
+ sh debian/common/substvars.sh
+
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ if grep -qE '^Architecture: +all *$$' debian/control; then \
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common; \
+ fi
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+ @echo; echo; echo "Checking for not installed files..."
+ @-dh_install --no-act --list-missing 2>&1 | sort | diff - debian/not-installed.known
+
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
Property changes on: people/dato/kde-common/rules.mk
___________________________________________________________________
Name: svn:keywords
+ Id
Added: people/dato/kde-common/substvars.sh
===================================================================
--- people/dato/kde-common/substvars.sh 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/substvars.sh 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,50 @@
+#! /bin/sh
+# This file writes debian/substvars and appends it to
+# debian/$packages.substvars. Called from common/rules.mk after dh_shlibdeps.
+# $Id$
+
+listpackages=debian/common/list-packages
+chmod +x $listpackages
+
+OUT=debian/substvars
+exec >$OUT
+
+# Package version, package upstream version, package next upstream version
+VERSION=`dpkg-parsechangelog | grep -E '^Version:' | cut -f 2 -d ' '`
+VERSION_NODEB=`echo $VERSION | sed -e s/-[^-]*$//`
+VERSION_NODEB_NEXT=`echo $VERSION_NODEB | perl -pe 's/(?<=\.)(\d+)$/($1+1)/e'`
+
+# Build-Dependencies on kdelibs4-dev go like kdelibs4-dev (>> ${Source-Version-NoDebRev})
+echo "Source-Version-NoDebRev=$VERSION_NODEB"
+
+# This next two loops provide a ${Variable} for each package, with the
+# following dependency policy: dependencies on arch-specific packages
+# use an exact version; dependencies on arch-all packages only require
+# the same upstream version (to allow binary NMUs).
+#
+# Later, it should be discussed the tightening the policy to: "packages
+# from a same source package must be all at the same version." See my
+# comments on Bug#276607. Currently, only packages with dependencies
+# between them are forced to be the same version; the commented third
+# loop would force *all* packages from a same source to be at the same
+# version. Hopefully it won't be necessary.
+
+for p in `$listpackages arch`; do
+ echo "$p:Depends=$p (= $VERSION)"
+done
+
+for p in `$listpackages indep`; do
+ echo "$p:Depends=$p (>> $VERSION_NODEB), $p (<< $VERSION_NODEB_NEXT)"
+done
+
+# Conflicts for $source-base
+# echo -n "Strict-Conflicts="
+# for p in `$listpackages arch`; do
+# echo -n "$p (<< $VERSION_NODEB), $p (>> $VERSION_NODEB_NEXT),"
+# done
+# echo
+
+# I'd like to know if this can be done less uglyly
+for p in `$listpackages`; do
+ cat $OUT >>debian/$p.substvars
+done
Property changes on: people/dato/kde-common/substvars.sh
___________________________________________________________________
Name: svn:keywords
+ Id
Added: people/dato/kde-common/vars.mk
===================================================================
--- people/dato/kde-common/vars.mk 2004-10-30 00:24:00 UTC (rev 163)
+++ people/dato/kde-common/vars.mk 2004-10-30 21:03:49 UTC (rev 164)
@@ -0,0 +1,28 @@
+# Common variables for KDE packages.
+# $Id$
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# Build dir
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+# dh_* default arguments
+DH_COMPRESS_ARGS ?= -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
+DH_MAKESHLIBS_ARGS ?= -V
Property changes on: people/dato/kde-common/vars.mk
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: