Hello community,

here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Aug 25 14:57:37 CEST 2011.



--------
--- xorg-x11/xorg-x11.changes   2011-08-24 16:00:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes      2011-08-25 
14:13:03.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Aug 25 09:54:36 UTC 2011 - sndir...@novell.com
+
+- update xbiff 1.0.3 to fix build again with current toolchain
+  * Xmu functions are called directly, so include it in
+    PKG_CHECK_MODULES 
+- added some xdm git commits (adjusted to xdm 1.10.1) to fix build
+  again with current toolchain
+  * U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
+  * U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
+  * U_xdm_Fix-missing-linking-dependency-on-ldl.patch
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  xbiff-1.0.2.tar.bz2

New:
----
  U_xdm_Fix-missing-linking-dependency-on-ldl.patch
  U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
  U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
  xbiff-1.0.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.CZjh8y/_old  2011-08-25 14:54:25.000000000 +0200
+++ /var/tmp/diff_new_pack.CZjh8y/_new  2011-08-25 14:54:25.000000000 +0200
@@ -34,7 +34,7 @@
 BuildRequires:  bison
 Url:            http://xorg.freedesktop.org/
 Version:        7.6
-Release:        59
+Release:        61
 License:        MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Utilities
@@ -72,7 +72,7 @@
 Source26:       viewres-1.0.3.tar.bz2
 Source27:       x11perf-1.5.2.tar.bz2
 Source28:       xauth-1.0.5.tar.bz2
-Source29:       xbiff-1.0.2.tar.bz2
+Source29:       xbiff-1.0.3.tar.bz2
 Source30:       xcalc-1.0.4.1.tar.bz2
 Source31:       xclipboard-1.1.1.tar.bz2
 Source32:       xclock-1.0.5.tar.bz2
@@ -165,6 +165,9 @@
 Patch67:        xinit-tolerant-hostname-changes.diff
 Patch69:        xrdb-traditional-cpp.diff
 Patch70:        u_luit-Set-up-terminal-before-fork.diff
+Patch71:        
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
+Patch72:        
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
+Patch73:        U_xdm_Fix-missing-linking-dependency-on-ldl.patch
 Patch674733:    
xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch
 
 %description
@@ -284,6 +287,9 @@
 pushd xdm-*
 %patch56 -p1
 %patch65 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
 popd
 pushd twm-*
 %patch61 -p1

++++++ U_xdm_Fix-missing-linking-dependency-on-ldl.patch ++++++
>From c4031966dcbc47b2cc85b83ad78efcc64455cf72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Tarl=C3=A1=20Cardoso=20Lemos?= 
<fernando...@gmail.com>
Date: Sat, 19 Feb 2011 17:53:08 -0200
Subject: [PATCH] Fix missing linking dependency on -ldl.

Recent versions of GCC ship with a linker that doesn't add the deps
of the DSOs to the linking process. This behavior is also found in
GNU gold. This change fixes building with those linkers.

Some references:

http://wiki.debian.org/ToolChain/DSOLinking
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange

Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
---
 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

--- xdm-1.1.10/configure.ac.orig        2011-08-25 13:56:01.551431000 +0200
+++ xdm-1.1.10/configure.ac     2011-08-25 13:57:09.137351000 +0200
@@ -462,6 +462,9 @@ AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdma
 
 AC_SEARCH_LIBS(crypt, crypt)
 
+# Function dl() comes from the C library or -ldl
+AC_SEARCH_LIBS([dlopen], [dl])
+
 AC_SUBST(XDM_CFLAGS)
 AC_SUBST(XDM_LIBS)
 
++++++ U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch ++++++
>From 50c96170ad42321310c346cf412f9ae7e80ec2a7 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <mems...@videotron.ca>
Date: Sun, 29 Aug 2010 19:56:59 -0400
Subject: [PATCH] config: AC_LIBTOOL_DLOPEN is required for dynamic linking

It adds the following tests in the configuration :
checking for shl_load... no
checking for shl_load in -ldld... no
checking for dlopen... no
checking for dlopen in -ldl... yes
checking whether a program can dlopen itself... yes
checking whether a statically linked program can dlopen itself... no

This has not resulted in any compiler/linker flags change on
a GNU/Linux platform.

Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
---
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

--- xdm-1.1.10/configure.ac.orig        2011-08-25 12:46:19.795331000 +0200
+++ xdm-1.1.10/configure.ac     2011-08-25 12:46:52.562458000 +0200
@@ -40,7 +40,8 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_C_INLINE
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
 XORG_PROG_RAWCPP
++++++ U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch ++++++
>From 8b7999f8e0f797a593ac2f4697ba3be983b421ae Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <mems...@videotron.ca>
Date: Mon, 30 Aug 2010 07:39:56 -0400
Subject: [PATCH] config: use libtool -export-dynamic option for reverse 
dependencies

This replaces -rdynamic which is a GNU/Linux only solution.

"If symbols from your executable are needed to satisfy unresolved
references in a library you want to dlopen you will have to use
the flag -export-dynamic. You should use -export-dynamic while
linking the executable that calls dlopen."

It is used by the xserver, in Xdmx for example.

Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
---
 Makefile.am  |    5 ++++-
 configure.ac |    9 ---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fa1b0c4..15abb8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,10 @@ AM_CFLAGS = $(CWARNFLAGS)
 #
 
 xdm_CFLAGS = $(XDM_CFLAGS)
-xdm_LDADD = $(XDM_LIBS) $(XDM_LDFLAGS)
+# The xdm binary needs to export symbols so that they can be used from
+# libXdmGreet.so loaded through a dlopen call from session.c
+xdm_LDFLAGS =  -export-dynamic
+xdm_LDADD = $(XDM_LIBS)
 
 xdm_SOURCES =  \
         auth.c \
--- xdm-1.1.10/configure.ac.orig        2011-08-25 12:23:38.000000000 +0200
+++ xdm-1.1.10/configure.ac     2011-08-25 13:51:34.000000000 +0200
@@ -408,14 +408,6 @@ if test "x$DYNAMIC_GREETER" = "xyes" ; t
 
        GREETER_CFLAGS="$GREETER_CFLAGS -DGREET_LIB"
 
-       # The xdm binary needs to export symbols so that they can be used from
-       # libXdmGreet.so.  Some platforms require extra flags to do this.   
-       # gcc should set these flags when -rdynamic is passed to it, other 
-       # compilers/linkers may need to be added
-       if test "x$GCC" = "xyes"; then
-               XDM_LDFLAGS="$XDM_LDFLAGS -rdynamic"
-       fi      
-
        PKG_CHECK_MODULES(XDMGREET, xt x11 xext)
 
        GREETERLIB="${XDMLIBDIR}/libXdmGreet.so"
@@ -471,7 +463,6 @@ AC_SEARCH_LIBS(crypt, crypt)
 
 AC_SUBST(XDM_CFLAGS)
 AC_SUBST(XDM_LIBS)
-AC_SUBST(XDM_LDFLAGS)
 
 #
 # xdmshell
++++++ xbiff-1.0.2.tar.bz2 -> xbiff-1.0.3.tar.bz2 ++++++
++++ 5555 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/ChangeLog new/xbiff-1.0.3/ChangeLog
--- old/xbiff-1.0.2/ChangeLog   2009-12-17 17:32:36.000000000 +0100
+++ new/xbiff-1.0.3/ChangeLog   2011-01-25 21:44:06.000000000 +0100
@@ -1,3 +1,130 @@
+commit 3d9d486dfbd40dedc328943fc39041874bb15a25
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Tue Jan 25 12:43:26 2011 -0800
+
+    xbiff 1.0.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 2493d94686bfb758428c4479114f47b99db04456
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date:   Wed Jan 19 10:06:55 2011 -0500
+
+    config: move man pages into their own directory
+    
+    Use services provided by XORG_MANPAGE_SECTIONS.
+    Use standard Makefile for man pages.
+    
+    Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 9bf1cbbd49fbb11707e3bc30429e1fbedd5abec8
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Fri Jan 7 17:13:49 2011 -0800
+
+    Add --with-mailbox-directory=PATH option to configure
+    
+    Lets builders set a specific path for mailboxes when the defaults
+    don't match the system setup
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+
+commit dc963f6d676d1735144ff3997c0ab5bf7cc3889f
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Fri Jan 7 16:06:40 2011 -0800
+
+    Use <paths.h> and _PATH_MAILDIR to find mailboxes if present
+    
+    Use autoconf to check for paths.h on all systems, instead of
+    only including it #ifdef CSRG_BASED
+    
+    Makes _PATH_MAILDIR the preferred mail directory path on all systems
+    if it's defined, falls back to old per-system hardcoded paths if not.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Reviewed-by: Mark Kettenis <kette...@openbsd.org>
+    Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+
+commit 6cabab62873999d56a6cca6452c0cbe84dbacd9a
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date:   Thu Jan 13 17:15:36 2011 -0500
+
+    man: replace hard coded man page section with substitution strings
+    
+    Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit ef54b28477afbe2e059f5d399513716a86d6e1d0
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date:   Thu Jan 13 11:15:47 2011 -0500
+
+    man: remove trailing spaces and tabs
+    
+    Using s/[ \t]*$//
+    
+    Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 478f979bce3426af3efdb97f8cf40610ed8f9076
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sun Oct 31 12:17:10 2010 -0700
+
+    config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+    
+    Regroup AC statements under the Autoconf initialization section.
+    Regroup AM sttaements under the Automake initialization section.
+    Add missing AC_CONFIG_SRCDIR
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b4bc572dede7e2433bc368faf572b49ad852dd8c
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date:   Sun Oct 31 12:06:15 2010 -0700
+
+    config: update AC_PREREQ statement to 2.60
+    
+    Unrelated to the previous patches, the new value simply reflects
+    the reality that the minimum level for autoconf to configure
+    all x.org modules is 2.60 dated June 2006.
+    
+    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+    
+    Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 5f5d8495455e806ea66f021f49efb1fa3d3f5221
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sun Oct 31 12:05:38 2010 -0700
+
+    config: Remove unnecessary calls from configure.ac
+    
+    AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 070c9d45cc0678708d5766804d0c529bc6f8bee3
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Thu Jul 1 16:38:53 2010 -0700
+
+    Xmu functions are called directly, so include it in PKG_CHECK_MODULES
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3fb1f51edec3e4b599d8e8b42e8220bf526bc3b4
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Wed Jun 30 23:25:03 2010 -0700
+
+    config: upgrade to util-macros 1.8 for additional man page support
+    
+    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    The value of MAN_SUBST is the same for all X.Org packages.
+    
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    The existing statement can now be removed from the configuration file.
+    
+    Use XORG_DEFAULT_OPTIONS provided $(SED)
+    Use platform appropriate version of sed.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
 commit 6b546577aadec95c09da148936dbfd55b9cd0216
 Author: Alan Coopersmith <alan.coopersm...@sun.com>
 Date:   Thu Dec 17 08:32:12 2009 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/MailboxP.h new/xbiff-1.0.3/MailboxP.h
--- old/xbiff-1.0.2/MailboxP.h  2009-10-16 23:38:46.000000000 +0200
+++ new/xbiff-1.0.3/MailboxP.h  2011-01-14 06:42:49.000000000 +0100
@@ -33,24 +33,26 @@
 #ifndef _XawMailboxP_h
 #define _XawMailboxP_h
 
+#include "config.h"
 #include "Mailbox.h"
 #include <X11/Xaw/SimpleP.h>
 
-#if defined(SYSV)
-#define MAILBOX_DIRECTORY "/usr/mail"
-#elif defined(SVR4)
-#define MAILBOX_DIRECTORY "/var/mail"
-#elif defined(CSRG_BASED)
-#include <paths.h>
-#ifdef _PATH_MAILDIR
-#define MAILBOX_DIRECTORY _PATH_MAILDIR
-#endif
-#elif defined(__linux__)
-#define MAILBOX_DIRECTORY "/var/spool/mail"
+#ifdef HAVE_PATHS_H
+# include <paths.h>
 #endif
 
 #ifndef MAILBOX_DIRECTORY
-#define MAILBOX_DIRECTORY "/usr/spool/mail"
+# ifdef _PATH_MAILDIR
+#  define MAILBOX_DIRECTORY _PATH_MAILDIR
+# elif defined(SYSV)
+#  define MAILBOX_DIRECTORY "/usr/mail"
+# elif defined(SVR4)
+#  define MAILBOX_DIRECTORY "/var/mail"
+# elif defined(__linux__)
+#  define MAILBOX_DIRECTORY "/var/spool/mail"
+# else
+#  define MAILBOX_DIRECTORY "/usr/spool/mail"
+# endif
 #endif
 
 typedef struct {                       /* new fields for mailbox widget */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/Makefile.am new/xbiff-1.0.3/Makefile.am
--- old/xbiff-1.0.2/Makefile.am 2009-11-30 07:54:32.000000000 +0100
+++ new/xbiff-1.0.3/Makefile.am 2011-01-21 08:24:41.000000000 +0100
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xbiff
 
 AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE
@@ -30,43 +31,9 @@
         MailboxP.h \
         xbiff.c
 
-appman_PRE = \
-        xbiff.man
-
 EXTRA_DIST = bitmaps/mail-down bitmaps/mail-up bitmaps/mail-down-mask 
bitmaps/mail-up-mask
 
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST += $(appman_PRE)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-       -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-       -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-       -e 's|__xservername__|Xorg|g' \
-       -e 's|__xconfigfile__|xorg.conf|g' \
-       -e 's|__projectroot__|$(prefix)|g' \
-       -e 's|__apploaddir__|$(appdefaultdir)|' \
-       -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-       -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-       -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-       -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-       -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-       $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
 
 .PHONY: ChangeLog INSTALL
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/config.h.in new/xbiff-1.0.3/config.h.in
--- old/xbiff-1.0.2/config.h.in 2009-12-17 17:32:20.000000000 +0100
+++ new/xbiff-1.0.3/config.h.in 2011-01-25 21:43:49.000000000 +0100
@@ -6,6 +6,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -27,6 +30,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Directory containing user mailboxes */
+#undef MAILBOX_DIRECTORY
+
 /* Name of package */
 #undef PACKAGE
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/configure.ac new/xbiff-1.0.3/configure.ac
--- old/xbiff-1.0.2/configure.ac        2009-12-17 17:31:51.000000000 +0100
+++ new/xbiff-1.0.3/configure.ac        2011-01-25 21:43:17.000000000 +0100
@@ -21,26 +21,45 @@
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ([2.57])
-AC_INIT(xbiff, [1.0.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbiff)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xbiff], [1.0.3],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xbiff])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-         [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+          [m4_fatal([must install xorg-macros 1.8 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
-PKG_CHECK_MODULES(XBIFF, xaw7 xbitmaps xext)
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XBIFF, xaw7 xmu xbitmaps xext x11)
 
-AC_SUBST(XBIFF_CFLAGS)
-AC_SUBST(XBIFF_LIBS)
+# Checks for headers
+AC_CHECK_HEADERS([paths.h])
 
-AC_OUTPUT([Makefile])
+# Allow builder to set path to look for mailboxes
+AC_MSG_CHECKING([for mailbox directory])
+AC_ARG_WITH([mailbox-directory],
+            [AS_HELP_STRING([--with-mailbox-directory=PATH],
+              [specify directory to check for system mailboxes])],
+            [mailbox_directory=$with_mailbox_directory])
+
+if test "x$mailbox_directory" != "x"; then
+   AC_DEFINE_UNQUOTED([MAILBOX_DIRECTORY], ["$mailbox_directory"],
+                      [Directory containing user mailboxes])
+   AC_MSG_RESULT([$mailbox_directory])
+else
+   AC_MSG_RESULT([not set])
+fi
+
+AC_CONFIG_FILES([
+       Makefile
+       man/Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/man/Makefile.am new/xbiff-1.0.3/man/Makefile.am
--- old/xbiff-1.0.2/man/Makefile.am     1970-01-01 01:00:00.000000000 +0100
+++ new/xbiff-1.0.3/man/Makefile.am     2011-01-21 08:24:41.000000000 +0100
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xbiff.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+       $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/man/xbiff.man new/xbiff-1.0.3/man/xbiff.man
--- old/xbiff-1.0.2/man/xbiff.man       1970-01-01 01:00:00.000000000 +0100
+++ new/xbiff-1.0.3/man/xbiff.man       2011-01-21 08:24:41.000000000 +0100
@@ -0,0 +1,216 @@
+.\" $XConsortium: xbiff.man,v 1.22 94/04/17 20:43:28 gildea Exp $
+.\" Copyright (c) 1988  X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of the X Consortium shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from the X Consortium.
+.\"
+.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.3 2001/01/27 18:21:08 dawes Exp $
+.\"
+.TH XBIFF 1 __xorgversion__
+.SH NAME
+xbiff \- mailbox flag for X
+.SH SYNOPSIS
+.B xbiff
+[ \-\fItoolkitoption\fP ... ] [ \fI\-option\fP ... ]
+.SH DESCRIPTION
+The
+.I xbiff
+program displays a little image of a mailbox.  When there is no mail,
+the flag on the mailbox is down.  When mail arrives, the flag goes up
+and the mailbox beeps.  By default, pressing any mouse button in the
+image forces \fIxbiff\fP to remember the current size of the mail file
+as being the ``empty'' size and to lower the flag.
+.SH OPTIONS
+.I Xbiff
+accepts all of the standard X Toolkit command line options along with the
+additional options listed below:
+.TP 8
+.B \-help
+This option indicates that a brief summary of the allowed options should be
+printed on the standard error.
+.TP 8
+.B \-update \fIseconds\fP
+This option specifies the frequency in seconds at which \fIxbiff\fP
+should update its display.  If the mailbox is obscured and then exposed,
+it will be updated immediately.  The default is 30 seconds.
+.TP 8
+.B \-file \fIfilename\fP
+This option specifies the name of the file which should be monitored.  By
+default it watches your inbox in the default location for your
+system (some examples are
+.RI /var/mail/ username ,
+.RI /usr/spool/mail/ username ,
+.RI /var/spool/mail/ username
+(where
+.I username
+is your login name).  If the MAIL environment variable is set,
+the file specified by it will be monitored.
+.TP 8
+.B \-volume \fIpercentage\fP
+This option specifies how loud the bell should be rung when new mail comes in.
+.TP 8
+.B \-shape
+This option indicates that the mailbox window should be shaped if masks for
+the empty or full images are given.
+.PP
+The following standard X Toolkit command line arguments are commonly used with
+.I xbiff:
+.TP 8
+.B \-display \fIdisplay\fP
+This option specifies the X server to contact.
+.TP 8
+.B \-geometry \fIgeometry\fP
+This option specifies the preferred size and position of the mailbox window.
+The mailbox is 48 pixels wide and 48 pixels high and will be centered in
+the window.
+.TP 8
+.B \-bg \fIcolor\fP
+This option specifies the color to use for the background of the window.
+.TP 8
+.B \-bd \fIcolor\fP
+This option specifies the color to use for the border of the window.
+.TP 8
+.B \-bw \fInumber\fP
+This option specifies the width in pixels of the border surrounding the window.
+.TP 8
+.B \-fg \fIcolor\fP
+This option specifies the color to use for the foreground of the window.
+.TP 8
+.B \-rv
+This option indicates that reverse video should be simulated by swapping
+the foreground and background colors.
+.TP 8
+.B \-xrm \fIresourcestring\fP
+This option specifies a resource string to be used.  This is especially
+useful for setting resources that do not have separate command line options.
+.SH X DEFAULTS
+The application class name is XBiff.
+This program uses the
+.I Mailbox
+widget.
+It understands all of the core resource names and
+classes as well as:
+.PP
+.TP 8
+.B checkCommand (\fPclass\fB CheckCommand)
+Specifies a shell command to be executed to check for new mail rather than
+examining the size of \fBfile\fP.  The specified string value is used as the
+argument to a \fIsystem\fP(__libmansuffix__) call and may therefore contain 
i/o redirection.
+An exit status of 0 indicates that new mail is waiting, 1 indicates that there
+has been no change in size, and 2 indicates that the mail has been cleared.
+By default, no shell command is provided.
+.TP 8
+.B file (\fPclass\fB File)
+Specifies the name of the file to monitor.  The default is as described
+above for the
+.B \-file
+command line option.
+.TP 8
+.B onceOnly (\fPclass\fB Boolean)
+Specifies that the bell is only rung the first time new mail is found
+and is not rung again until at least one interval has passed with
+no mail waiting.  The window will continue to indicate the presence
+of new mail until it has been retrieved.  The default is false.
+.TP 8
+.B width (\fPclass\fB Width)
+Specifies the width of the mailbox.
+.TP 8
+.B height (\fPclass\fB Height)
+Specifies the height of the mailbox.
+.TP 8
+.B update (\fPclass\fB Interval)
+Specifies the frequency in seconds at which the mail should be checked.
+The default is 30.
+.TP 8
+.B volume (\fPclass\fB Volume)
+Specifies how loud the bell should be rung.  The default is 33 percent.
+.TP 8
+.B foreground (\fPclass\fB Foreground)
+Specifies the color for the foreground.
+.TP 8
+.B reverseVideo (\fPclass\fB ReverseVideo)
+Specifies that the foreground and background should be reversed.
+.TP 8
+.B flip (\fPclass\fB Flip)
+Specifies whether or not the image that is shown when mail has arrived
+should be inverted.  The default is ``true.''
+.TP 8
+.B fullPixmap (\fPclass\fB Pixmap)
+Specifies a bitmap to be shown when new mail has arrived.
+The default is flagup.
+.TP 8
+.B emptyPixmap (\fPclass\fB Pixmap)
+Specifies a bitmap to be shown when no new mail is present.
+The default is flagdown.
+.TP 8
+.B shapeWindow (\fPclass\fB ShapeWindow)
+Specifies whether or not the mailbox window should be shaped to the
+given fullPixmapMask and emptyPixmapMask.  The default is false.
+.TP 8
+.B fullPixmapMask (\fPclass\fB PixmapMask)
+Specifies a mask for the bitmap to be shown when new mail has arrived.
+The default is none.
+.TP 8
+.B emptyPixmapMask (\fPclass\fB PixmapMask)
+Specifies a mask for the bitmap to be shown when no new mail is present.
+The default is none.
+.SH ACTIONS
+The \fIMailbox\fP widget provides the following actions for use in event
+translations:
+.TP 8
+.B check()
+This action causes the widget to check for new mail and display the flag
+appropriately.
+.TP 8
+.B unset()
+This action causes the widget to lower the flag until new mail comes in.
+.TP 8
+.B set()
+This action causes the widget to raise the flag until the user resets it.
+.PP
+The default translation is
+.sp
+.nf
+        <ButtonPress>:  unset()
+.fi
+.sp
+.SH ENVIRONMENT
+.PP
+.TP 8
+.B DISPLAY
+to get the default host and display number.
+.TP 8
+.B XENVIRONMENT
+to get the name of a resource file that overrides the global resources
+stored in the RESOURCE_MANAGER property.
+.SH "SEE ALSO"
+X(__miscmansuffix__),
+xrdb(__appmansuffix__),
+stat(2)
+.SH BUGS
+The mailbox bitmaps are ugly.
+.SH AUTHOR
+Jim Fulton, MIT X Consortium
+.br
+Additional hacks by Ralph Swick, DEC/MIT Project Athena
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/xbiff-1.0.2/xbiff.man new/xbiff-1.0.3/xbiff.man
--- old/xbiff-1.0.2/xbiff.man   2009-10-16 23:38:46.000000000 +0200
+++ new/xbiff-1.0.3/xbiff.man   1970-01-01 01:00:00.000000000 +0100
@@ -1,216 +0,0 @@
-.\" $XConsortium: xbiff.man,v 1.22 94/04/17 20:43:28 gildea Exp $
-.\" Copyright (c) 1988  X Consortium
-.\" 
-.\" Permission is hereby granted, free of charge, to any person obtaining
-.\" a copy of this software and associated documentation files (the
-.\" "Software"), to deal in the Software without restriction, including
-.\" without limitation the rights to use, copy, modify, merge, publish,
-.\" distribute, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\"
-.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.3 2001/01/27 18:21:08 dawes Exp $
-.\"
-.TH XBIFF 1 __xorgversion__
-.SH NAME
-xbiff \- mailbox flag for X
-.SH SYNOPSIS
-.B xbiff
-[ \-\fItoolkitoption\fP ... ] [ \fI\-option\fP ... ]
-.SH DESCRIPTION
-The
-.I xbiff
-program displays a little image of a mailbox.  When there is no mail,
-the flag on the mailbox is down.  When mail arrives, the flag goes up
-and the mailbox beeps.  By default, pressing any mouse button in the
-image forces \fIxbiff\fP to remember the current size of the mail file
-as being the ``empty'' size and to lower the flag.
-.SH OPTIONS
-.I Xbiff
-accepts all of the standard X Toolkit command line options along with the
-additional options listed below:
-.TP 8
-.B \-help
-This option indicates that a brief summary of the allowed options should be
-printed on the standard error.
-.TP 8
-.B \-update \fIseconds\fP
-This option specifies the frequency in seconds at which \fIxbiff\fP
-should update its display.  If the mailbox is obscured and then exposed,
-it will be updated immediately.  The default is 30 seconds.
-.TP 8
-.B \-file \fIfilename\fP
-This option specifies the name of the file which should be monitored.  By
-default it watches your inbox in the default location for your
-system (some examples are
-.RI /var/mail/ username ,
-.RI /usr/spool/mail/ username ,
-.RI /var/spool/mail/ username
-(where
-.I username
-is your login name).  If the MAIL environment variable is set,
-the file specified by it will be monitored.
-.TP 8
-.B \-volume \fIpercentage\fP
-This option specifies how loud the bell should be rung when new mail comes in.
-.TP 8
-.B \-shape
-This option indicates that the mailbox window should be shaped if masks for
-the empty or full images are given.
-.PP
-The following standard X Toolkit command line arguments are commonly used with 
-.I xbiff:
-.TP 8
-.B \-display \fIdisplay\fP
-This option specifies the X server to contact.
-.TP 8
-.B \-geometry \fIgeometry\fP
-This option specifies the preferred size and position of the mailbox window.
-The mailbox is 48 pixels wide and 48 pixels high and will be centered in
-the window.
-.TP 8
-.B \-bg \fIcolor\fP
-This option specifies the color to use for the background of the window.  
-.TP 8
-.B \-bd \fIcolor\fP
-This option specifies the color to use for the border of the window.
-.TP 8
-.B \-bw \fInumber\fP
-This option specifies the width in pixels of the border surrounding the window.
-.TP 8
-.B \-fg \fIcolor\fP
-This option specifies the color to use for the foreground of the window.
-.TP 8
-.B \-rv
-This option indicates that reverse video should be simulated by swapping
-the foreground and background colors.
-.TP 8
-.B \-xrm \fIresourcestring\fP
-This option specifies a resource string to be used.  This is especially
-useful for setting resources that do not have separate command line options.
-.SH X DEFAULTS
-The application class name is XBiff.
-This program uses the 
-.I Mailbox
-widget.
-It understands all of the core resource names and
-classes as well as:
-.PP
-.TP 8
-.B checkCommand (\fPclass\fB CheckCommand)
-Specifies a shell command to be executed to check for new mail rather than
-examining the size of \fBfile\fP.  The specified string value is used as the
-argument to a \fIsystem\fP(3) call and may therefore contain i/o redirection.
-An exit status of 0 indicates that new mail is waiting, 1 indicates that there
-has been no change in size, and 2 indicates that the mail has been cleared.
-By default, no shell command is provided.
-.TP 8
-.B file (\fPclass\fB File)
-Specifies the name of the file to monitor.  The default is as described
-above for the
-.B \-file
-command line option.
-.TP 8
-.B onceOnly (\fPclass\fB Boolean)
-Specifies that the bell is only rung the first time new mail is found
-and is not rung again until at least one interval has passed with
-no mail waiting.  The window will continue to indicate the presence
-of new mail until it has been retrieved.  The default is false.
-.TP 8
-.B width (\fPclass\fB Width)
-Specifies the width of the mailbox.
-.TP 8
-.B height (\fPclass\fB Height)
-Specifies the height of the mailbox.
-.TP 8
-.B update (\fPclass\fB Interval)
-Specifies the frequency in seconds at which the mail should be checked.
-The default is 30.
-.TP 8
-.B volume (\fPclass\fB Volume)
-Specifies how loud the bell should be rung.  The default is 33 percent.
-.TP 8
-.B foreground (\fPclass\fB Foreground)
-Specifies the color for the foreground.
-.TP 8
-.B reverseVideo (\fPclass\fB ReverseVideo)
-Specifies that the foreground and background should be reversed.
-.TP 8
-.B flip (\fPclass\fB Flip)
-Specifies whether or not the image that is shown when mail has arrived 
-should be inverted.  The default is ``true.''
-.TP 8
-.B fullPixmap (\fPclass\fB Pixmap)
-Specifies a bitmap to be shown when new mail has arrived.
-The default is flagup.
-.TP 8
-.B emptyPixmap (\fPclass\fB Pixmap)
-Specifies a bitmap to be shown when no new mail is present.
-The default is flagdown.
-.TP 8
-.B shapeWindow (\fPclass\fB ShapeWindow)
-Specifies whether or not the mailbox window should be shaped to the
-given fullPixmapMask and emptyPixmapMask.  The default is false.
-.TP 8
-.B fullPixmapMask (\fPclass\fB PixmapMask)
-Specifies a mask for the bitmap to be shown when new mail has arrived.
-The default is none.
-.TP 8
-.B emptyPixmapMask (\fPclass\fB PixmapMask)
-Specifies a mask for the bitmap to be shown when no new mail is present.
-The default is none.
-.SH ACTIONS
-The \fIMailbox\fP widget provides the following actions for use in event
-translations:
-.TP 8
-.B check()
-This action causes the widget to check for new mail and display the flag
-appropriately.
-.TP 8
-.B unset()
-This action causes the widget to lower the flag until new mail comes in.
-.TP 8
-.B set()
-This action causes the widget to raise the flag until the user resets it.
-.PP
-The default translation is 
-.sp
-.nf
-        <ButtonPress>:  unset()
-.fi
-.sp
-.SH ENVIRONMENT
-.PP
-.TP 8
-.B DISPLAY
-to get the default host and display number.
-.TP 8
-.B XENVIRONMENT
-to get the name of a resource file that overrides the global resources
-stored in the RESOURCE_MANAGER property.
-.SH "SEE ALSO"
-X(__miscmansuffix__),
-xrdb(1),
-stat(2)
-.SH BUGS
-The mailbox bitmaps are ugly.
-.SH AUTHOR
-Jim Fulton, MIT X Consortium
-.br
-Additional hacks by Ralph Swick, DEC/MIT Project Athena


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to