[csw-devel] SF.net SVN: gar:[4580] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Apr 27 15:01:52 CEST 2009
Revision: 4580
http://gar.svn.sourceforge.net/gar/?rev=4580&view=rev
Author: dmichelsen
Date: 2009-04-27 13:01:51 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
wmmail: Add legacy build description from Michael Gernoth
Added Paths:
-----------
csw/mgar/pkg/wmmail/
csw/mgar/pkg/wmmail/trunk/
csw/mgar/pkg/wmmail/trunk/legacy/
csw/mgar/pkg/wmmail/trunk/legacy/scripts/
csw/mgar/pkg/wmmail/trunk/legacy/scripts/analyzer.pl
csw/mgar/pkg/wmmail/trunk/legacy/scripts/human.pl
csw/mgar/pkg/wmmail/trunk/legacy/scripts/pkghelper.pl
csw/mgar/pkg/wmmail/trunk/legacy/sources/
csw/mgar/pkg/wmmail/trunk/legacy/sources/wmmail-debian.patch
csw/mgar/pkg/wmmail/trunk/legacy/sources/wmmail-proplist.patch
csw/mgar/pkg/wmmail/trunk/legacy/specs/
csw/mgar/pkg/wmmail/trunk/legacy/specs/Makefile
csw/mgar/pkg/wmmail/trunk/legacy/specs/wmmail
Added: csw/mgar/pkg/wmmail/trunk/legacy/scripts/analyzer.pl
===================================================================
--- csw/mgar/pkg/wmmail/trunk/legacy/scripts/analyzer.pl (rev 0)
+++ csw/mgar/pkg/wmmail/trunk/legacy/scripts/analyzer.pl 2009-04-27 13:01:51 UTC (rev 4580)
@@ -0,0 +1,22 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my %counter;
+
+while (<>) {
+ if (/\"GET (\/csw\/.*) HTTP\/.\..\"/) {
+ # print "match: $1\n";
+ my $path = $1;
+
+ if ($path =~ /\/csw\/(unstable|stable)\/(sparc|i386)\/5\.(8|9|10)\/([^-]*)-.*\.pkg.gz/) {
+ # print "real match: $1 $2 $3 $4\n";
+ $counter{$4}++;
+ }
+
+ }
+}
+
+foreach my $pkg (reverse(sort {$counter{$a} <=> $counter{$b} or $b cmp $a} (keys(%counter)))) {
+ printf "% 20.20s -> %d\n", $pkg, $counter{$pkg};
+}
Added: csw/mgar/pkg/wmmail/trunk/legacy/scripts/human.pl
===================================================================
--- csw/mgar/pkg/wmmail/trunk/legacy/scripts/human.pl (rev 0)
+++ csw/mgar/pkg/wmmail/trunk/legacy/scripts/human.pl 2009-04-27 13:01:51 UTC (rev 4580)
@@ -0,0 +1,315 @@
+#!/usr/bin/perl -w
+#
+# $Id: human.pl,v 1.1 2004/03/09 10:21:13 simigern Exp $
+#
+# Copyright (c) 2000-2001, Jeremy Mates. This script is free
+# software; you can redistribute it and/or modify it under the same
+# terms as Perl itself.
+#
+# Run perldoc(1) on this file for additional documentation.
+#
+######################################################################
+#
+# REQUIREMENTS
+
+require 5;
+
+use strict;
+
+######################################################################
+#
+# MODULES
+
+use Carp; # better error reporting
+use Getopt::Std; # command line option processing
+
+######################################################################
+#
+# VARIABLES
+
+my $VERSION;
+($VERSION = '$Revision: 1.1 $ ') =~ s/[^0-9.]//g;
+
+my (%opts, $base, $regex);
+
+# various parameters that adjust how the humanization is done
+# these really should be able to be specified on the command line, or
+# read in from a prefs file somewhere, as nobody will agree as to what
+# "proper" human output should look like... :)
+my %format = (
+ # include decimals in output? (e.g. 25.8 K vs. 26 K)
+ 'decimal' => 1,
+ # include .0 in decmail output?
+ 'decimal_zero' => 1,
+ # what to divide file sizes down by
+ # 1024 is generally "Kilobytes," while 1000 is
+ # "kilobytes," technically
+ 'factor' => 1024,
+ # percentage above which will be bumped up
+ # (e.g. 999 bytes -> 1 K as within 5% of 1024)
+ # set to undef to turn off
+ 'fudge' => 0.95,
+ # lengths above which decimals will not be included
+ # for better readability
+ 'max_human_length' => 2,
+ # list of suffixes for human readable output
+ 'suffix' => [ '', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' ],
+ );
+
+# default conversion to do nothing
+$base = 1;
+
+# default to working on runs of 4 or more digits
+$regex = '(?:(?<=\s)|(?<=^))(-?\d{4,})(?:\.\d*){0,1}(?=$|\s)';
+
+######################################################################
+#
+# MAIN
+
+# parse command-line options
+getopts('h?kb:m:', \%opts);
+
+help() if exists $opts{'h'} or exists $opts{'?'};
+
+# set the base conversion factor
+if (exists $opts{'b'}) {
+ ($base) = $opts{'b'} =~ m/(\d+)/;
+ die "Error: base should be a positive integer\n" unless $base;
+}
+
+$base = 1024 if exists $opts{'k'};
+
+# set different regex if requried, add matching parens if none
+# detected in input, as we need to match *something*
+$regex = $opts{'m'} if exists $opts{'m'};
+$regex = '(' . $regex . ')' unless $regex =~ m/\(.+\)/;
+
+while (<STDIN>) {
+ s/$regex/humanize($1)/ego;
+ print;
+}
+
+exit;
+
+######################################################################
+#
+# SUBROUTINES
+
+# Inspired from GNU's df -h output, which fixes 133456345 bytes
+# to be something human readable.
+#
+# takes a number, returns formatted string.
+sub humanize {
+ my $num = shift;
+
+ # error checking on input...
+ return $num unless $num =~ m/^-?\d+$/;
+
+ # some local working variables
+ my $count = 0;
+ my $prefix = '';
+ my $tmp = '';
+ my $orig_len = length $num;
+
+ # handle negatives
+ if ($num < 0 ) {
+ $num = abs $num;
+ $prefix = '-';
+ }
+
+ # adjust number to proper base
+ $num *= $base;
+
+ # reduce number to something readable by factor specified
+ while ($num > $format{'factor'}) {
+ $num /= $format{'factor'};
+ $count++;
+ }
+
+ # optionally fudge "near" values up to next higher level
+ if (defined $format{'fudge'}) {
+ if ($num > ($format{'fudge'} * $format{'factor'})) {
+ $count++;
+ $num /= $format{'factor'};
+ }
+ }
+
+ # no .[1-9] decimal on longer numbers for easier reading
+ # only show decimal if format say so
+ if (length sprintf("%.f", $num) > $format{'max_human_length'} ||
+ ! $format{'decimal'}) {
+
+ $tmp = sprintf("%.0f", $num);
+
+ } else {
+ $tmp = sprintf("%.1f", $num);
+
+ # optionally hack trailing .0 as is not needed
+ $tmp =~ s/\.0$// unless $format{'decimal_zero'};
+ }
+
+ # return number with proper style applied and leading whitespace
+ # for proper right-justification
+ $tmp = $prefix . $tmp . $format{'suffix'}->[$count];
+ return (' ' x ($orig_len - length $tmp)) . $tmp;
+}
+
+# a generic help blarb
+sub help {
+ print <<"HELP";
+Usage: $0 [opts]
+
+Script to humanize numbers in data.
+
+Options for version $VERSION:
+ -h/-? Display this message
+
+ -b nn Integer to offset incoming data by.
+ -k Default incoming data to Kilobtyes. Default: bytes.
+
+ -m rr Regex to match what to operate on. Default: $regex.
+
+Run perldoc(1) on this script for additional documentation.
+
+HELP
+ exit;
+}
+
+######################################################################
+#
+# DOCUMENTATION
+
+=head1 NAME
+
+human.pl - humanizes file sizes in data
+
+=head1 SYNOPSIS
+
+Make df(1) output readable on systems lacking the human output option:
+
+ $ df -k | human.pl -k
+
+=head1 DESCRIPTION
+
+Intended as a quick way to humanize the output from random programs
+that displays unreadable file sizes, such as df(1) on large file
+systems:
+
+ $ df -k | grep nfs
+ nfs:/mbt 1026892400 704296472 322595928 69% /mbt
+
+While certain utilities now support humanized output internally, not
+all systems have those utilities. Hence, this perl script is intended
+to fill that gap util more utilities support humanization routines
+directly. This will become more important as file systems continue to
+grow, and the exact number of bytes something takes up less meaningful
+to the user.
+
+The data munged by this script is less accurate, in that rounding is
+done in an effort to make the numbers more readable by a human. In
+the above case, the munged data would look like:
+
+ $ df -k | grep nfs | human.pl -k
+ nfs:/mbt 1.0T 672G 308G 69% /mbt
+
+=head2 Normal Usage
+
+ $ human.pl [options]
+
+See L<"OPTIONS"> for details on the command line switches supported.
+
+human.pl expects the data to be humanized to come via STDIN, and
+results will be piped to STDOUT. Input can either be from a program,
+or you can interactively type numbers into the terminal and get a
+humanized size back.
+
+=head1 OPTIONS
+
+This script currently supports the following command line switches:
+
+=over 4
+
+=item B<-h>, B<-?>
+
+Prints a brief usage note about the script.
+
+=item B<-b> I<base>
+
+Optional integer to factor the incoming data by. The humanizing
+routine operates on bytes by default, so numbers of different formats
+will have to be adjusted accordingly.
+
+The value should be one that adjusts the incoming data to be in bytes
+format; for example, incoming data in Kilobytes would need a base of
+1024 to be converted properly to bytes, as there are 1024 bytes in
+each Kilobyte.
+
+=item B<-k>
+
+Overrides B<-b> and treats the incoming data as if in Kilobytes.
+
+=item B<-m> I<regex>
+
+Optional perl regex to specify what in the incoming data should be
+operated on; the default of digit runs of four or more characters
+should be reasonable in most cases.
+
+Your regex should match integers of some kind; otherwise, the script
+will generally do nothing with your data and not print any warnings.
+If you are matching numbers inside of a more complictated regex, you
+will need to put parentheses around the number you want changed, and
+use non-capturing parentheses for preceeding items, as only $1 is
+passed to the humanizing routine. See perlre(1) for more details.
+
+If you leave parentheses out of your regex, they will be added around
+it by default. This lets you supply regex like '\d{7,}' and have it
+work, which is the same as saying '(\d{7,})' in this case.
+
+=back
+
+=head1 BUGS
+
+=head2 Reporting Bugs
+
+Newer versions of this script may be available from:
+
+http://sial.org/code/perl/
+
+If the bug is in the latest version, send a report to the author.
+Patches that fix problems or add new features are welcome.
+
+=head2 Known Issues
+
+No known issues.
+
+=head1 TODO
+
+Option to read humanizing prefs from a external location would be a
+nice idea.
+
+=head1 SEE ALSO
+
+perl(1)
+
+=head1 AUTHOR
+
+Jeremy Mates, http://sial.org/contact/
+
+=head1 COPYRIGHT
+
+Copyright (c) 2000-2001, Jeremy Mates. This script is free
+software; you can redistribute it and/or modify it under the same
+terms as Perl itself.
+
+=head1 HISTORY
+
+Inspired from the B<-h> option present in GNU df, which is sorely
+lacking in commercial varients of the same name. (On the other hand,
+leaving the job of humanizing to an external script is probably more
+inline with the unix philosphopy of filters.)
+
+=head1 VERSION
+
+ $Id: human.pl,v 1.1 2004/03/09 10:21:13 simigern Exp $
+
+=cut
Added: csw/mgar/pkg/wmmail/trunk/legacy/scripts/pkghelper.pl
===================================================================
--- csw/mgar/pkg/wmmail/trunk/legacy/scripts/pkghelper.pl (rev 0)
+++ csw/mgar/pkg/wmmail/trunk/legacy/scripts/pkghelper.pl 2009-04-27 13:01:51 UTC (rev 4580)
@@ -0,0 +1,696 @@
+#!/opt/csw/bin/perl -w
+use strict;
+use warnings FATAL => 'uninitialized';
+
+use FindBin qw($RealBin $RealScript);
+use File::Basename;
+use Getopt::Long;
+
+my @csw_ignore = qw(
+opt/csw
+opt/csw/bin
+opt/csw/bin/sparcv8
+opt/csw/bin/sparcv8plus
+opt/csw/bin/sparcv8plus+vis
+opt/csw/bin/sparcv9
+opt/csw/lib
+opt/csw/lib/X11
+opt/csw/lib/X11/app-defaults
+opt/csw/lib/sparcv8plus
+opt/csw/lib/sparcv8plus+vis
+opt/csw/lib/sparcv9
+opt/csw/sbin
+opt/csw/share
+opt/csw/share/doc
+opt/csw/share/info
+opt/csw/share/locale
+opt/csw/share/locale/az
+opt/csw/share/locale/az/LC_MESSAGES
+opt/csw/share/locale/be
+opt/csw/share/locale/be/LC_MESSAGES
+opt/csw/share/locale/bg
+opt/csw/share/locale/bg/LC_MESSAGES
+opt/csw/share/locale/ca
+opt/csw/share/locale/ca/LC_MESSAGES
+opt/csw/share/locale/cs
+opt/csw/share/locale/cs/LC_MESSAGES
+opt/csw/share/locale/da
+opt/csw/share/locale/da/LC_MESSAGES
+opt/csw/share/locale/de
+opt/csw/share/locale/de/LC_MESSAGES
+opt/csw/share/locale/el
+opt/csw/share/locale/el/LC_MESSAGES
+opt/csw/share/locale/en at boldquot
+opt/csw/share/locale/en at boldquot/LC_MESSAGES
+opt/csw/share/locale/en at quot
+opt/csw/share/locale/en at quot/LC_MESSAGES
+opt/csw/share/locale/es
+opt/csw/share/locale/es/LC_MESSAGES
+opt/csw/share/locale/et
+opt/csw/share/locale/et/LC_MESSAGES
+opt/csw/share/locale/eu
+opt/csw/share/locale/eu/LC_MESSAGES
+opt/csw/share/locale/fi
+opt/csw/share/locale/fi/LC_MESSAGES
+opt/csw/share/locale/fr
+opt/csw/share/locale/fr/LC_MESSAGES
+opt/csw/share/locale/ga
+opt/csw/share/locale/ga/LC_MESSAGES
+opt/csw/share/locale/gl
+opt/csw/share/locale/gl/LC_MESSAGES
+opt/csw/share/locale/he
+opt/csw/share/locale/he/LC_MESSAGES
+opt/csw/share/locale/hr
+opt/csw/share/locale/hr/LC_MESSAGES
+opt/csw/share/locale/hu
+opt/csw/share/locale/hu/LC_MESSAGES
+opt/csw/share/locale/id
+opt/csw/share/locale/id/LC_MESSAGES
+opt/csw/share/locale/it
+opt/csw/share/locale/it/LC_MESSAGES
+opt/csw/share/locale/ja
+opt/csw/share/locale/ja/LC_MESSAGES
+opt/csw/share/locale/ko
+opt/csw/share/locale/ko/LC_MESSAGES
+opt/csw/share/locale/locale.alias
+opt/csw/share/locale/lt
+opt/csw/share/locale/lt/LC_MESSAGES
+opt/csw/share/locale/nl
+opt/csw/share/locale/nl/LC_MESSAGES
+opt/csw/share/locale/nn
+opt/csw/share/locale/nn/LC_MESSAGES
+opt/csw/share/locale/no
+opt/csw/share/locale/no/LC_MESSAGES
+opt/csw/share/locale/pl
+opt/csw/share/locale/pl/LC_MESSAGES
+opt/csw/share/locale/pt
+opt/csw/share/locale/pt/LC_MESSAGES
+opt/csw/share/locale/pt_BR
+opt/csw/share/locale/pt_BR/LC_MESSAGES
+opt/csw/share/locale/ro
+opt/csw/share/locale/ro/LC_MESSAGES
+opt/csw/share/locale/ru
+opt/csw/share/locale/ru/LC_MESSAGES
+opt/csw/share/locale/sk
+opt/csw/share/locale/sk/LC_MESSAGES
+opt/csw/share/locale/sl
+opt/csw/share/locale/sl/LC_MESSAGES
+opt/csw/share/locale/sp
+opt/csw/share/locale/sp/LC_MESSAGES
+opt/csw/share/locale/sr
+opt/csw/share/locale/sr/LC_MESSAGES
+opt/csw/share/locale/sv
+opt/csw/share/locale/sv/LC_MESSAGES
+opt/csw/share/locale/tr
+opt/csw/share/locale/tr/LC_MESSAGES
+opt/csw/share/locale/uk
+opt/csw/share/locale/uk/LC_MESSAGES
+opt/csw/share/locale/vi
+opt/csw/share/locale/vi/LC_MESSAGES
+opt/csw/share/locale/wa
+opt/csw/share/locale/wa/LC_MESSAGES
+opt/csw/share/locale/zh
+opt/csw/share/locale/zh/LC_MESSAGES
+opt/csw/share/locale/zh_CN
+opt/csw/share/locale/zh_CN/LC_MESSAGES
+opt/csw/share/locale/zh_CN.GB2312
+opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES
+opt/csw/share/locale/zh_TW
+opt/csw/share/locale/zh_TW/LC_MESSAGES
+opt/csw/share/locale/zh_TW.Big5
+opt/csw/share/locale/zh_TW.Big5/LC_MESSAGES
+opt/csw/share/man
+);
+
+my @csw_dirs = qw();
+#my @csw_dirs = qw(
+#etc/init.d
+#etc/rc0.d
+#etc/rc1.d
+#etc/rc2.d
+#etc/rc3.d
+#etc/rcS.d
+#opt/csw
+#opt/csw/etc
+#opt/csw/bin
+#opt/csw/bin/sparcv8
+#opt/csw/bin/sparcv8plus
+#opt/csw/bin/sparcv8plus+vis
+#opt/csw/bin/sparcv9
+#opt/csw/sbin
+#opt/csw/share
+#opt/csw/share/doc
+#opt/csw/share/locale
+#opt/csw/share/man
+#opt/csw/share/man/man1
+#opt/csw/share/man/man2
+#opt/csw/share/man/man3
+#opt/csw/share/man/man4
+#opt/csw/share/man/man5
+#opt/csw/share/man/man6
+#opt/csw/share/man/man7
+#opt/csw/share/man/man8
+#opt/csw/share/info
+#opt/csw/lib
+#opt/csw/lib/X11
+#opt/csw/lib/X11/app-defaults
+#opt/csw/include
+#opt/csw/libexec
+#opt/csw/var
+#);
+
+my @possible_scripts = qw(request checkinstall preinstall postinstall preremove postremove);
+
+my @sunwsprolocs = ('/opt/forte11x86/SUNWspro/bin', '/opt/forte11/SUNWspro/bin', '/opt/studio/SOS11/SUNWspro/bin', '/opt/studio/SOS10/SUNWspro/bin', '/opt/forte8/SUNWspro/bin', '/opt/SUNWspro/bin');
+my $builddir = $ENV{'BUILDDIR'} || '/opt/build/michael';
+my $packagedir = $ENV{'PACKAGEDIR'} || "${RealBin}/../packages";
+my $content = "/var/sadm/install/contents";
+my %options; # getopt
+
+# variables defined via eval
+my $progname = undef;
+my $version = undef;
+my $buildroot = undef;
+my $category = undef;
+my $vendor = undef;
+my $hotline = 'http://www.opencsw.org/bugtrack/';
+my $email = 'michael at opencsw.org';
+my @sources = undef;
+my $prepatch = undef;
+my @patches = (); # default to no patches
+my $copyright = undef;
+my $build = undef;
+my $suffix = undef;
+my $rev = undef;
+my $arch = undef;
+my $osversion = undef;
+my @packages = undef;
+my @isaexecs = ();
+my $sunwspropath = undef;
+my %attributes = ();
+my %seenpaths = ();
+my %contents = ();
+
+# helper applications
+my $tar = '/opt/csw/bin/gtar';
+
+sub
+prepare
+{
+ chdir($builddir) || die("can't change to $builddir");
+
+ foreach my $source (@sources) {
+ if (($source =~ /tar\.gz$/)
+ ||($source =~ /tgz$/)
+ ||($source =~ /tar\.Z$/)) {
+ system("/bin/gzcat ${RealBin}/../sources/${source} | ${tar} xf -");
+
+ } elsif ($source =~ /tar\.bz2$/) {
+ system("/bin/bzcat ${RealBin}/../sources/${source} | ${tar} xf -");
+
+ } elsif ($source =~ /tar$/) {
+ system("${tar} xf ${RealBin}/../sources/${source}");
+
+ } else {
+ die("don't know how to extrace ${source}");
+ }
+ }
+
+ if (defined($prepatch)) {
+ open(PREPATCH, "> $builddir/prepatch") || die ("can't create $builddir/prepatch: $!");
+ print PREPATCH $prepatch;
+ close(PREPATCH);
+ system("chmod +x $builddir/prepatch");
+ system("/bin/bash -x $builddir/prepatch");
+ unlink("$builddir/prepatch");
+ }
+
+ foreach my $patch (@patches) {
+ chdir("$builddir/@{$patch}[1]") || die("can't change to $builddir/@{$patch}[1]");
+ system("gpatch @{$patch}[2] < ${RealBin}/../sources/@{$patch}[0]");
+ }
+}
+
+sub probe_directory
+{
+ while (my $dir = shift) {
+ -d $dir && return $dir;
+ }
+
+ return undef;
+}
+
+
+sub
+isaexec
+{
+ foreach my $exec (@isaexecs) {
+ open(ISA, "> ${builddir}/isaexec.c") || die("can't create ${builddir}/isaexec.c for overwrite: $!");
+ print ISA <<"EOF";
+#include <unistd.h>
+
+int
+main(int argc, char *argv[], char *envp[])
+{
+ return (isaexec("${exec}", argv, envp));
+}
+EOF
+ close(ISA);
+ system("${sunwspropath}/cc -o ${buildroot}${exec} ${builddir}/isaexec.c");
+ unlink("${builddir}/isaexec.c");
+ }
+}
+
+sub
+build
+{
+ chdir($builddir) || die("can't change to $builddir");
+
+ open(BUILD, "> $builddir/build") || die ("can't create $builddir/build: $!");
+ print BUILD $build;
+ close(BUILD);
+ system("chmod +x $builddir/build");
+ system("/bin/bash -x $builddir/build");
+ unlink("$builddir/build");
+ isaexec();
+ strip();
+}
+
+sub
+compute_ownership
+{
+ my $path = shift;
+ my $perm = shift;
+ my $user = 'root';
+ my $group = 'bin';
+
+ if (%attributes) {
+ $perm = $attributes{$path}->{perm} || $perm;
+ $user = $attributes{$path}->{user} || $user;
+ $group = $attributes{$path}->{group} || $group;
+ }
+
+ return "$perm $user $group\n";
+}
+
+# This functions purpose is to get sure that all directories in /path/to/file
+# are also in file list. It also accounts which filename was packaged in what
+# package. So that it possible to warn the user if a file has been packaed in
+# more than one package.
+
+sub
+verify_path
+{
+ my $r = shift;
+ my $prototype = shift;
+ my $path = shift;
+
+ push(@{$seenpaths{$path}}, "CSW$r->{pkgname}");
+
+ # Handle symlinks in the art of etc/rcS.d/K03cswsamba=../init.d
+ $path =~ s/=.*$//;
+
+ while ('.' ne ($path = dirname($path))) {
+ if (! grep($_ =~ /^d none \/\Q${path}\E\s+/, @$prototype)) {
+ pkgproto($r, $prototype, `echo ${path} | pkgproto`);
+ }
+ }
+}
+
+sub
+pkgproto
+{
+ my $r = shift;
+ my $prototype = shift;
+
+ while (my $line = shift) {
+ my @fields = split(/\s+/, $line);
+ if ($fields[0] eq 'd') {
+ # d none opt/csw 0755 sithglan icipguru
+ if ((! ($fields[2] =~ /\//)) || (grep($fields[2] eq $_, @csw_ignore)) ) {
+ # skip toplevel dirs (opt, etc, ...)
+
+ } elsif (grep($fields[2] eq $_, @csw_dirs)) {
+ unshift(@$prototype, "$fields[0] $fields[1] /$fields[2] ? ? ?\n");
+ } else {
+ unshift(@$prototype, "$fields[0] $fields[1] /$fields[2] " . compute_ownership("/$fields[2]", "$fields[3]"));
+ }
+
+ } elsif ($fields[0] eq 'f') {
+ # f none opt/csw 0755 sithglan icipguru
+ push(@$prototype, "$fields[0] $fields[1] /$fields[2] " . compute_ownership("/$fields[2]", "$fields[3]"));
+ verify_path($r, $prototype, $fields[2]);
+
+ } elsif ( ($fields[0] eq 's')
+ ||($fields[0] eq 'l')) {
+ push(@$prototype, "$fields[0] $fields[1] /$fields[2]\n");
+ verify_path($r, $prototype, $fields[2]);
+ } else {
+ die ("unknown line: <$line>");
+ }
+ }
+}
+
+sub
+generate_prototype
+{
+ my $r = shift;
+
+ my @prototype = ();
+
+ chdir($buildroot) || die("can't change to ${buildroot}: $!");
+ push(@prototype, "i pkginfo\n");
+ push(@prototype, "i depend\n");
+ if (defined(${copyright})) {
+ -f "$builddir/${copyright}" || die("can't find copyrightfile: $!");
+ system("cp $builddir/${copyright} copyright");
+ push(@prototype, "i copyright\n");
+ }
+ foreach my $file (@possible_scripts) {
+ if (defined($r->{"$file"})) {
+ -f "${RealBin}/../sources/$r->{$file}" || die("can't find $file: $!");
+ system("cp -f ${RealBin}/../sources/$r->{$file} $file");
+ push(@prototype, "i $file\n");
+ }
+ }
+
+ my @dirs = `gfind @{$r->{filelist}} -type d | sort | uniq | pkgproto`;
+ pkgproto($r, \@prototype, @dirs);
+ my @links = `gfind @{$r->{filelist}} -type l | sort | uniq | pkgproto`;
+ pkgproto($r, \@prototype, @links);
+ my @files = `gfind @{$r->{filelist}} -type f | sort | uniq | pkgproto`;
+ pkgproto($r, \@prototype, @files);
+
+ open(PROTOTYPE, "> ${buildroot}/prototype") || die("can't open ${buildroot}/prototype for overwrite: $!");
+ print PROTOTYPE @prototype;
+ close(PROTOTYPE);
+}
+
+sub
+uniq
+{
+ my %hash; @hash{@_} = ();
+ return sort keys %hash;
+}
+
+sub
+write_dependencies
+{
+ my $r = shift || die("one reference expected");
+
+ my @out = `pkginfo`;
+ my %pkg = ();
+ foreach my $line (@out) {
+ if ($line =~ /^[^\s]+\s+([^\s]+)\s+([^\s].*)/) {
+ $pkg{$1} = "$2";
+ }
+ }
+
+ open(DEP, '> depend') || die("can't open depend file: $!");
+
+ foreach my $dep (@{$r->{dependencies}}) {
+ if (! defined($pkg{$dep})) {
+ print STDERR "WARNING: FAKEING dependency for <$dep>\n";
+ $pkg{$dep} = 'common - THIS IS A FAKE DEPENDENCY';
+ }
+ print DEP "P $dep $pkg{$dep}\n";
+ }
+
+ if (defined($r->{incompatibilities})) {
+ foreach my $inc (@{$r->{incompatibilities}}) {
+ if (! defined($pkg{$inc})) {
+ print STDERR "WARNING: FAKEING incompatibiltie for <$inc>\n";
+ $pkg{$inc} = 'common - THIS IS A FAKE INCOMPATIBILTY';
+ }
+ print DEP "I $inc $pkg{$inc}\n";
+ }
+ }
+
+ close(DEP);
+}
+
+sub
+resolve_link
+{
+ my $file = shift || die ("one argument expected");
+ my $count = 0;
+
+ chomp($file);
+
+ while ((-l $file)
+ && ($count < 10)) {
+ my $dirname = dirname($file);
+ $file = readlink($file);
+ if(! ($file =~ /^\//)) {
+ $file = $dirname . '/' . $file;
+ }
+ $count++;
+ }
+
+ return $file;
+}
+
+sub
+a1minusa2
+{
+ my ($a1,$a2) = @_;
+ my %h;
+ @h{@$a2} = (1) x @$a2;
+ return grep {!exists $h{$_}} @$a1;
+}
+
+sub
+populate_contents
+{
+ open(FILE, ${content}) || die("can't open ${content}: $!");
+ for my $line (<FILE>) {
+ # /etc/cron.d/queuedefs f none 0644 root sys 17 1164 1018133064 SUNWcsr
+ # 0 1 2 3 4 5 6 7 8 9
+ my @array = split(/\s+/, $line);
+ my ($file, $type, @packages) = @array[0, 1, 9 ... $#array];
+ if ($type =~ /^f$/) {
+ push(@{$contents{$file}}, @packages);
+ }
+ }
+ close(FILE);
+}
+
+sub
+find_dependencies
+{
+ my $r = shift || die("one reference expected");
+ populate_contents();
+
+ chdir(${buildroot}) || die("can't change to ${buildroot}: $!");
+ # look for shared libaries
+ my @deps = `gfind @{$r->{filelist}} \\( -type f -perm +111 \\) -o -path opt/csw/lib/\\*.so\\* | xargs ldd 2> /dev/null | grep -v 'file not found' 2> /dev/null | grep '=>' | awk '{print \$3}'`;
+
+ # look for bangs
+ my @files = `gfind @{$r->{filelist}} -type f -perm +111`;
+ foreach my $file (@possible_scripts) {
+ -f "${buildroot}/${file}" && push(@files, "${buildroot}/${file}");
+ }
+ foreach my $file (@files) {
+ chomp($file);
+ open(FILE, $file) || die("can't open ${file}: $!");
+ my $firstline = <FILE>;
+ if ($firstline =~ /^#!\s?([^\s]+)/) {
+ push(@deps, "$1\n");
+ }
+ close(FILE);
+ }
+
+ # resolve symlinks / substitute
+ @deps = uniq(@deps);
+ for my $element (@deps) {
+ # /bin and /lib are packages in /usr/{bin,lib}
+ $element =~ s#^/bin#/usr/bin#;
+ $element =~ s#^/lib#/usr/lib#;
+ # /opt/csw/lib/sparcv8 is a symlink to .
+ $element =~ s#^/opt/csw/lib/sparcv8#/opt/csw/lib#;
+ # Resolve links if necessary
+ $element = resolve_link($element);
+ }
+
+ # get dependencies
+ foreach my $dep (@deps) {
+ # </usr/lib/../openwin/lib/libX11.so.4>
+ $dep =~ s#\w+\/\.\.##g;
+
+ if (defined($contents{$dep})) {
+ push(@{$r->{dependencies}}, @{$contents{$dep}});
+ }
+ }
+
+ # make them uniq and don't include a dependency to the packet itself
+ @{$r->{dependencies}} = grep("CSW$r->{pkgname}" ne $_, uniq(@{$r->{dependencies}}));
+
+ if (defined($r->{exclude_dependencies})) {
+ @{$r->{dependencies}} = a1minusa2($r->{dependencies}, $r->{exclude_dependencies});
+ }
+
+ write_dependencies($r);
+}
+
+sub
+strip
+{
+ system("/usr/ccs/bin/strip ${buildroot}/opt/csw/bin/* ${buildroot}/opt/csw/bin/sparcv8/* ${buildroot}/opt/csw/bin/sparcv8plus/* ${buildroot}/opt/csw/bin/sparcv8plus+vis/* ${buildroot}/opt/csw/bin/sparcv9/* 2> /dev/null");
+}
+
+sub
+generate_pkginfo
+{
+ my $r = shift || die("one reference expected");
+
+ chdir(${buildroot}) || die("can't change to ${buildroot}: $!");
+ open(PKGINFO, '> pkginfo');
+
+print PKGINFO <<"EOF";
+PKG=CSW$r->{pkgname}
+NAME=$r->{name}
+ARCH=${arch}
+CATEGORY=${category}
+VERSION=${version}
+VENDOR=${vendor}
+HOTLINE=${hotline}
+EMAIL=${email}
+EOF
+# DESC=[Optional extra info about software. Omit this line if you wish]
+ close(PKGINFO);
+}
+
+sub
+actually_package
+{
+ my $r = shift || die("one reference expected");
+
+ my $filename="$r->{filename}-${version}-SunOS${osversion}-${arch}-CSW.pkg";
+
+ chdir(${buildroot}) || die("can't change to ${buildroot}: $!");
+ system("/usr/bin/pkgmk -o -r ${buildroot}");
+ system("/usr/bin/pkgtrans -s /var/spool/pkg ${packagedir}/$filename CSW$r->{pkgname}");
+ unlink("${packagedir}/${filename}.gz");
+ system("/usr/bin/gzip ${packagedir}/$filename");
+ system("rm -rf /var/spool/pkg/CSW$r->{pkgname}");
+}
+
+# This function makes all files not readable by me readable. This is because
+# the bang checker and pkgmk needs this. The correct permissions are allready
+# in pkginfo file so everything is as it should be.
+
+sub
+make_all_files_readable_by_user
+{
+ my $r = shift || die("one reference expected");
+
+ chdir(${buildroot}) || die("can't change to ${buildroot}: $!");
+ system("gfind @{$r->{filelist}} -perm -400 -o -print | xargs -x -n 1 chmod u+r");
+}
+
+sub
+mkpackage
+{
+ foreach my $r (@packages) {
+ generate_prototype($r);
+ make_all_files_readable_by_user($r);
+ generate_pkginfo($r);
+ find_dependencies($r);
+ actually_package($r);
+ }
+
+ foreach my $key (keys(%seenpaths)) {
+ if (1 < @{$seenpaths{$key}}) {
+ print "$key -> @{$seenpaths{$key}}\n";
+ }
+ }
+}
+
+if (! (-d $builddir)) {
+ mkdir("$builddir", 0755) || die("can't create $builddir: $!");
+}
+
+#main
+# {
+
+if (! GetOptions(\%options, "p", "b", "c", "s", "u", "rev=s")) {
+ print <<"__EOF__";
+${RealBin}/${RealScript} [-p] [-b] [-c] [-s] specfile ...
+
+ -p prepare: extract and patch sources
+ -b build: build and install sources into destenation
+ -c create: create package
+ -s show: show build script and exit (high precedence!)
+ -u cleanUp: remove ${builddir}
+ -rev <rev> use <rev> instead of current date
+
+ If no parameter is specified. The given specfile is processed. (eg.
+ prepared, build and packaged)
+__EOF__
+ exit(1);
+}
+
+# Unset makeflags
+$ENV{'MFLAGS'} = '';
+$ENV{'MAKEFLAGS'} = '';
+
+my $infile = shift || die('one argument expected');
+
+if (! defined($arch)) {
+ $arch = `/bin/uname -p` || die("can't get arch: $!");
+ chomp($arch);
+}
+
+$sunwspropath = probe_directory(@sunwsprolocs) || die ("couldn't find SUNWspro");
+
+eval `/bin/cat $infile`;
+
+if (! defined($rev)) {
+ $rev = $options{'rev'} || $ENV{'REV'} || `/bin/date '+20%y.%m.%d'`;
+}
+chomp ($rev);
+
+$version .= ',REV=' . ${rev};
+
+if (defined($suffix)) {
+ $version .= $suffix;
+}
+
+if (! defined($osversion)) {
+ $osversion = `/bin/uname -r`;
+ chomp($osversion);
+}
+
+if (! -d "${packagedir}") {
+ system("/bin/mkdir -p ${packagedir}");
+}
+
+if (! keys(%options)) {
+ prepare();
+ build();
+ mkpackage();
+ exit();
+}
+
+if (defined($options{'s'})) {
+ print $build;
+ exit();
+}
+
+if (defined($options{'p'})) {
+ prepare();
+}
+
+if (defined($options{'b'})) {
+ build();
+}
+
+if (defined($options{'c'})) {
+ mkpackage();
+}
+
+if (defined($options{'u'})) {
+ system("/bin/rm -rf ${builddir}");
+}
+
+# }
Added: csw/mgar/pkg/wmmail/trunk/legacy/sources/wmmail-debian.patch
===================================================================
--- csw/mgar/pkg/wmmail/trunk/legacy/sources/wmmail-debian.patch (rev 0)
+++ csw/mgar/pkg/wmmail/trunk/legacy/sources/wmmail-debian.patch 2009-04-27 13:01:51 UTC (rev 4580)
@@ -0,0 +1,7276 @@
+--- wmmail-0.64.orig/ChangeLog
++++ wmmail-0.64/ChangeLog
+@@ -1,5 +1,23 @@
+ $Id: wmmail-debian.patch,v 1.1 2004/02/29 12:11:17 simigern Exp $
+
++----begin changelog for patch from Daniel Richard G. <skunk at iskunk.org>----
++- Factored out 'mailbox->last_update = time(NULL)' from the various
++ mailbox-checking modules to wmmail.c (at least mbox.c wasn't properly
++ doing this in some cases)
++- Removed redundant stat() call from mbox.c
++- Receiving SIGCHLD from an exiting button-click program now causes a
++ status update; now WMMail.app won't say new mail is waiting for so many
++ seconds after you've just finished reading said new mail
++- Added logic to SIGCHLD handler to process any pending X expose events
++ before the status update, in case the button-click program had been
++ obscuring the appicon (otherwise, the appicon can remain annoyingly
++ unpainted during a slow status update)
++- Added handler so that SIGUSR1 causes a status update; now you can say
++ 'killall -USR1 WMMail' in your ~/.procmailrc for non-delayed new mail
++ notification
++- Fixed potential race condition in update_status()
++----end changelog for patch----
++
+ Changes since version 0.63a:
+
+ - added back ExecuteOnUpdate
+--- wmmail-0.64.orig/Makefile.in
++++ wmmail-0.64/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -74,11 +81,12 @@
+ wmmaildir = @wmmaildir@
+
+ SUBDIRS = src Defaults Anims Sounds
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+-Makefile.in NEWS configure configure.in install-sh missing \
+-mkinstalldirs
++Makefile.in NEWS aclocal.m4 config.guess config.sub configure \
++configure.in install-sh missing mkinstalldirs
+
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+@@ -87,17 +95,19 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
++ cd $(srcdir) && $(ACLOCAL)
+
+ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -136,7 +146,7 @@
+ dot_seen=no; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+- test "$$subdir" = "." && dot_seen=yes; \
++ test "$$subdir" != "." || dot_seen=yes; \
+ done; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
+ target=`echo $@ | sed s/-recursive//`; \
+@@ -178,7 +188,7 @@
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+
+ mostlyclean-tags:
+
+@@ -235,7 +245,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/configure
++++ wmmail-0.64/configure
+@@ -12,11 +12,10 @@
+ ac_default_prefix=/usr/local
+ # Any additions from configure.in:
+ ac_help="$ac_help
+- --with-x use the X Window System"
+-ac_help="$ac_help
+- --with-PL-libs pass compiler flags to find libPropList libraries"
++ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer"
+ ac_help="$ac_help
+- --with-PL-incs pass compiler flags to find libPropList header files"
++ --with-x use the X Window System"
+ ac_help="$ac_help
+ --with-WM-libs pass compiler flags to find Window Maker libraries"
+ ac_help="$ac_help
+@@ -546,7 +545,7 @@
+
+
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:550: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:549: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -579,10 +578,260 @@
+ VERSION=0.64
+
+
++ac_aux_dir=
++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++ if test -f $ac_dir/install-sh; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install-sh -c"
++ break
++ elif test -f $ac_dir/install.sh; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install.sh -c"
++ break
++ fi
++done
++if test -z "$ac_aux_dir"; then
++ { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
++fi
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
++
++am__api_version="1.4"
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:614: checking for a BSD compatible install" >&5
++if test -z "$INSTALL"; then
++if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ # Don't use installbsd from OSF since it installs stuff as root
++ # by default.
++ for ac_prog in ginstall scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ :
++ else
++ ac_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_IFS"
++
++fi
++ if test "${ac_cv_path_install+set}" = set; then
++ INSTALL="$ac_cv_path_install"
++ else
++ # As a last resort, use the slow shell script. We don't cache a
++ # path for INSTALL within a source directory, because that will
++ # break other packages using the cache if that directory is
++ # removed, or if the path is relative.
++ INSTALL="$ac_install_sh"
++ fi
++fi
++echo "$ac_t""$INSTALL" 1>&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
++echo "configure:667: checking whether build environment is sane" >&5
++# Just in case
++sleep 1
++echo timestamp > conftestfile
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++ if test "$*" = "X"; then
++ # -L didn't work.
++ set X `ls -t $srcdir/configure conftestfile`
++ fi
++ if test "$*" != "X $srcdir/configure conftestfile" \
++ && test "$*" != "X conftestfile $srcdir/configure"; then
++
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
++alias in your environment" 1>&2; exit 1; }
++ fi
++
++ test "$2" = conftestfile
++ )
++then
++ # Ok.
++ :
++else
++ { echo "configure: error: newly created file is older than distributed files!
++Check your system clock" 1>&2; exit 1; }
++fi
++rm -f conftest*
++echo "$ac_t""yes" 1>&6
++if test "$program_transform_name" = s,x,x,; then
++ program_transform_name=
++else
++ # Double any \ or $. echo might interpret backslashes.
++ cat <<\EOF_SED > conftestsed
++s,\\,\\\\,g; s,\$,$$,g
++EOF_SED
++ program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
++ rm -f conftestsed
++fi
++test "$program_prefix" != NONE &&
++ program_transform_name="s,^,${program_prefix},; $program_transform_name"
++# Use a double $ so make ignores it.
++test "$program_suffix" != NONE &&
++ program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
++
++# sed with no file args requires a program.
++test "$program_transform_name" = "" && program_transform_name="s,x,x,"
++
++
++PACKAGE=$PACKAGE
++
++VERSION=$VERSION
++
++if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
++ { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
++fi
++cat >> confdefs.h <<EOF
++#define PACKAGE "$PACKAGE"
++EOF
++
++cat >> confdefs.h <<EOF
++#define VERSION "$VERSION"
++EOF
++
++
++
++missing_dir=`cd $ac_aux_dir && pwd`
++echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
++echo "configure:743: checking for working aclocal-${am__api_version}" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf. Sigh.
++if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++ ACLOCAL=aclocal-${am__api_version}
++ echo "$ac_t""found" 1>&6
++else
++ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
++ echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
++echo "configure:756: checking for working autoconf" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf. Sigh.
++if (autoconf --version) < /dev/null > /dev/null 2>&1; then
++ AUTOCONF=autoconf
++ echo "$ac_t""found" 1>&6
++else
++ AUTOCONF="$missing_dir/missing autoconf"
++ echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
++echo "configure:769: checking for working automake-${am__api_version}" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf. Sigh.
++if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
++ AUTOMAKE=automake-${am__api_version}
++ echo "$ac_t""found" 1>&6
++else
++ AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
++ echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
++echo "configure:782: checking for working autoheader" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf. Sigh.
++if (autoheader --version) < /dev/null > /dev/null 2>&1; then
++ AUTOHEADER=autoheader
++ echo "$ac_t""found" 1>&6
++else
++ AUTOHEADER="$missing_dir/missing autoheader"
++ echo "$ac_t""missing" 1>&6
++fi
++
++echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
++echo "configure:795: checking for working makeinfo" >&5
++# Run test in a subshell; some versions of sh will print an error if
++# an executable is not found, even if stderr is redirected.
++# Redirect stdin to placate older versions of autoconf. Sigh.
++if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
++ MAKEINFO=makeinfo
++ echo "$ac_t""found" 1>&6
++else
++ MAKEINFO="$missing_dir/missing makeinfo"
++ echo "$ac_t""missing" 1>&6
++fi
++
++
++echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
++echo "configure:809: checking whether to enable maintainer-specific portions of Makefiles" >&5
++ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++ enableval="$enable_maintainer_mode"
++ USE_MAINTAINER_MODE=$enableval
++else
++ USE_MAINTAINER_MODE=no
++fi
++
++ echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
++
++
++if test $USE_MAINTAINER_MODE = yes; then
++ MAINTAINER_MODE_TRUE=
++ MAINTAINER_MODE_FALSE='#'
++else
++ MAINTAINER_MODE_TRUE='#'
++ MAINTAINER_MODE_FALSE=
++fi
++ MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:586: checking for $ac_word" >&5
++echo "configure:835: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -612,7 +861,7 @@
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:616: checking for $ac_word" >&5
++echo "configure:865: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -663,7 +912,7 @@
+ # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:667: checking for $ac_word" >&5
++echo "configure:916: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -695,7 +944,7 @@
+ fi
+
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -706,12 +955,12 @@
+
+ cat > conftest.$ac_ext << EOF
+
+-#line 710 "configure"
++#line 959 "configure"
+ #include "confdefs.h"
+
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+@@ -737,12 +986,12 @@
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:990: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:746: checking whether we are using GNU C" >&5
++echo "configure:995: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -751,7 +1000,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+@@ -770,7 +1019,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:774: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1023: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -801,25 +1050,6 @@
+ fi
+ fi
+
+-ac_aux_dir=
+-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+- if test -f $ac_dir/install-sh; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install-sh -c"
+- break
+- elif test -f $ac_dir/install.sh; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install.sh -c"
+- break
+- fi
+-done
+-if test -z "$ac_aux_dir"; then
+- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+-fi
+-ac_config_guess=$ac_aux_dir/config.guess
+-ac_config_sub=$ac_aux_dir/config.sub
+-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+-
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -832,7 +1062,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:836: checking for a BSD compatible install" >&5
++echo "configure:1066: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -885,7 +1115,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:889: checking whether ln -s works" >&5
++echo "configure:1119: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -929,7 +1159,7 @@
+ # Extract the first word of "autoconf", so it can be a program name with args.
+ set dummy autoconf; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:933: checking for $ac_word" >&5
++echo "configure:1163: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -964,7 +1194,7 @@
+ # Extract the first word of "aclocal", so it can be a program name with args.
+ set dummy aclocal; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:968: checking for $ac_word" >&5
++echo "configure:1198: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_ACLOCAL'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -999,7 +1229,7 @@
+ # Extract the first word of "autoheader", so it can be a program name with args.
+ set dummy autoheader; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1003: checking for $ac_word" >&5
++echo "configure:1233: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AUTOHEADER'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1034,7 +1264,7 @@
+ # Extract the first word of "automake", so it can be a program name with args.
+ set dummy automake; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1038: checking for $ac_word" >&5
++echo "configure:1268: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AUTOMAKE'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1069,7 +1299,7 @@
+
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1073: checking how to run the C preprocessor" >&5
++echo "configure:1303: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -1084,13 +1314,13 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 1088 "configure"
++#line 1318 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1101,13 +1331,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 1105 "configure"
++#line 1335 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1118,13 +1348,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 1122 "configure"
++#line 1352 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1153,7 +1383,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:1157: checking for X" >&5
++echo "configure:1387: checking for X" >&5
+
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -1215,12 +1445,12 @@
+
+ # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 1219 "configure"
++#line 1449 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -1289,14 +1519,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1293 "configure"
++#line 1523 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -1392,24 +1622,6 @@
+ fi
+
+
+-# Check whether --with-PL-libs or --without-PL-libs was given.
+-if test "${with_PL_libs+set}" = set; then
+- withval="$with_PL_libs"
+- PLLIBS=$withval
+-else
+- PLLIBS=""
+-fi
+-
+-
+-# Check whether --with-PL-incs or --without-PL-incs was given.
+-if test "${with_PL_incs+set}" = set; then
+- withval="$with_PL_incs"
+- PLINCS=$withval
+-else
+- PLINCS=""
+-fi
+-
+-
+ # Check whether --with-WM-libs or --without-WM-libs was given.
+ if test "${with_WM_libs+set}" = set; then
+ withval="$with_WM_libs"
+@@ -1428,8 +1640,8 @@
+ fi
+
+
+-CFLAGS="$CFLAGS $PLINCS $WMINCS"
+-LDFLAGS="$LDFLAGS $PLLIBS $WMLIBS"
++CFLAGS="$CFLAGS $WMINCS"
++LDFLAGS="$LDFLAGS $WMLIBS"
+
+
+ appspath=""
+@@ -1549,7 +1761,7 @@
+
+
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:1553: checking for gethostbyname in -lnsl" >&5
++echo "configure:1765: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1557,7 +1769,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1561 "configure"
++#line 1773 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1568,7 +1780,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1596,7 +1808,7 @@
+ fi
+
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:1600: checking for socket in -lsocket" >&5
++echo "configure:1812: checking for socket in -lsocket" >&5
+ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1604,7 +1816,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1608 "configure"
++#line 1820 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1615,7 +1827,7 @@
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1645,7 +1857,7 @@
+
+
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+-echo "configure:1649: checking for XOpenDisplay in -lX11" >&5
++echo "configure:1861: checking for XOpenDisplay in -lX11" >&5
+ ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1653,7 +1865,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1657 "configure"
++#line 1869 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1664,7 +1876,7 @@
+ XOpenDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1692,7 +1904,7 @@
+ fi
+
+ echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
+-echo "configure:1696: checking for XShapeCombineMask in -lXext" >&5
++echo "configure:1908: checking for XShapeCombineMask in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1700,7 +1912,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXext $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1704 "configure"
++#line 1916 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1711,7 +1923,7 @@
+ XShapeCombineMask()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1739,7 +1951,7 @@
+ fi
+
+ echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
+-echo "configure:1743: checking for XtAppInitialize in -lXt" >&5
++echo "configure:1955: checking for XtAppInitialize in -lXt" >&5
+ ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1747,7 +1959,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXt $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1751 "configure"
++#line 1963 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1758,7 +1970,7 @@
+ XtAppInitialize()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1786,7 +1998,7 @@
+ fi
+
+ echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
+-echo "configure:1790: checking for XpmCreatePixmapFromData in -lXpm" >&5
++echo "configure:2002: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1794,7 +2006,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXpm $LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1798 "configure"
++#line 2010 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1805,7 +2017,7 @@
+ XpmCreatePixmapFromData()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1832,27 +2044,27 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+-echo $ac_n "checking for PLGetProplistWithPath in -lPropList""... $ac_c" 1>&6
+-echo "configure:1837: checking for PLGetProplistWithPath in -lPropList" >&5
+-ac_lib_var=`echo PropList'_'PLGetProplistWithPath | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for WMReadPropListFromFile in -lWUtil""... $ac_c" 1>&6
++echo "configure:2049: checking for WMReadPropListFromFile in -lWUtil" >&5
++ac_lib_var=`echo WUtil'_'WMReadPropListFromFile | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lPropList $LIBS $LIBS"
++LIBS="-lWUtil $LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1845 "configure"
++#line 2057 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char PLGetProplistWithPath();
++char WMReadPropListFromFile();
+
+ int main() {
+-PLGetProplistWithPath()
++WMReadPropListFromFile()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1867,13 +2079,13 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- ac_tr_lib=HAVE_LIB`echo PropList | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++ ac_tr_lib=HAVE_LIB`echo WUtil | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+
+- LIBS="-lPropList $LIBS"
++ LIBS="-lWUtil $LIBS"
+
+ else
+ echo "$ac_t""no" 1>&6
+@@ -1884,12 +2096,12 @@
+
+
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1888: checking for ANSI C header files" >&5
++echo "configure:2100: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1893 "configure"
++#line 2105 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1897,7 +2109,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -1914,7 +2126,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1918 "configure"
++#line 2130 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1932,7 +2144,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1936 "configure"
++#line 2148 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1953,7 +2165,7 @@
+ :
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1957 "configure"
++#line 2169 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1964,7 +2176,7 @@
+ exit (0); }
+
+ EOF
+-if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ :
+ else
+@@ -1992,12 +2204,12 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:1996: checking for $ac_hdr that defines DIR" >&5
++echo "configure:2208: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2001 "configure"
++#line 2213 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -2005,7 +2217,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -2030,7 +2242,7 @@
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:2034: checking for opendir in -ldir" >&5
++echo "configure:2246: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2038,7 +2250,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldir $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2042 "configure"
++#line 2254 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2049,7 +2261,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2071,7 +2283,7 @@
+
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:2075: checking for opendir in -lx" >&5
++echo "configure:2287: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2079,7 +2291,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lx $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2083 "configure"
++#line 2295 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2090,7 +2302,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2116,17 +2328,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2120: checking for $ac_hdr" >&5
++echo "configure:2332: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2125 "configure"
++#line 2337 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -2155,12 +2367,12 @@
+
+
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:2159: checking for off_t" >&5
++echo "configure:2371: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2164 "configure"
++#line 2376 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2188,12 +2400,12 @@
+ fi
+
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:2192: checking for pid_t" >&5
++echo "configure:2404: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2197 "configure"
++#line 2409 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2221,12 +2433,12 @@
+ fi
+
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:2225: checking for size_t" >&5
++echo "configure:2437: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2230 "configure"
++#line 2442 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2256,12 +2468,12 @@
+
+
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:2260: checking return type of signal handlers" >&5
++echo "configure:2472: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2265 "configure"
++#line 2477 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2278,7 +2490,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_type_signal=void
+ else
+@@ -2297,12 +2509,12 @@
+
+
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:2301: checking for vprintf" >&5
++echo "configure:2513: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2306 "configure"
++#line 2518 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char vprintf(); below. */
+@@ -2325,7 +2537,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+@@ -2349,12 +2561,12 @@
+
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:2353: checking for _doprnt" >&5
++echo "configure:2565: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2358 "configure"
++#line 2570 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _doprnt(); below. */
+@@ -2377,7 +2589,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+@@ -2404,12 +2616,12 @@
+ for ac_func in socket strstr
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2408: checking for $ac_func" >&5
++echo "configure:2620: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2413 "configure"
++#line 2625 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2432,7 +2644,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2608,15 +2820,19 @@
+ s%@SET_MAKE@%$SET_MAKE%g
+ s%@PACKAGE@%$PACKAGE%g
+ s%@VERSION@%$VERSION%g
+-s%@CC@%$CC%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+-s%@LN_S@%$LN_S%g
+-s%@AUTOCONF@%$AUTOCONF%g
+ s%@ACLOCAL@%$ACLOCAL%g
+-s%@AUTOHEADER@%$AUTOHEADER%g
++s%@AUTOCONF@%$AUTOCONF%g
+ s%@AUTOMAKE@%$AUTOMAKE%g
++s%@AUTOHEADER@%$AUTOHEADER%g
++s%@MAKEINFO@%$MAKEINFO%g
++s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
++s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
++s%@MAINT@%$MAINT%g
++s%@CC@%$CC%g
++s%@LN_S@%$LN_S%g
+ s%@CPP@%$CPP%g
+ s%@wmmaildir@%$wmmaildir%g
+ s%@MBOX_SUPPORT@%$MBOX_SUPPORT%g
+--- wmmail-0.64.orig/configure.in
++++ wmmail-0.64/configure.in
+@@ -32,6 +32,9 @@
+ VERSION=0.64
+ AC_SUBST(VERSION)
+
++AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
++AM_MAINTAINER_MODE
++
+ dnl
+ dnl check for programs
+ dnl
+@@ -62,18 +65,14 @@
+
+
+ dnl
+-dnl get compiler flags for libPropList and Window Maker
++dnl get compiler flags for Window Maker
+ dnl
+-AC_ARG_WITH(PL-libs, [ --with-PL-libs pass compiler flags to find libPropList libraries], [PLLIBS=$withval], [PLLIBS=""])
+-
+-AC_ARG_WITH(PL-incs, [ --with-PL-incs pass compiler flags to find libPropList header files], [PLINCS=$withval], [PLINCS=""])
+-
+ AC_ARG_WITH(WM-libs, [ --with-WM-libs pass compiler flags to find Window Maker libraries], [WMLIBS=$withval], [WMLIBS=""])
+
+ AC_ARG_WITH(WM-incs, [ --with-WM-incs pass compiler flags to find Window Maker header files], [WMINCS=$withval], [WMINCS=""])
+
+-CFLAGS="$CFLAGS $PLINCS $WMINCS"
+-LDFLAGS="$LDFLAGS $PLLIBS $WMLIBS"
++CFLAGS="$CFLAGS $WMINCS"
++LDFLAGS="$LDFLAGS $WMLIBS"
+
+
+ dnl
+@@ -166,7 +165,7 @@
+ AC_CHECK_LIB(Xext, XShapeCombineMask)
+ AC_CHECK_LIB(Xt, XtAppInitialize)
+ AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, , , $LIBS)
+-AC_CHECK_LIB(PropList, PLGetProplistWithPath, , , $LIBS)
++AC_CHECK_LIB(WUtil, WMReadPropListFromFile, , , $LIBS)
+
+
+ dnl
+--- wmmail-0.64.orig/Anims/NeXT/Makefile.in
++++ wmmail-0.64/Anims/NeXT/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -92,7 +99,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Anims/NeXT/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -135,7 +142,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/Anims/Makefile.in
++++ wmmail-0.64/Anims/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -85,7 +92,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Anims/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -129,7 +136,7 @@
+ dot_seen=no; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+- test "$$subdir" = "." && dot_seen=yes; \
++ test "$$subdir" != "." || dot_seen=yes; \
+ done; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
+ target=`echo $@ | sed s/-recursive//`; \
+@@ -171,7 +178,7 @@
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+
+ mostlyclean-tags:
+
+@@ -195,7 +202,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/Anims/asmail/Makefile.in
++++ wmmail-0.64/Anims/asmail/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -92,7 +99,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Anims/asmail/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -135,7 +142,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/Anims/e/Makefile.in
++++ wmmail-0.64/Anims/e/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -92,7 +99,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Anims/e/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -135,7 +142,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/Anims/monitor-e/Makefile.in
++++ wmmail-0.64/Anims/monitor-e/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -92,7 +99,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Anims/monitor-e/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -135,7 +142,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/Defaults/Makefile.in
++++ wmmail-0.64/Defaults/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -93,7 +100,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Defaults/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -136,7 +143,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/Sounds/Makefile.in
++++ wmmail-0.64/Sounds/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -92,7 +99,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Sounds/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -135,7 +142,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/src/Makefile.in
++++ wmmail-0.64/src/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -57,15 +57,22 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ CC = @CC@
+ DDEBUG = @DDEBUG@
++HAVE_LIB = @HAVE_LIB@
+ IMAP_SUPPORT = @IMAP_SUPPORT@
++LIB = @LIB@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAILDIR_SUPPORT = @MAILDIR_SUPPORT@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
+ MBOX_SUPPORT = @MBOX_SUPPORT@
+ MH_SUPPORT = @MH_SUPPORT@
+ PACKAGE = @PACKAGE@
+@@ -116,7 +123,7 @@
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .o .s
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+@@ -191,7 +198,7 @@
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+
+ mostlyclean-tags:
+
+@@ -215,7 +222,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$/$$file $(distdir)/$$file; \
++ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+--- wmmail-0.64.orig/src/imap.c
++++ wmmail-0.64/src/imap.c
+@@ -30,7 +30,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <time.h>
+-#include <proplist.h>
++#include <WINGs/proplist-compat.h>
+ #include "wmmail.h"
+ #include "wmutil.h"
+ #include "net.h"
+@@ -45,6 +45,7 @@
+ * Username
+ * Password
+ * Folder (optional)
++ * UseSelect (optional) -- added by Chris Waters <xtifr at debian.org>
+ *
+ * See mbox.c for information on states and transitions.
+ *
+@@ -62,6 +63,7 @@
+ char *folder_name;
+ int socket;
+ int cmd_seq;
++ int use_sel ; /* added by xtifr */
+ } Connection;
+
+ /* internal functions */
+@@ -84,7 +86,6 @@
+ prev_new_mail_count;
+
+ connection = init_connection(mailbox);
+- mailbox->last_update = time(NULL);
+
+ if (connection == NULL)
+ return False;
+@@ -159,13 +160,15 @@
+ port,
+ username,
+ password,
+- folder;
++ folder,
++ use_sel;
+
+ GET_ENTRY(mailbox->options, hostname, "Hostname");
+ GET_ENTRY(mailbox->options, port, "Port");
+ GET_ENTRY(mailbox->options, username, "Username");
+ GET_ENTRY(mailbox->options, password, "Password");
+ GET_ENTRY(mailbox->options, folder, "Folder");
++ GET_ENTRY(mailbox->options, use_sel, "UseSelect"); /* xtifr */
+
+ if (!username || !password || !hostname)
+ {
+@@ -178,7 +181,10 @@
+ !PLIsString(password) ||
+ (folder && !PLIsString(folder)) ||
+ (port && (!PLIsString(port) ||
+- sscanf(PLGetString(port), "%i", &port_no) != 1)) )
++ sscanf(PLGetString(port), "%i", &port_no) != 1)) ||
++ (use_sel && (!PLIsString (use_sel) || /* xtifr */
++ !(!strcasecmp(PLGetString(use_sel), "Yes") ||
++ !strcasecmp(PLGetString(use_sel), "No")) )) )
+ {
+ croak("mailbox \"%s\" has invalid options; ignored", mailbox->name);
+ return (Connection *) NULL;
+@@ -233,12 +239,17 @@
+ connection->socket = sockfd;
+ connection->cmd_seq = 1; /* A000 is already issued, above */
+
++ if (use_sel && !strcasecmp(PLGetString(use_sel), "Yes")) /* xtifr */
++ connection->use_sel = True;
++ else
++ connection->use_sel = False;
++
+ return connection;
+ }
+ else
+ {
+ /* FIXME: remove this debug message before release! */
+- croak("%s", buf);
++ /* croak("%s", buf); */
+ /* if we can't login, then don't try any more */
+ croak("login failed for mailbox \"%s\"; ignored", mailbox->name);
+ close(sockfd);
+@@ -259,8 +270,14 @@
+ buf[MAX_STRING_SIZE] = 0; /* fix buffer overflow */
+ cmd[MAX_STRING_SIZE] = 0;
+
+- sprintf(cmd, "A%03i SELECT %s\r\n",
++ /* changed from "SELECT" to choice of "EXAMINE" or "SELECT" (defaults to
++ * "EXAMINE") by Chris Waters <xtifr at debian.org>
++ * (According to RFC1730, the EXAMINE command is identical to
++ * SELECT, except that the folder is opened in in read-only mode.)
++ */
++ sprintf(cmd, "A%03i %s %s\r\n",
+ connection->cmd_seq++,
++ (connection->use_sel ? "SELECT" : "EXAMINE"),
+ connection->folder_name);
+
+ if (socket_write(connection->socket, cmd))
+--- wmmail-0.64.orig/src/maildir.c
++++ wmmail-0.64/src/maildir.c
+@@ -118,8 +118,6 @@
+
+ *redraw |= (prev_status != mailbox->status);
+
+- mailbox->last_update = time(NULL);
+-
+ wfree(mailbox_path);
+ return True;
+ }
+--- wmmail-0.64.orig/src/mbox.c
++++ wmmail-0.64/src/mbox.c
+@@ -30,7 +30,7 @@
+ #include <time.h>
+ #include <utime.h>
+ #include <unistd.h>
+-#include <proplist.h>
++#include <WINGs/proplist-compat.h>
+ #include "wmmail.h"
+ #include "wmutil.h"
+
+@@ -196,8 +196,6 @@
+
+ *redraw |= (prev_status != mailbox->status);
+
+- mailbox->last_update = time(NULL);
+-
+ wfree(mailbox_path);
+ return True;
+ }
+@@ -299,8 +297,9 @@
+ return True;
+ #endif
+
+- /* save atime */
++ /* save atime and mtime */
+ xtime.actime = t.st_atime;
++ xtime.modtime = t.st_mtime;
+
+ if ((file = fopen(mailbox_path, "r")) == NULL)
+ return False;
+@@ -366,11 +365,7 @@
+
+ fclose(file);
+
+- stat(mailbox_path, &t);
+- xtime.modtime = t.st_mtime; /* save mtime */
+- utime(mailbox_path, &xtime); /* reset atime and mtime */
+-
+- mailbox->last_update = time(NULL);
++ utime(mailbox_path, &xtime); /* reset atime, keep mtime the same */
+
+ mailbox->total_mail_count = m;
+ mailbox->new_mail_count = n;
+--- wmmail-0.64.orig/src/mh.c
++++ wmmail-0.64/src/mh.c
+@@ -130,8 +130,6 @@
+
+ *redraw |= (prev_status != mailbox->status);
+
+- mailbox->last_update = time(NULL);
+-
+ wfree(mailbox_path);
+ return True;
+ }
+--- wmmail-0.64.orig/src/pop3.c
++++ wmmail-0.64/src/pop3.c
+@@ -30,7 +30,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <time.h>
+-#include <proplist.h>
++#include <WINGs/proplist-compat.h>
+ #include "wmmail.h"
+ #include "wmutil.h"
+ #include "net.h"
+@@ -81,7 +81,6 @@
+ prev_new_mail_count;
+
+ connection = init_connection(mailbox);
+- mailbox->last_update = time(NULL);
+
+ if (connection == NULL)
+ return False;
+--- wmmail-0.64.orig/src/properties.c
++++ wmmail-0.64/src/properties.c
+@@ -44,10 +44,12 @@
+ *
+ */
+
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <strings.h>
+ #include <pwd.h>
+-#include <proplist.h>
++#include <WINGs/WUtil.h>
++#include <WINGs/proplist-compat.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+--- wmmail-0.64.orig/src/std_icons.c
++++ wmmail-0.64/src/std_icons.c
+@@ -24,6 +24,7 @@
+ *
+ */
+
++#include <stdlib.h>
+ #include "wmmail.h"
+ #include "wmutil.h"
+ #include "std_icons.h"
+--- wmmail-0.64.orig/src/wmmail.c
++++ wmmail-0.64/src/wmmail.c
+@@ -26,6 +26,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <signal.h>
+@@ -36,6 +37,7 @@
+ #include <X11/Shell.h>
+ #include <X11/StringDefs.h>
+ #include <X11/extensions/shape.h>
++#include <WINGs/WUtil.h>
+
+ #include "wmmail.h"
+ #include "wmutil.h"
+@@ -43,6 +45,7 @@
+ #include "std_icons.h"
+
+ int end_of_cycle = False;
++pid_t click_command_pid = -2;
+
+ #ifdef MBOX_SUPPORT
+ # include "mbox.h"
+@@ -74,7 +77,8 @@
+ void redraw_appicon(void);
+ void animate(XtPointer, XtIntervalId *);
+ Pixel get_pixel_by_color(char *);
+-void update_status(XtPointer, XtIntervalId *);
++void update_status_timeout(XtPointer, XtIntervalId *);
++void update_status(int);
+ void handle_expose(Widget, XtPointer, XEvent *);
+ void handle_button(Widget, XtPointer, XEvent *);
+
+@@ -85,7 +89,7 @@
+
+ create_appicon();
+
+- update_status(NULL, NULL);
++ update_status(True);
+ animate(NULL, NULL);
+
+ XtAppMainLoop(wmmail_context);
+@@ -143,11 +147,45 @@
+ /* SIGCHLD handler */
+ void sig_chld(int signo)
+ {
+- waitpid((pid_t) -1, NULL, WNOHANG);
++ if (waitpid((pid_t) -1, NULL, WNOHANG) == click_command_pid)
++ {
++ /* Handle any pending exposure events, potentially raised by
++ * the window of the click command process going away. This
++ * prevents the appicon from remaining unpainted during the
++ * (sometimes slow) update procedure. */
++ while (XtAppPending(wmmail_context) & XtIMXEvent)
++ {
++ XEvent xev;
++ XtAppPeekEvent(wmmail_context, &xev);
++ if (xev.type != Expose)
++ break;
++
++ XtAppProcessEvent(wmmail_context, XtIMXEvent);
++ }
++
++#ifdef DEBUG
++ croak("caught SIGCHLD from click command process; performing update");
++#endif
++
++ update_status(False);
++ click_command_pid = -2;
++ }
+ signal(SIGCHLD, sig_chld);
+ }
+
+
++/* SIGUSR1 handler */
++void sig_usr1(int signo)
++{
++#ifdef DEBUG
++ croak("caught SIGUSR1; performing update");
++#endif
++
++ update_status(False);
++ signal(SIGUSR1, sig_usr1);
++}
++
++
+ /* handle command line options, open the configuration file for reading */
+ void initialize(int argc, char **argv)
+ {
+@@ -267,6 +305,9 @@
+
+ /* zombie children are dealt with in the SIG_CHLD handler */
+ signal(SIGCHLD, sig_chld);
++
++ /* mechanism for an external process to signal a mailbox update */
++ signal(SIGUSR1, sig_usr1);
+ }
+
+
+@@ -502,27 +543,43 @@
+ }
+
+
+-void update_status(XtPointer XtP, XtIntervalId * XtI)
++void update_status_timeout(XtPointer XtP, XtIntervalId * XtI)
++{
++ update_status(True);
++}
++
++
++void update_status(int interval_check)
+ {
+ Mailbox *mailbox;
+ static int update_in_progress = False;
++ static int next_update_scheduled = False;
++ static XtIntervalId next_update_timer;
++ time_t cur_time = time(NULL);
+ int i, ret;
+ int new_status = NO_MAIL;
+ int beep = False,
+ redraw = False,
+ run = False,
+- next_update = -1; /* time to next update in seconds */
++ next_update = INT_MAX; /* time to next update in seconds */
+
+- if (!update_in_progress)
+- {
++ if (update_in_progress)
++ return;
+ update_in_progress = True;
++
++#ifdef DEBUG
++ croak("updating status at time %d", cur_time);
++#endif
++
++ /* FIXME: code below (and above) needs to be re-indented! */
++
+ mailbox_count = list_length(mailbox_list);
+
+ for (i = 0; i < mailbox_count; i++)
+ {
+ mailbox = list_nth(i, mailbox_list);
+
+- if (mailbox->last_update + mailbox->update_interval > time(NULL))
++ if (interval_check && mailbox->last_update + mailbox->update_interval > cur_time)
+ {
+ /* don't check this mailbox if it isn't time yet */
+ ret = True;
+@@ -563,6 +620,14 @@
+ #endif
+ /* ignore anything that we cannot handle; bug in properties.c? */
+ continue;
++
++ if (ret)
++ {
++ /* Update cur_time, as the mailbox check may have taken a
++ * non-negligible amount of time (e.g. mbox on NFS) */
++ cur_time = time(NULL);
++ mailbox->last_update = cur_time;
++ }
+ }
+
+ /* delete mailbox if it has become rotten */
+@@ -581,14 +646,14 @@
+ }
+ else
+ {
+- int tmp = mailbox->last_update + mailbox->update_interval;
++ /* delta == number of seconds till this particular mailbox
++ * is scheduled to be checked again */
++ int delta = mailbox->last_update + mailbox->update_interval - cur_time;
++ if (delta > 0 && delta < next_update)
++ next_update = delta;
+
+ if (mailbox->status > new_status)
+ new_status = mailbox->status;
+-
+- if ( (next_update == -1) ||
+- (time(NULL) < tmp && time(NULL) + next_update > tmp) )
+- next_update = tmp - time(NULL);
+ }
+ }
+
+@@ -600,9 +665,6 @@
+
+ wmmail_status = new_status;
+
+- update_in_progress = False;
+- }
+-
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list