Subject: Re: pkg/25337
To: None <reed@NetBSD.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,>
From: Jeremy C. Reed <reed@reedmedia.net>
List: pkgsrc-bugs
Date: 10/17/2006 20:20:03
The following reply was made to PR pkg/25337; it has been noted by GNATS.
From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/25337
Date: Tue, 17 Oct 2006 15:18:09 -0500 (CDT)
Here is my patches that need testing:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wdm/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile 17 Apr 2006 13:47:01 -0000 1.32
+++ Makefile 17 Oct 2006 20:15:21 -0000
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.32 2006/04/17 13:47:01 wiz Exp $
-DISTNAME= wdm-1.25
-PKGREVISION= 9
+DISTNAME= wdm-1.28
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/
@@ -21,6 +20,7 @@
CONFIGURE_ARGS+= --with-gfx-libs=${BUILDLINK_DIR}/lib
CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log
CONFIGURE_ARGS+= --with-runlockdir=${VARBASE}/run
+CONFIGURE_ARGS+= --with-fakehome=${VARBASE}/run/wdm
CONFIGURE_ENV+= SYSTEM_SHELL=${SH:Q}
RCD_SCRIPTS= wdm
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wdm/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST 17 Apr 2006 07:07:49 -0000 1.6
+++ PLIST 17 Oct 2006 20:15:21 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD$
bin/wdm
bin/wdmLogin
man/man1/wdm.1
@@ -20,7 +20,12 @@
share/examples/wdm/wdm-config
share/examples/wdm/wdm-config.in
share/examples/wdm/wdmReconfig
+share/locale/cs/LC_MESSAGES/wdm.mo
+share/locale/cy/LC_MESSAGES/wdm.mo
share/locale/de/LC_MESSAGES/wdm.mo
+share/locale/en/LC_MESSAGES/wdm.mo
+share/locale/es/LC_MESSAGES/wdm.mo
+share/locale/fr_FR/LC_MESSAGES/wdm.mo
share/locale/ja/LC_MESSAGES/wdm.mo
share/locale/ru/LC_MESSAGES/wdm.mo
share/pixmaps/wdm/Eagle.xpm
@@ -31,4 +36,5 @@
share/pixmaps/wdm/StarsLogo.jpg
share/pixmaps/wdm/gnuLogo.xpm
@dirrm share/pixmaps/wdm
+@dirrm share/examples/wdm/authdir
@dirrm share/examples/wdm
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wdm/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 22 Sep 2005 21:33:45 -0000 1.7
+++ distinfo 17 Oct 2006 20:15:21 -0000
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.7 2005/09/22 21:33:45 jmmv Exp $
-SHA1 (wdm-1.25.tar.gz) = 7e6f950bab7c685c282b1e1bdb83ffa2f33ed149
-RMD160 (wdm-1.25.tar.gz) = 2297a95b5dc0927a94c26a5d51e6548d76ddb26e
-Size (wdm-1.25.tar.gz) = 532829 bytes
-SHA1 (patch-aa) = f4ca5790f3cf23073a58638edb9789e2a891f422
+SHA1 (wdm-1.28.tar.gz) = eb806c5057bc69452547e4c78813e00f91bebe3b
+RMD160 (wdm-1.28.tar.gz) = c64d604e7f2fad68a298fb4fe0e655b1aa3a7b3b
+Size (wdm-1.28.tar.gz) = 409544 bytes
+SHA1 (patch-aa) = db17a68b9ea27c03dbd977d09bdb79f30f30c7c7
SHA1 (patch-ab) = 0a63e3b18aa002ece5c9f63ce6dbcdd9e0dbdb03
cvs diff: Diffing files
Index: files/wdm.sh
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wdm/files/wdm.sh,v
retrieving revision 1.2
diff -u -r1.2 wdm.sh
--- files/wdm.sh 7 May 2003 18:27:07 -0000 1.2
+++ files/wdm.sh 17 Oct 2006 20:15:21 -0000
@@ -12,7 +12,8 @@
name="wdm"
rcvar=$name
command="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
+command_args="-daemon"
+pidfile="@VARBASE@/run/${name}.pid"
required_files="@PKG_SYSCONFDIR@/wdm-config"
extra_commands="reload"
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wdm/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa 30 Aug 2003 22:24:32 -0000 1.4
+++ patches/patch-aa 17 Oct 2006 20:15:21 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2003/08/30 22:24:32 jmmv Exp $
-
---- Makefile.in.orig 2003-06-06 16:48:46.000000000 +0200
-+++ Makefile.in
-@@ -51,7 +51,7 @@ INSTALL_DATA=@INSTALL_DATA@
+--- Makefile.in.orig 2005-03-26 07:57:04.000000000 -0600
++++ Makefile.in 2006-10-04 13:01:33.000000000 -0500
+@@ -62,7 +62,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
@@ -11,215 +9,3 @@
GFXDIR=@GFXDIR@
MANDIR=@mandir@
PAMDIR=@PAMDIR@
-@@ -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
-
--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:
-
- install-pam-yes: $(DESTDIR)$(PAMDIR)/wdm
-
--$(DESTDIR)$(DMDIR)/authdir:
-- $(INSTALL) -m 700 -D -d $@
--
- all-doc: doc/wdm.man
-
- 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 $@
-
- 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/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 $@
-+ $(INSTALL_PROGRAM) bin/wdm $@
-
- bin/wdmLogin: src/wdmLogin/Login.o src/wdmLogin/config.o bin/libwdm.a
- mkdir -p bin
- $(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 $@
-
- bin/libwdm.a: src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o
- mkdir -p bin
-@@ -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 $@
-
- 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 $@
-
- $(DESTDIR)$(GFXDIR)/Eagle.xpm: pixmaps/Eagle.xpm
-- $(INSTALL_DATA) -D 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 $@
-
- $(DESTDIR)$(GFXDIR)/Earth200x130.xpm: pixmaps/Earth200x130.xpm
-- $(INSTALL_DATA) -D 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 $@
-
- $(DESTDIR)$(GFXDIR)/Stars.jpg: pixmaps/Stars.jpg
-- $(INSTALL_DATA) -D 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 $@
-
- $(DESTDIR)$(GFXDIR)/gnuLogo.xpm: pixmaps/gnuLogo.xpm
-- $(INSTALL_DATA) -D 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 $@
-
- 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 $@
-
- $(DESTDIR)$(DMDIR)/GiveConsole: configs/GiveConsole
-- $(INSTALL) -m 0755 -D configs/GiveConsole $@
-+ $(INSTALL) -m 0755 configs/GiveConsole $@
-
-
- $(DESTDIR)$(DMDIR)/TakeConsole: configs/TakeConsole
-- $(INSTALL) -m 0755 -D configs/TakeConsole $@
-+ $(INSTALL) -m 0755 configs/TakeConsole $@
-
-
- $(DESTDIR)$(DMDIR)/Xaccess: configs/Xaccess
-- $(INSTALL) -m 0644 -D configs/Xaccess $@
-+ $(INSTALL) -m 0644 configs/Xaccess $@
-
-
- $(DESTDIR)$(DMDIR)/Xresources: configs/Xresources
-- $(INSTALL) -m 0644 -D 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 $@
-
-
- $(DESTDIR)$(DMDIR)/Xsession.XFree86: configs/Xsession.XFree86
-- $(INSTALL) -m 0755 -D 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 $@
-
-
- configs/Xclients: configs/Xclients.in
- CONFIG_FILES=$@:configs/Xclients.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/Xclients: configs/Xclients
-- $(INSTALL) -m 0755 -D configs/Xclients $@
-+ $(INSTALL) -m 0755 configs/Xclients $@
-
-
- configs/Xservers: configs/Xservers.in
- CONFIG_FILES=$@:configs/Xservers.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/Xservers: configs/Xservers
-- $(INSTALL) -m 0644 -D configs/Xservers $@
-+ $(INSTALL) -m 0644 configs/Xservers $@
-
-
- configs/Xservers.ws: configs/Xservers.ws.in
- CONFIG_FILES=$@:configs/Xservers.ws.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/Xservers.ws: configs/Xservers.ws
-- $(INSTALL) -m 0644 -D configs/Xservers.ws $@
-+ $(INSTALL) -m 0644 configs/Xservers.ws $@
-
-
- configs/Xsession: configs/Xsession.in
- CONFIG_FILES=$@:configs/Xsession.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/Xsession: configs/Xsession
-- $(INSTALL) -m 0755 -D configs/Xsession $@
-+ $(INSTALL) -m 0755 configs/Xsession $@
-
-
- configs/Xsetup_0: configs/Xsetup_0.in
- CONFIG_FILES=$@:configs/Xsetup_0.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/Xsetup_0: configs/Xsetup_0
-- $(INSTALL) -m 0755 -D configs/Xsetup_0 $@
-+ $(INSTALL) -m 0755 configs/Xsetup_0 $@
-
-
- configs/wdm-config: configs/wdm-config.in
- CONFIG_FILES=$@:configs/wdm-config.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/wdm-config: configs/wdm-config
-- $(INSTALL) -m 0600 -D configs/wdm-config $@
-+ $(INSTALL) -m 0600 configs/wdm-config $@
-
-
- configs/wdmReconfig: configs/wdmReconfig.in
- CONFIG_FILES=$@:configs/wdmReconfig.in CONFIG_HEADERS= ./config.status
-
- $(DESTDIR)$(DMDIR)/wdmReconfig: configs/wdmReconfig
-- $(INSTALL) -m 0755 -D 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 $@
-
-
- $(DESTDIR)$(DMDIR)/wdm-config.in: configs/wdm-config.in
-- $(INSTALL) -m 0644 -D 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 $@
-
-
-