Update to 1.25 and take maintainership:

- Bugs fixed.
- Option controlling login panel geometry was added.
- Support for antiliased fonts was added (works only with CVS snapshots of
  libWINGs).

4 files changed, 54 insertions, 99 deletions

diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 625526ba2ed..5bb273cec1c 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:48 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/30 22:24:31 jmmv Exp $
 
-DISTNAME=		wdm-1.24
-PKGREVISION=		1
+DISTNAME=		wdm-1.25
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://voins.program.ru/wdm/
 COMMENT=		WINGs display manager
 
@@ -21,6 +20,7 @@ CONFIGURE_ARGS+=	--with-wdmdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=	--with-gfx-incs=${BUILDLINK_DIR}/include/WINGs
 CONFIGURE_ARGS+=	--with-gfx-libs=${BUILDLINK_DIR}/lib
+CONFIGURE_ENV+=		SYSTEM_SHELL="${SH}"
 
 RCD_SCRIPTS=		wdm
 
@@ -61,4 +61,5 @@ pre-install:
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../wm/windowmaker/buildlink2.mk"
 
+.include "../../mk/subst.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo
index 6c5c00a92e6..13aaaaf5c66 100644
--- a/x11/wdm/distinfo
+++ b/x11/wdm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/06/03 13:06:56 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/08/30 22:24:31 jmmv Exp $
 
-SHA1 (wdm-1.24.tar.gz) = 1ad41729df1981b7de3f00ed9666eca8f4fe588d
-Size (wdm-1.24.tar.gz) = 529908 bytes
-SHA1 (patch-aa) = 6af92e28c56ba557dc2552aaac501be0f8494ce8
-SHA1 (patch-ab) = 1c03cbc27cb5616c23441f0250988d80de375646
+SHA1 (wdm-1.25.tar.gz) = 7e6f950bab7c685c282b1e1bdb83ffa2f33ed149
+Size (wdm-1.25.tar.gz) = 532829 bytes
+SHA1 (patch-aa) = f4ca5790f3cf23073a58638edb9789e2a891f422
diff --git a/x11/wdm/patches/patch-aa b/x11/wdm/patches/patch-aa
index 700904b6569..9b24e3c1753 100644
--- a/x11/wdm/patches/patch-aa
+++ b/x11/wdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2003/08/30 22:24:32 jmmv Exp $
 
---- Makefile.in.orig	2003-06-01 10:00:09.000000000 +0200
+--- Makefile.in.orig	2003-06-06 16:48:46.000000000 +0200
 +++ Makefile.in
-@@ -48,7 +48,7 @@ INSTALL_DATA=@INSTALL_DATA@
+@@ -51,7 +51,7 @@ INSTALL_DATA=@INSTALL_DATA@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  GFXDIR=@GFXDIR@
  MANDIR=@mandir@
  PAMDIR=@PAMDIR@
-@@ -71,15 +71,12 @@ install-bin: $(DESTDIR)$(bindir)/wdm $(D
+@@ -70,15 +70,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
  
@@ -27,13 +27,13 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
 -
  all-doc: doc/wdm.man
  
- all-nls: po/de.mo po/ja.mo po/ru.mo
-@@ -185,21 +182,21 @@ bin/TestLogin: src/TestLogin/TestLogin.o
+ all-nls-yes: po/de.mo po/ja.mo po/ru.mo
+@@ -191,21 +188,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 $@
++	$(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/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
@@ -41,114 +41,114 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(bindir)/wdm: bin/wdm
 -	$(INSTALL_PROGRAM) -D bin/wdm $@
-+	$(INSTALL_PROGRAM)  bin/wdm $@
++	$(INSTALL_PROGRAM) bin/wdm $@
  
- bin/wdmLogin: src/wdmLogin/Login.o bin/libwdm.a
+ bin/wdmLogin: src/wdmLogin/Login.o src/wdmLogin/config.o bin/libwdm.a
  	mkdir -p bin
- 	$(CC) $(wdmLogin_ldflags) src/wdmLogin/Login.o $(wdmLogin_libs) -o bin/wdmLogin
+ 	$(CC) $(wdmLogin_ldflags) src/wdmLogin/Login.o src/wdmLogin/config.o $(wdmLogin_libs) -o bin/wdmLogin
  
  $(DESTDIR)$(bindir)/wdmLogin: bin/wdmLogin
 -	$(INSTALL_PROGRAM) -D bin/wdmLogin $@
-+	$(INSTALL_PROGRAM)  bin/wdmLogin $@
++	$(INSTALL_PROGRAM) bin/wdmLogin $@
  
  bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
  	mkdir -p bin
-@@ -207,140 +204,140 @@ bin/libwdm.a: src/libwdm/debug.o src/lib
- 	$(RANLIB) bin/libwdm.a
+@@ -213,140 +210,140 @@ bin/libwdm.a: src/libwdm/debug.o src/lib
+ 	$(ranlib) bin/libwdm.a
  
  $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man
 -	$(INSTALL_DATA) -D doc/wdmLogin.man $@
-+	$(INSTALL_DATA)  doc/wdmLogin.man $@
++	$(INSTALL_DATA) doc/wdmLogin.man $@
  
  doc/wdm.man: doc/wdm.man.in
  	CONFIG_FILES=$@:doc/wdm.man.in CONFIG_HEADERS= ./config.status
  
  $(DESTDIR)$(MANDIR)/man1/wdm.1: doc/wdm.man
 -	$(INSTALL_DATA) -D doc/wdm.man $@
-+	$(INSTALL_DATA)  doc/wdm.man $@
++	$(INSTALL_DATA) doc/wdm.man $@
  
  $(DESTDIR)$(GFXDIR)/Eagle.xpm: pixmaps/Eagle.xpm
 -	$(INSTALL_DATA) -D pixmaps/Eagle.xpm $@
-+	$(INSTALL_DATA)  pixmaps/Eagle.xpm $@
++	$(INSTALL_DATA) pixmaps/Eagle.xpm $@
  
  $(DESTDIR)$(GFXDIR)/Earth.jpg: pixmaps/Earth.jpg
 -	$(INSTALL_DATA) -D pixmaps/Earth.jpg $@
-+	$(INSTALL_DATA)  pixmaps/Earth.jpg $@
++	$(INSTALL_DATA) pixmaps/Earth.jpg $@
  
  $(DESTDIR)$(GFXDIR)/Earth200x130.xpm: pixmaps/Earth200x130.xpm
 -	$(INSTALL_DATA) -D pixmaps/Earth200x130.xpm $@
-+	$(INSTALL_DATA)  pixmaps/Earth200x130.xpm $@
++	$(INSTALL_DATA) pixmaps/Earth200x130.xpm $@
  
  $(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
 -	$(INSTALL_DATA) -D pixmaps/GnuLinux-logo.jpg $@
-+	$(INSTALL_DATA)  pixmaps/GnuLinux-logo.jpg $@
++	$(INSTALL_DATA) pixmaps/GnuLinux-logo.jpg $@
  
  $(DESTDIR)$(GFXDIR)/Stars.jpg: pixmaps/Stars.jpg
 -	$(INSTALL_DATA) -D pixmaps/Stars.jpg $@
-+	$(INSTALL_DATA)  pixmaps/Stars.jpg $@
++	$(INSTALL_DATA) pixmaps/Stars.jpg $@
  
  $(DESTDIR)$(GFXDIR)/StarsLogo.jpg: pixmaps/StarsLogo.jpg
 -	$(INSTALL_DATA) -D pixmaps/StarsLogo.jpg $@
-+	$(INSTALL_DATA)  pixmaps/StarsLogo.jpg $@
++	$(INSTALL_DATA) pixmaps/StarsLogo.jpg $@
  
  $(DESTDIR)$(GFXDIR)/gnuLogo.xpm: pixmaps/gnuLogo.xpm
 -	$(INSTALL_DATA) -D pixmaps/gnuLogo.xpm $@
-+	$(INSTALL_DATA)  pixmaps/gnuLogo.xpm $@
++	$(INSTALL_DATA) pixmaps/gnuLogo.xpm $@
  
  po/de.mo: po/de.po
- 	$(MSGFMT) -o $@ po/de.po
+ 	$(msgfmt) -o $@ po/de.po
  
  $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo: po/de.mo
 -	$(INSTALL_DATA) -D po/de.mo $@
-+	$(INSTALL_DATA)  po/de.mo $@
++	$(INSTALL_DATA) po/de.mo $@
  
  po/ja.mo: po/ja.po
- 	$(MSGFMT) -o $@ po/ja.po
+ 	$(msgfmt) -o $@ po/ja.po
  
  $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo: po/ja.mo
 -	$(INSTALL_DATA) -D po/ja.mo $@
-+	$(INSTALL_DATA)  po/ja.mo $@
++	$(INSTALL_DATA) po/ja.mo $@
  
  po/ru.mo: po/ru.po
- 	$(MSGFMT) -o $@ po/ru.po
+ 	$(msgfmt) -o $@ po/ru.po
  
  $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo: po/ru.mo
 -	$(INSTALL_DATA) -D po/ru.mo $@
-+	$(INSTALL_DATA)  po/ru.mo $@
++	$(INSTALL_DATA) po/ru.mo $@
  
  $(DESTDIR)$(DMDIR)/GiveConsole: configs/GiveConsole
 -	$(INSTALL) -m 0755 -D configs/GiveConsole $@
-+	$(INSTALL) -m 0755  configs/GiveConsole $@
++	$(INSTALL) -m 0755 configs/GiveConsole $@
  
  
  $(DESTDIR)$(DMDIR)/TakeConsole: configs/TakeConsole
 -	$(INSTALL) -m 0755 -D configs/TakeConsole $@
-+	$(INSTALL) -m 0755  configs/TakeConsole $@
++	$(INSTALL) -m 0755 configs/TakeConsole $@
  
  
  $(DESTDIR)$(DMDIR)/Xaccess: configs/Xaccess
 -	$(INSTALL) -m 0644 -D configs/Xaccess $@
-+	$(INSTALL) -m 0644  configs/Xaccess $@
++	$(INSTALL) -m 0644 configs/Xaccess $@
  
  
  $(DESTDIR)$(DMDIR)/Xresources: configs/Xresources
 -	$(INSTALL) -m 0644 -D configs/Xresources $@
-+	$(INSTALL) -m 0644  configs/Xresources $@
++	$(INSTALL) -m 0644 configs/Xresources $@
  
  
  $(DESTDIR)$(DMDIR)/Xservers.fs: configs/Xservers.fs
 -	$(INSTALL) -m 0644 -D configs/Xservers.fs $@
-+	$(INSTALL) -m 0644  configs/Xservers.fs $@
++	$(INSTALL) -m 0644 configs/Xservers.fs $@
  
  
  $(DESTDIR)$(DMDIR)/Xsession.XFree86: configs/Xsession.XFree86
 -	$(INSTALL) -m 0755 -D configs/Xsession.XFree86 $@
-+	$(INSTALL) -m 0755  configs/Xsession.XFree86 $@
++	$(INSTALL) -m 0755 configs/Xsession.XFree86 $@
  
  
  $(DESTDIR)$(DMDIR)/Xsession.orig: configs/Xsession.orig
 -	$(INSTALL) -m 0644 -D configs/Xsession.orig $@
-+	$(INSTALL) -m 0644  configs/Xsession.orig $@
++	$(INSTALL) -m 0644 configs/Xsession.orig $@
  
  
  configs/Xclients: configs/Xclients.in
@@ -156,7 +156,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/Xclients: configs/Xclients
 -	$(INSTALL) -m 0755 -D configs/Xclients $@
-+	$(INSTALL) -m 0755  configs/Xclients $@
++	$(INSTALL) -m 0755 configs/Xclients $@
  
  
  configs/Xservers: configs/Xservers.in
@@ -164,7 +164,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/Xservers: configs/Xservers
 -	$(INSTALL) -m 0644 -D configs/Xservers $@
-+	$(INSTALL) -m 0644  configs/Xservers $@
++	$(INSTALL) -m 0644 configs/Xservers $@
  
  
  configs/Xservers.ws: configs/Xservers.ws.in
@@ -172,7 +172,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/Xservers.ws: configs/Xservers.ws
 -	$(INSTALL) -m 0644 -D configs/Xservers.ws $@
-+	$(INSTALL) -m 0644  configs/Xservers.ws $@
++	$(INSTALL) -m 0644 configs/Xservers.ws $@
  
  
  configs/Xsession: configs/Xsession.in
@@ -180,7 +180,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/Xsession: configs/Xsession
 -	$(INSTALL) -m 0755 -D configs/Xsession $@
-+	$(INSTALL) -m 0755  configs/Xsession $@
++	$(INSTALL) -m 0755 configs/Xsession $@
  
  
  configs/Xsetup_0: configs/Xsetup_0.in
@@ -188,7 +188,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/Xsetup_0: configs/Xsetup_0
 -	$(INSTALL) -m 0755 -D configs/Xsetup_0 $@
-+	$(INSTALL) -m 0755  configs/Xsetup_0 $@
++	$(INSTALL) -m 0755 configs/Xsetup_0 $@
  
  
  configs/wdm-config: configs/wdm-config.in
@@ -196,7 +196,7 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/wdm-config: configs/wdm-config
 -	$(INSTALL) -m 0600 -D configs/wdm-config $@
-+	$(INSTALL) -m 0600  configs/wdm-config $@
++	$(INSTALL) -m 0600 configs/wdm-config $@
  
  
  configs/wdmReconfig: configs/wdmReconfig.in
@@ -204,22 +204,22 @@ $NetBSD: patch-aa,v 1.3 2003/06/03 13:06:57 jmmv Exp $
  
  $(DESTDIR)$(DMDIR)/wdmReconfig: configs/wdmReconfig
 -	$(INSTALL) -m 0755 -D configs/wdmReconfig $@
-+	$(INSTALL) -m 0755  configs/wdmReconfig $@
++	$(INSTALL) -m 0755 configs/wdmReconfig $@
  
  
  $(DESTDIR)$(PAMDIR)/wdm: configs/wdm.pamd
 -	$(INSTALL) -m 0644 -D configs/wdm.pamd $@
-+	$(INSTALL) -m 0644  configs/wdm.pamd $@
++	$(INSTALL) -m 0644 configs/wdm.pamd $@
  
  
  $(DESTDIR)$(DMDIR)/wdm-config.in: configs/wdm-config.in
 -	$(INSTALL) -m 0644 -D configs/wdm-config.in $@
-+	$(INSTALL) -m 0644  configs/wdm-config.in $@
++	$(INSTALL) -m 0644 configs/wdm-config.in $@
  
  
  $(DESTDIR)$(DMDIR)/Xclients.in: configs/Xclients.in
 -	$(INSTALL) -m 0644 -D configs/Xclients.in $@
-+	$(INSTALL) -m 0644  configs/Xclients.in $@
++	$(INSTALL) -m 0644 configs/Xclients.in $@
  
  
  
diff --git a/x11/wdm/patches/patch-ab b/x11/wdm/patches/patch-ab
deleted file mode 100644
index fdc73cdde4a..00000000000
--- a/x11/wdm/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/06/03 13:06:57 jmmv Exp $
-
---- 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;