Update to 0.24: Logging functions were rewritten. Now it's possible to

redirect error/debug messages to syslog or to file. Pixmaps was moved to
/usr/share/pixmaps/wdm by default (by Julio Merino). Option to select on
whic display login panel will appear when using xinerama was added (with
help from Carlos Torres). Configure script was rewritten. Redundant tests
was removed. Now get-wings-flags script is used to determine compiling
and linking options. Tests for selecting pam/shadow was improved. Current
defaults should be good for almost everyone. New option to select xcursors
theme was added (only for XFree86 4.3.x).

4 files changed, 68 insertions, 65 deletions

diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 1a7998ac2cf..67c12b771df 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:15:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/03 13:06:56 jmmv Exp $
 
-DISTNAME=		wdm-1.23
+DISTNAME=		wdm-1.24
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo
index 5072a839c54..6c5c00a92e6 100644
--- a/x11/wdm/distinfo
+++ b/x11/wdm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/05/06 21:03:25 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/06/03 13:06:56 jmmv Exp $
 
-SHA1 (wdm-1.23.tar.gz) = e257a995c7a3532a02b5a7cd5ccc5a7fc6ae1f18
-Size (wdm-1.23.tar.gz) = 528614 bytes
-SHA1 (patch-aa) = b8dced2da7286b83596346b574bdb996152c2deb
-SHA1 (patch-ab) = 60db38bd6e2dbbe9be8117b369553c9c464d651f
+SHA1 (wdm-1.24.tar.gz) = 1ad41729df1981b7de3f00ed9666eca8f4fe588d
+Size (wdm-1.24.tar.gz) = 529908 bytes
+SHA1 (patch-aa) = 6af92e28c56ba557dc2552aaac501be0f8494ce8
+SHA1 (patch-ab) = 1c03cbc27cb5616c23441f0250988d80de375646
diff --git a/x11/wdm/patches/patch-aa b/x11/wdm/patches/patch-aa
index d08e6e9f311..700904b6569 100644
--- a/x11/wdm/patches/patch-aa
+++ b/x11/wdm/patches/patch-aa
@@ -1,18 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2003/05/06 21:03:26 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
 
---- Makefile.in.orig	2003-03-31 18:37:40.000000000 +0200
+--- Makefile.in.orig	2003-06-01 10:00:09.000000000 +0200
 +++ Makefile.in
-@@ -55,7 +55,8 @@ INSTALL_DATA=@INSTALL_DATA@
+@@ -48,7 +48,7 @@ INSTALL_DATA=@INSTALL_DATA@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
 -DMDIR=@DMDIR@
 +DMDIR=@prefix@/share/examples/wdm
-+GFXDIR=@prefix@/share/pixmaps/wdm
+ GFXDIR=@GFXDIR@
  MANDIR=@mandir@
  PAMDIR=@PAMDIR@
- USE_PAM=@USE_PAM@
-@@ -77,22 +78,19 @@ install-bin: $(DESTDIR)$(bindir)/wdm $(D
+@@ -71,15 +71,12 @@ install-bin: $(DESTDIR)$(bindir)/wdm $(D
  
  all-config: configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig
  
@@ -29,24 +28,16 @@ $NetBSD: patch-aa,v 1.2 2003/05/06 21:03:26 jmmv Exp $
  all-doc: doc/wdm.man
  
  all-nls: po/de.mo po/ja.mo po/ru.mo
- 
- install-doc: $(DESTDIR)$(MANDIR)/man1/wdmLogin.1 $(DESTDIR)$(MANDIR)/man1/wdm.1
- 
--install-gfx: $(DESTDIR)$(DMDIR)/pixmaps/Eagle.xpm $(DESTDIR)$(DMDIR)/pixmaps/Earth.jpg $(DESTDIR)$(DMDIR)/pixmaps/Earth200x130.xpm $(DESTDIR)$(DMDIR)/pixmaps/GnuLinux-logo.jpg $(DESTDIR)$(DMDIR)/pixmaps/Stars.jpg $(DESTDIR)$(DMDIR)/pixmaps/StarsLogo.jpg $(DESTDIR)$(DMDIR)/pixmaps/gnuLogo.xpm
-+install-gfx: $(DESTDIR)$(GFXDIR)/Eagle.xpm $(DESTDIR)$(GFXDIR)/Earth.jpg $(DESTDIR)$(GFXDIR)/Earth200x130.xpm $(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg $(DESTDIR)$(GFXDIR)/Stars.jpg $(DESTDIR)$(GFXDIR)/StarsLogo.jpg $(DESTDIR)$(GFXDIR)/gnuLogo.xpm
- 
- install-nls: $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo
- 
-@@ -188,21 +186,21 @@ bin/TestLogin: src/TestLogin/TestLogin.o
+@@ -185,21 +182,21 @@ bin/TestLogin: src/TestLogin/TestLogin.o
  	$(CC) $(TestLogin_ldflags) src/TestLogin/TestLogin.o $(TestLogin_libs) -o bin/TestLogin
  
  $(DESTDIR)$(bindir)/TestLogin: bin/TestLogin
 -	$(INSTALL_PROGRAM) -D bin/TestLogin $@
 +	$(INSTALL_PROGRAM)  bin/TestLogin $@
  
- bin/wdm: src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/error.o src/wdm/file.o src/wdm/genauth.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o bin/libwdm.a
+ bin/wdm: src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o bin/libwdm.a
  	mkdir -p bin
- 	$(CC) $(wdm_ldflags) src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/error.o src/wdm/file.o src/wdm/genauth.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o $(wdm_libs) -o bin/wdm
+ 	$(CC) $(wdm_ldflags) src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o $(wdm_libs) -o bin/wdm
  
  $(DESTDIR)$(bindir)/wdm: bin/wdm
 -	$(INSTALL_PROGRAM) -D bin/wdm $@
@@ -60,9 +51,9 @@ $NetBSD: patch-aa,v 1.2 2003/05/06 21:03:26 jmmv Exp $
 -	$(INSTALL_PROGRAM) -D bin/wdmLogin $@
 +	$(INSTALL_PROGRAM)  bin/wdmLogin $@
  
- bin/libwdm.a: src/libwdm/debug.o src/libwdm/names.o src/libwdm/plcheckers.o
+ bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
  	mkdir -p bin
-@@ -210,149 +208,149 @@ bin/libwdm.a: src/libwdm/debug.o src/lib
+@@ -207,140 +204,140 @@ bin/libwdm.a: src/libwdm/debug.o src/lib
  	$(RANLIB) bin/libwdm.a
  
  $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man
@@ -76,48 +67,32 @@ $NetBSD: patch-aa,v 1.2 2003/05/06 21:03:26 jmmv Exp $
 -	$(INSTALL_DATA) -D doc/wdm.man $@
 +	$(INSTALL_DATA)  doc/wdm.man $@
  
- include/Eagle.xpm: pixmaps/Eagle.xpm
- 	ln -s ../pixmaps/Eagle.xpm $@
- 
--$(DESTDIR)$(DMDIR)/pixmaps/Eagle.xpm: pixmaps/Eagle.xpm
+ $(DESTDIR)$(GFXDIR)/Eagle.xpm: pixmaps/Eagle.xpm
 -	$(INSTALL_DATA) -D pixmaps/Eagle.xpm $@
-+$(DESTDIR)$(GFXDIR)/Eagle.xpm: pixmaps/Eagle.xpm
 +	$(INSTALL_DATA)  pixmaps/Eagle.xpm $@
  
--$(DESTDIR)$(DMDIR)/pixmaps/Earth.jpg: pixmaps/Earth.jpg
+ $(DESTDIR)$(GFXDIR)/Earth.jpg: pixmaps/Earth.jpg
 -	$(INSTALL_DATA) -D pixmaps/Earth.jpg $@
-+$(DESTDIR)$(GFXDIR)/Earth.jpg: pixmaps/Earth.jpg
 +	$(INSTALL_DATA)  pixmaps/Earth.jpg $@
  
- include/Earth200x130.xpm: pixmaps/Earth200x130.xpm
- 	ln -s ../pixmaps/Earth200x130.xpm $@
- 
--$(DESTDIR)$(DMDIR)/pixmaps/Earth200x130.xpm: pixmaps/Earth200x130.xpm
+ $(DESTDIR)$(GFXDIR)/Earth200x130.xpm: pixmaps/Earth200x130.xpm
 -	$(INSTALL_DATA) -D pixmaps/Earth200x130.xpm $@
-+$(DESTDIR)$(GFXDIR)/Earth200x130.xpm: pixmaps/Earth200x130.xpm
 +	$(INSTALL_DATA)  pixmaps/Earth200x130.xpm $@
  
--$(DESTDIR)$(DMDIR)/pixmaps/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
+ $(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
 -	$(INSTALL_DATA) -D pixmaps/GnuLinux-logo.jpg $@
-+$(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
 +	$(INSTALL_DATA)  pixmaps/GnuLinux-logo.jpg $@
  
--$(DESTDIR)$(DMDIR)/pixmaps/Stars.jpg: pixmaps/Stars.jpg
+ $(DESTDIR)$(GFXDIR)/Stars.jpg: pixmaps/Stars.jpg
 -	$(INSTALL_DATA) -D pixmaps/Stars.jpg $@
-+$(DESTDIR)$(GFXDIR)/Stars.jpg: pixmaps/Stars.jpg
 +	$(INSTALL_DATA)  pixmaps/Stars.jpg $@
  
--$(DESTDIR)$(DMDIR)/pixmaps/StarsLogo.jpg: pixmaps/StarsLogo.jpg
+ $(DESTDIR)$(GFXDIR)/StarsLogo.jpg: pixmaps/StarsLogo.jpg
 -	$(INSTALL_DATA) -D pixmaps/StarsLogo.jpg $@
-+$(DESTDIR)$(GFXDIR)/StarsLogo.jpg: pixmaps/StarsLogo.jpg
 +	$(INSTALL_DATA)  pixmaps/StarsLogo.jpg $@
  
- include/gnuLogo.xpm: pixmaps/gnuLogo.xpm
- 	ln -s ../pixmaps/gnuLogo.xpm $@
- 
--$(DESTDIR)$(DMDIR)/pixmaps/gnuLogo.xpm: pixmaps/gnuLogo.xpm
+ $(DESTDIR)$(GFXDIR)/gnuLogo.xpm: pixmaps/gnuLogo.xpm
 -	$(INSTALL_DATA) -D pixmaps/gnuLogo.xpm $@
-+$(DESTDIR)$(GFXDIR)/gnuLogo.xpm: pixmaps/gnuLogo.xpm
 +	$(INSTALL_DATA)  pixmaps/gnuLogo.xpm $@
  
  po/de.mo: po/de.po
diff --git a/x11/wdm/patches/patch-ab b/x11/wdm/patches/patch-ab
index 27b334b288a..fdc73cdde4a 100644
--- a/x11/wdm/patches/patch-ab
+++ b/x11/wdm/patches/patch-ab
@@ -1,17 +1,45 @@
-$NetBSD: patch-ab,v 1.1 2003/05/06 21:03:26 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2003/06/03 13:06:57 jmmv Exp $
 
---- configs/wdm-config.in.orig	2003-03-31 18:37:40.000000000 +0200
-+++ configs/wdm-config.in
-@@ -29,10 +29,10 @@ DisplayManager*wdmBg:           solid:Ro
- ! DisplayManager*wdmBg:         dgradient:RoyalBlue,FireBrick,Black
- ! DisplayManager*wdmBg:         hgradient:RoyalBlue,FireBrick,Black
- ! DisplayManager*wdmBg:         vgradient:RoyalBlue,FireBrick,Black
--! DisplayManager*wdmBg:         pixmap:@DMDIR@/pixmaps/Stars.jpg
-+! DisplayManager*wdmBg:         pixmap:@prefix@/share/pixmaps/wdm/Stars.jpg
- !
- ! optional pixmap for logo
--@PIXMAPCOMMENT@DisplayManager*wdmLogo:  @DMDIR@/pixmaps/@PIXMAPFILE@
-+@PIXMAPCOMMENT@DisplayManager*wdmLogo:  @prefix@/share/pixmaps/wdm/@PIXMAPFILE@
- !
- ! optional help file to display in the help panel
- ! long lines may cause an ugly display 
+--- src/wdm/loghelpers.c.orig	2003-06-01 10:00:09.000000000 +0200
++++ src/wdm/loghelpers.c
+@@ -19,6 +19,7 @@
+  * loghelpers.c: helper functions for intecepting messages in stderr
+  *               and redirecting them to standard logging functions.
+  */
++#include <assert.h>
+ #include <wdmlib.h>
+ #include <string.h>
+ #include <sys/time.h>
+@@ -26,6 +27,20 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+ 
++static char *
++own_strndup(const char *str, size_t len)
++{
++	char *copy;
++
++	assert(str != NULL);
++
++	len = len < strlen(str) ? len : strlen(str);
++	copy = strncpy((char *)malloc(len+1), str, len);
++	copy[len] = '\0';
++
++	return copy;
++}
++
+ /*
+  * Function that treats buffer as set of lines separated with '\n'
+  * These lines will be directed to WDMLogMessage function with
+@@ -40,9 +55,9 @@ WDMLogMessages(int level, char *buffer, 
+ 
+ 	while((pos = memchr(buffer, '\n', n)) != NULL)
+ 	{
+-		tmpmsg = wstrndup(buffer, pos - buffer + 1);
++		tmpmsg = own_strndup(buffer, pos - buffer + 1);
+ 		WDMLogMessage(level, "%s", tmpmsg);
+-		wfree(tmpmsg);
++		free(tmpmsg);
+ 
+ 		n -= pos - buffer + 1;
+ 		buffer = pos + 1;