Update to 1.23: added german translation, translated default help text,

fixed animations in wdmLogin (with great help from Michael Buesch); other
non user visible changes.

Also honour PKG_SYSCONFDIR and install pixmap files in the right place.

5 files changed, 161 insertions, 98 deletions

diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 0c1be2b0fe6..fc7f1f5f9ee 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2003/04/27 12:52:02 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/06 21:03:25 jmmv Exp $
 
-DISTNAME=		wdm-1.22.1
+DISTNAME=		wdm-1.23
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
@@ -16,22 +16,30 @@ USE_X11BASE=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-CONFIGURE_ARGS+=	--with-wdmdir=${WDM_SYSCONFDIR}
+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
 
 RCD_SCRIPTS=		wdm
 
-WDM_SYSCONFDIR=		${PREFIX}/lib/X11/wdm
+PKG_SYSCONFSUBDIR=	wdm
 
-OWN_DIRS_PERMS+=	${WDM_SYSCONFDIR}/authdir/authfiles		\
+OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/authdir			\
 			${ROOT_USER} ${ROOT_GROUP} 700
-OWN_DIRS_PERMS+=	${WDM_SYSCONFDIR}/authdir/authdir		\
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/authdir/authfiles		\
 			${ROOT_USER} ${ROOT_GROUP} 700
-OWN_DIRS_PERMS=		${WDM_SYSCONFDIR}/authdir			\
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/authdir/authdir		\
 			${ROOT_USER} ${ROOT_GROUP} 700
-OWN_DIRS=		${WDM_SYSCONFDIR}
+
+CONF_FILES=
+.for f in	GiveConsole TakeConsole Xaccess Xclients Xclients.in	\
+		Xresources Xservers Xservers.fs Xservers.ws Xsession	\
+		Xsession.XFree86 Xsession.orig Xsetup_0 wdm-config	\
+		wdm-config.in wdmReconfig
+CONF_FILES+=	${PREFIX}/share/examples/wdm/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,6 +50,10 @@ OWN_DIRS=		${WDM_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-winmgr=${WMANAGER}
 .endfor
 
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/wdm
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wdm
+
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/x11/wdm/PLIST b/x11/wdm/PLIST
index 38cdc55b815..a30e36fbe00 100644
--- a/x11/wdm/PLIST
+++ b/x11/wdm/PLIST
@@ -1,31 +1,34 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/23 17:33:31 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/06 21:03:25 jmmv Exp $
 bin/wdm
 bin/wdmLogin
-lib/X11/wdm/GiveConsole
-lib/X11/wdm/TakeConsole
-lib/X11/wdm/Xaccess
-lib/X11/wdm/Xclients
-lib/X11/wdm/Xclients.in
-lib/X11/wdm/Xresources
-lib/X11/wdm/Xservers
-lib/X11/wdm/Xservers.fs
-lib/X11/wdm/Xservers.ws
-lib/X11/wdm/Xsession
-lib/X11/wdm/Xsession.XFree86
-lib/X11/wdm/Xsession.orig
-lib/X11/wdm/Xsetup_0
-lib/X11/wdm/pixmaps/Eagle.xpm
-lib/X11/wdm/pixmaps/Earth.jpg
-lib/X11/wdm/pixmaps/Earth200x130.xpm
-lib/X11/wdm/pixmaps/GnuLinux-logo.jpg
-lib/X11/wdm/pixmaps/Stars.jpg
-lib/X11/wdm/pixmaps/StarsLogo.jpg
-lib/X11/wdm/pixmaps/gnuLogo.xpm
-lib/X11/wdm/wdm-config
-lib/X11/wdm/wdm-config.in
-lib/X11/wdm/wdmReconfig
+etc/rc.d/wdm
 man/man1/wdm.1
 man/man1/wdmLogin.1
+share/examples/wdm/GiveConsole
+share/examples/wdm/TakeConsole
+share/examples/wdm/Xaccess
+share/examples/wdm/Xclients
+share/examples/wdm/Xclients.in
+share/examples/wdm/Xresources
+share/examples/wdm/Xservers
+share/examples/wdm/Xservers.fs
+share/examples/wdm/Xservers.ws
+share/examples/wdm/Xsession
+share/examples/wdm/Xsession.XFree86
+share/examples/wdm/Xsession.orig
+share/examples/wdm/Xsetup_0
+share/examples/wdm/wdm-config
+share/examples/wdm/wdm-config.in
+share/examples/wdm/wdmReconfig
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wdm.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wdm.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wdm.mo
-@dirrm lib/X11/wdm/pixmaps
+share/pixmaps/wdm/Eagle.xpm
+share/pixmaps/wdm/Earth.jpg
+share/pixmaps/wdm/Earth200x130.xpm
+share/pixmaps/wdm/GnuLinux-logo.jpg
+share/pixmaps/wdm/Stars.jpg
+share/pixmaps/wdm/StarsLogo.jpg
+share/pixmaps/wdm/gnuLogo.xpm
+@dirrm share/pixmaps/wdm
+@dirrm share/examples/wdm
diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo
index ec8c3d50152..5072a839c54 100644
--- a/x11/wdm/distinfo
+++ b/x11/wdm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/02/23 17:33:31 salo Exp $
+$NetBSD: distinfo,v 1.3 2003/05/06 21:03:25 jmmv Exp $
 
-SHA1 (wdm-1.22.1.tar.gz) = 4e97779487c6bac8017b26862ace9b90495baa82
-Size (wdm-1.22.1.tar.gz) = 511546 bytes
-SHA1 (patch-aa) = 3d4956a38be407b7e8b09d7270864cf51e59b22e
+SHA1 (wdm-1.23.tar.gz) = e257a995c7a3532a02b5a7cd5ccc5a7fc6ae1f18
+Size (wdm-1.23.tar.gz) = 528614 bytes
+SHA1 (patch-aa) = b8dced2da7286b83596346b574bdb996152c2deb
+SHA1 (patch-ab) = 60db38bd6e2dbbe9be8117b369553c9c464d651f
diff --git a/x11/wdm/patches/patch-aa b/x11/wdm/patches/patch-aa
index fcceb243f95..d08e6e9f311 100644
--- a/x11/wdm/patches/patch-aa
+++ b/x11/wdm/patches/patch-aa
@@ -1,149 +1,179 @@
-$NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/06 21:03:26 jmmv Exp $
 
---- Makefile.in.orig	2003-02-20 21:57:53.000000000 +0100
-+++ Makefile.in	2003-02-23 17:21:11.000000000 +0100
-@@ -63,10 +63,13 @@
+--- Makefile.in.orig	2003-03-31 18:37:40.000000000 +0200
++++ Makefile.in
+@@ -55,7 +55,8 @@ INSTALL_DATA=@INSTALL_DATA@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+-DMDIR=@DMDIR@
++DMDIR=@prefix@/share/examples/wdm
++GFXDIR=@prefix@/share/pixmaps/wdm
+ MANDIR=@mandir@
+ PAMDIR=@PAMDIR@
+ USE_PAM=@USE_PAM@
+@@ -77,22 +78,19 @@ 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
+ 
+-install-config: $(DESTDIR)$(DMDIR)/GiveConsole $(DESTDIR)$(DMDIR)/TakeConsole $(DESTDIR)$(DMDIR)/Xaccess $(DESTDIR)$(DMDIR)/Xresources $(DESTDIR)$(DMDIR)/Xservers.fs $(DESTDIR)$(DMDIR)/Xsession.XFree86 $(DESTDIR)$(DMDIR)/Xsession.orig $(DESTDIR)$(DMDIR)/Xclients $(DESTDIR)$(DMDIR)/Xservers $(DESTDIR)$(DMDIR)/Xservers.ws $(DESTDIR)$(DMDIR)/Xsession $(DESTDIR)$(DMDIR)/Xsetup_0 $(DESTDIR)$(DMDIR)/wdm-config $(DESTDIR)$(DMDIR)/wdmReconfig $(DESTDIR)$(DMDIR)/wdm-config.in $(DESTDIR)$(DMDIR)/Xclients.in install-pam-$(USE_PAM) $(DESTDIR)$(DMDIR)/authdir
++install-config: $(DESTDIR)$(DMDIR)/GiveConsole $(DESTDIR)$(DMDIR)/TakeConsole $(DESTDIR)$(DMDIR)/Xaccess $(DESTDIR)$(DMDIR)/Xresources $(DESTDIR)$(DMDIR)/Xservers.fs $(DESTDIR)$(DMDIR)/Xsession.XFree86 $(DESTDIR)$(DMDIR)/Xsession.orig $(DESTDIR)$(DMDIR)/Xclients $(DESTDIR)$(DMDIR)/Xservers $(DESTDIR)$(DMDIR)/Xservers.ws $(DESTDIR)$(DMDIR)/Xsession $(DESTDIR)$(DMDIR)/Xsetup_0 $(DESTDIR)$(DMDIR)/wdm-config $(DESTDIR)$(DMDIR)/wdmReconfig $(DESTDIR)$(DMDIR)/wdm-config.in $(DESTDIR)$(DMDIR)/Xclients.in install-pam-$(USE_PAM)
+ 
+ install-pam-no:
  
- all: all-bin all-doc all-config all-nls
- 
--install: install-bin install-config install-doc install-gfx install-nls
-+install: install-dir install-bin install-config install-doc install-gfx install-nls
- 
- all-bin: bin/TestLogin bin/wdm bin/wdmLogin
+ install-pam-yes: $(DESTDIR)$(PAMDIR)/wdm
  
-+install-dir:
-+	${BSD_INSTALL_DATA_DIR} ${DMDIR}/pixmaps
-+
- install-bin: $(DESTDIR)$(bindir)/wdm $(DESTDIR)$(bindir)/wdmLogin
+-$(DESTDIR)$(DMDIR)/authdir:
+-	$(INSTALL) -m 700 -D -d $@
+-
+ all-doc: doc/wdm.man
  
+ all-nls: po/de.mo po/ja.mo po/ru.mo
  
-@@ -79,7 +82,7 @@
- install-pam-yes: $(DESTDIR)$(PAMDIR)/wdm
+ install-doc: $(DESTDIR)$(MANDIR)/man1/wdmLogin.1 $(DESTDIR)$(MANDIR)/man1/wdm.1
  
- $(DESTDIR)$(DMDIR)/authdir:
--	$(INSTALL) -m 700 -D -d $@
-+	$(INSTALL) -m 700 -d $@
+-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
  
- all-doc: doc/wdm.man
+ install-nls: $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo
  
-@@ -174,160 +177,160 @@
+@@ -188,21 +186,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/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/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
  	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
  
  $(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/wdmLogin: src/wdmLogin/Login.o bin/libwdm.a
  	mkdir -p bin
  	$(CC) $(wdmLogin_ldflags) src/wdmLogin/Login.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/names.o src/libwdm/plcheckers.o
+ 	mkdir -p bin
+@@ -210,149 +208,149 @@ 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 $@
  
  include/Eagle.xpm: pixmaps/Eagle.xpm
  	ln -s ../pixmaps/Eagle.xpm $@
  
- $(DESTDIR)$(DMDIR)/pixmaps/Eagle.xpm: pixmaps/Eagle.xpm
+-$(DESTDIR)$(DMDIR)/pixmaps/Eagle.xpm: pixmaps/Eagle.xpm
 -	$(INSTALL_DATA) -D pixmaps/Eagle.xpm $@
-+	$(INSTALL_DATA) pixmaps/Eagle.xpm $@
++$(DESTDIR)$(GFXDIR)/Eagle.xpm: pixmaps/Eagle.xpm
++	$(INSTALL_DATA)  pixmaps/Eagle.xpm $@
  
- $(DESTDIR)$(DMDIR)/pixmaps/Earth.jpg: pixmaps/Earth.jpg
+-$(DESTDIR)$(DMDIR)/pixmaps/Earth.jpg: pixmaps/Earth.jpg
 -	$(INSTALL_DATA) -D pixmaps/Earth.jpg $@
-+	$(INSTALL_DATA) 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)$(DMDIR)/pixmaps/Earth200x130.xpm: pixmaps/Earth200x130.xpm
 -	$(INSTALL_DATA) -D pixmaps/Earth200x130.xpm $@
-+	$(INSTALL_DATA) 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)$(DMDIR)/pixmaps/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg
 -	$(INSTALL_DATA) -D pixmaps/GnuLinux-logo.jpg $@
-+	$(INSTALL_DATA) 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)$(DMDIR)/pixmaps/Stars.jpg: pixmaps/Stars.jpg
 -	$(INSTALL_DATA) -D pixmaps/Stars.jpg $@
-+	$(INSTALL_DATA) pixmaps/Stars.jpg $@
++$(DESTDIR)$(GFXDIR)/Stars.jpg: pixmaps/Stars.jpg
++	$(INSTALL_DATA)  pixmaps/Stars.jpg $@
  
- $(DESTDIR)$(DMDIR)/pixmaps/StarsLogo.jpg: pixmaps/StarsLogo.jpg
+-$(DESTDIR)$(DMDIR)/pixmaps/StarsLogo.jpg: pixmaps/StarsLogo.jpg
 -	$(INSTALL_DATA) -D pixmaps/StarsLogo.jpg $@
-+	$(INSTALL_DATA) 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)$(DMDIR)/pixmaps/gnuLogo.xpm: pixmaps/gnuLogo.xpm
 -	$(INSTALL_DATA) -D pixmaps/gnuLogo.xpm $@
-+	$(INSTALL_DATA) pixmaps/gnuLogo.xpm $@
++$(DESTDIR)$(GFXDIR)/gnuLogo.xpm: pixmaps/gnuLogo.xpm
++	$(INSTALL_DATA)  pixmaps/gnuLogo.xpm $@
+ 
+ po/de.mo: 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 $@
  
  po/ja.mo: 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
  
  $(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
@@ -151,7 +181,7 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
@@ -159,7 +189,7 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
@@ -167,7 +197,7 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
@@ -175,7 +205,7 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
@@ -183,7 +213,7 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
@@ -191,7 +221,7 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
@@ -199,22 +229,22 @@ $NetBSD: patch-aa,v 1.1 2003/02/23 17:33:31 salo 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
new file mode 100644
index 00000000000..27b334b288a
--- /dev/null
+++ b/x11/wdm/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2003/05/06 21:03:26 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