changing defaults for xdm

[Jeremy C. Reed]

For pkgsrc with xorg 6.8 and 6.9 xdm has: chooser at bin/chooser, two 
pixmaps to include/X11/pixmaps/, and configurations are under a sysconfdir 
(like /etc/xorg/xdm).

I see now xdm has:

--with-xdmlibdir for XDMLIBDIR (defaults to ${libdir}/X11/xdm)

--with-xdmconfigdir for XDMCONFIGDIR (defaults to XDMLIBDIR)

--with-xdmscriptdir for XDMSCRIPTDIR (defaults to XDMLIBDIR)

--with-pixmapdir for XDM_PIXMAPDIR (defaults to ${XDMLIBDIR}/pixmaps)

I'd like to change some of these defaults starting with the chooser 
(binary to bin directory) and pixmaps (to be consistent with 
utils/xorgcf).

(I know README already mentions this.)

A patch follows. I tested the pixmap (note that xrdb is required) but 
didn't test the chooser.

Also the README will need to be adjusted for this.

Index: Makefile.am
===================================================================
RCS file: /cvs/xorg/app/xdm/Makefile.am,v
retrieving revision 1.25
diff -u -r1.25 Makefile.am
--- Makefile.am	7 Dec 2005 16:17:59 -0000	1.25
+++ Makefile.am	26 May 2006 03:17:46 -0000
@@ -21,10 +21,9 @@
 
 SUBDIRS = config greeter
 
-bin_PROGRAMS = xdm xdmshell
+bin_PROGRAMS = chooser xdm xdmshell
 
 xdmlibdir = $(XDMLIBDIR)
-xdmlib_PROGRAMS = chooser
 
 #
 # xdm
@@ -113,7 +112,7 @@
 
 MANDEFS = \
 	-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-	-DCHOOSERPATH=$(xdmlibdir)/chooser -DXDMLOGDIR=$(XDMLOGDIR) \
+	-DCHOOSERPATH=$(bindir)/chooser -DXDMLOGDIR=$(XDMLOGDIR) \
 	-DXDMDIR=$(XDMCONFIGDIR) -DBINDIR=$(bindir) -DXDMPIDDIR=$(XDMPIDDIR) \
 	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
 	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
Index: configure.ac
===================================================================
RCS file: /cvs/xorg/app/xdm/configure.ac,v
retrieving revision 1.40
diff -u -r1.40 configure.ac
--- configure.ac	27 Apr 2006 21:21:15 -0000	1.40
+++ configure.ac	26 May 2006 03:17:47 -0000
@@ -279,9 +279,9 @@
 	[XDM_BWPIXMAP="$withval"], [XDM_BWPIXMAP="xorg-bw.xpm"])
 AC_ARG_WITH(pixmapdir,
 	AC_HELP_STRING([--with-pixmapdir=<pathname>],
-	[specify directory for xpm files (default=xdmlibdir/pixmaps)]),
+	[specify directory for xpm files (default=includedir/X11/pixmaps)]),
 	[XDM_PIXMAPDIR="$withval"], 
-	[XDM_PIXMAPDIR='${XDMLIBDIR}/pixmaps'])
+	[XDM_PIXMAPDIR='${includedir}/X11/pixmaps'])
 
 AC_SUBST(XDM_PIXMAP)
 AC_SUBST(XDM_BWPIXMAP)
@@ -473,7 +473,7 @@
 
 # -DDEF_CHOOSER="$(CHOOSERPATH)"
 
-AC_DEFINE_DIR(DEF_CHOOSER, XDMLIBDIR/chooser, 
+AC_DEFINE_DIR(DEF_CHOOSER, bindir/chooser, 
 	[Define to pathname of where chooser binary is installed])
 
 # -DDEF_AUTH_DIR="$(XDMDIR)"
Index: config/Makefile.am
===================================================================
RCS file: /cvs/xorg/app/xdm/config/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- config/Makefile.am	18 Mar 2006 03:43:18 -0000	1.9
+++ config/Makefile.am	26 May 2006 03:17:48 -0000
@@ -53,7 +53,7 @@
 CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \
     -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
     -DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
-    -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \
+    -DSU=$(SU) -DCHOOSERPATH=$(bindir)/chooser $(XPMDEFINES) \
     -DSHELL_CMD=$(SHELL_CMD) $(MKTEMP_DEFINES)
 
 Xservers.ws: $(srcdir)/Xservers.ws.cpp



Any comments on this?

In fact, maybe the pixmaps directory should be $(datadir)/share/pixmaps to 
be consistent with more software. (I can adjust xserver to use same also.)


 Jeremy C. Reed

echo '9,J8HD,fDGG8B@?:536FC5=8 at I;C5?@H5B0D at 5GBIELD54DL>@8L?:5GDEJ8LDG1' |\
sed ss,s50EBsg | tr 0-M 'p.wBt SgiIlxmLhan:o,erDsduv/cyP'