Make xdm use configs from under PKG_SYSCONFDIR.

Some ideas came from NetBSD's XFree86 customizations.

Use USE_PKGINSTALL and CONF_FILES for xorg-clients.
Installs xdm configs (and shell scripts) to examples directory.
Create OWN_DIRS for the authDir.

PLIST changes are for chooser is now in bin directory.
And pixmaps moved to include/X11/pixmaps directory.
xdm configs are no longer in lib/X11/xdm (so they are no longer lost
on reinstall).

(Anyone want to do twm and other configs?)

5 files changed, 243 insertions, 1 deletions

diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 0c6a9085f03..da8db4552f1 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/10/08 03:35:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/10/20 14:33:30 reed Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -16,3 +16,7 @@ SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
 SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1
 SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22
 SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87
+SHA1 (patch-am) = a907d42a4d2a72871e165b99afdba81945d656c7
+SHA1 (patch-an) = 513f8746bb66c954decdd7f2ca00888175c72834
+SHA1 (patch-ao) = 3350204fda261f03ba69e475420f90141974c6b0
+SHA1 (patch-ap) = 4a69e2df26e850ee33c1f7e6acc45ac205a46cd5
diff --git a/x11/xorg-libs/patches/patch-am b/x11/xorg-libs/patches/patch-am
new file mode 100644
index 00000000000..7a6a06abb9b
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-am
@@ -0,0 +1,59 @@
+$NetBSD: patch-am,v 1.3 2004/10/20 14:33:30 reed Exp $
+
+--- programs/xdm/Imakefile.orig	2004-07-26 15:56:33.000000000 -0700
++++ programs/xdm/Imakefile
+@@ -195,6 +195,13 @@ LIFREQ_FLAGS = -Xa
+ #endif
+ #endif
+ 
++XDMLOGDIR = $(LOGDIRECTORY)
++#ifdef VarRunDirectory
++XDMPIDDIR = $(VARRUNDIR)
++#else
++XDMPIDDIR = $(XDMDIR)
++#endif
++
+   SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3)
+ 
+    XDMCONFIGDIR = XdmConfigurationSubdirectory
+@@ -252,7 +259,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
+ #endif
+        PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW)
+ 
+-    CHOOSERPATH = $(XDMDIR)/chooser
++    CHOOSERPATH = $(BINDIR)/chooser
++ GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so
+  OSMAJORVERSION = OSMajorVersion
+  OSMINORVERSION = OSMinorVersion
+    CONN_DEFINES = $(CONNECTION_FLAGS)
+@@ -267,6 +275,10 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
+ 		$(XPM_DEFINES) $(XINERAMA_DEFINES) $(PROCTITLE_DEFINES) \
+ 		$(IFADDRS_DEFINES) $(IPV6_DEFINES) $(MKSTEMP_DEFINES)
+    EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \
++		-DGREETERLIBPATH=$(GREETERLIBPATH) \
++		-DXDMDIR=$(XDMDIR) \
++		-DXDMAUTHDIR=$(XDMVARDIR) \
++		-DXDMPIDDIR=$(XDMPIDDIR) \
+ 		-DXDMLOGDIR=$(XDMLOGDIR)
+ 
+ XCOMM
+@@ -290,8 +302,8 @@ RES_DEFINES = '-DDEF_SERVER_LINE=":0 loc
+ 		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
+ 		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
+ 		  '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
+-		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
+-		  '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
++		  '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
++		  '-DDEF_GREETER_LIB="$(GREETERLIBPATH)"'
+ 
+ ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
+ #ifdef LinkConfDirectory
+@@ -316,7 +328,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES
+ #if BuildChooser
+ SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
+ NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
+-InstallProgram(chooser,$(XDMDIR))
++InstallProgram(chooser,$(BINDIR))
+ InstallAppDefaults(Chooser)
+ #endif
+ #if BuildBoth
diff --git a/x11/xorg-libs/patches/patch-an b/x11/xorg-libs/patches/patch-an
new file mode 100644
index 00000000000..559402118c0
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-an
@@ -0,0 +1,107 @@
+$NetBSD: patch-an,v 1.3 2004/10/20 14:33:30 reed Exp $
+
+--- programs/xdm/xdm.man.orig	2004-07-26 15:56:33.000000000 -0700
++++ programs/xdm/xdm.man
+@@ -164,7 +164,7 @@ as resources.
+ Names the configuration file, which specifies resources to control
+ the behavior of
+ .I xdm.
+-.I __projectroot__/lib/X11/xdm/xdm-config
++.I XDMDIR/xdm-config
+ is the default.
+ See the section \fBConfiguration File\fP.
+ .IP "\fB\-nodaemon\fP"
+@@ -306,7 +306,7 @@ uses the \fIlockf\fP library call, while
+ This names a directory under which
+ .I xdm
+ stores authorization files while initializing the session.  The
+-default value is \fI __projectroot__/lib/X11/xdm.\fP
++default value is \fI\&XDMAUTHDIR\fP.
+ Can be overridden for specific displays by
+ DisplayManager.\fIDISPLAY\fP.authFile.
+ .IP \fBDisplayManager.autoRescan\fP
+@@ -374,7 +374,7 @@ algorithm is used instead.
+ .IP \fBDisplayManager.greeterLib\fP
+ On systems that support a dynamically-loadable greeter library, the
+ name of the library.  The default is
+-\fI __projectroot__/lib/X11/xdm/libXdmGreet.so\fP.
++\fI\&GREETERLIBPATH\fP.
+ .IP \fBDisplayManager.choiceTimeout\fP
+ Number of seconds to wait for display to respond after user has
+ selected a host from the chooser.  If the display sends an XDMCP
+@@ -406,7 +406,7 @@ section
+ which describes the various
+ resources that are appropriate to place in this file.
+ There is no default value for this resource, but
+-\fI __projectroot__/lib/X11/xdm/Xresources\fP
++\fI\&XDMDIR/Xresources\fP
+ is the conventional name.
+ .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.chooser\fP"
+ Specifies the program run to offer a host menu for Indirect queries
+@@ -599,7 +599,7 @@ variable XAUTHORITY at the created file.
+ First, the
+ .I xdm
+ configuration file should be set up.
+-Make a directory (usually \fI __projectroot__/lib/X11/xdm\fP) to contain all
++Make a directory (usually \fI\&XDMDIR\fP) to contain all
+ of the relevant files.
+ .LP
+ Here is a reasonable configuration file, which could be
+@@ -608,12 +608,12 @@ named \fIxdm-config\fP:
+ 
+ .ta .5i 4i
+ 
+-	DisplayManager.servers:	__projectroot__/lib/X11/xdm/Xservers
++	DisplayManager.servers:	XDMDIR/Xservers
+ 	DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
+-	DisplayManager*resources:	__projectroot__/lib/X11/xdm/Xresources
+-	DisplayManager*startup:	__projectroot__/lib/X11/xdm/Xstartup
+-	DisplayManager*session:	__projectroot__/lib/X11/xdm/Xsession
+-	DisplayManager.pidFile:	__projectroot__/lib/X11/xdm/xdm-pid
++	DisplayManager*resources:	XDMDIR/Xresources
++	DisplayManager*startup:	XDMDIR/Xstartup
++	DisplayManager*session:	XDMDIR/Xsession
++	DisplayManager.pidFile:	XDMPIDDIR/xdm-pid
+ 	DisplayManager._0.authorize:	true
+ 	DisplayManager*authorize:	false
+ 
+@@ -1123,8 +1123,8 @@ Here is a sample \fIXstartup\fP script:
+ 		xmessage\0\-file /etc/nologin\0\-timeout 30\0\-center
+ 		exit 1
+ 	fi
+-	sessreg\0\-a\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME
+-	__projectroot__/lib/xdm/GiveConsole
++	sessreg\0\-a\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME
++	XDMDIR/GiveConsole
+ 	exit 0
+ .fi
+ .SH "SESSION PROGRAM"
+@@ -1237,8 +1237,8 @@ A sample \fIXreset\fP script:
+ \&	#
+ \&	# This program is run as root after the session ends
+ \&	#
+-	sessreg\0\-d\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME
+-	__projectroot__/lib/xdm/TakeConsole
++	sessreg\0\-d\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME
++	XDMDIR/TakeConsole
+ 	exit 0
+ .fi
+ .SH "CONTROLLING THE SERVER"
+@@ -1341,7 +1341,7 @@ interested in
+ .I xinit.
+ .SH FILES
+ .TP 20
+-.I __projectroot__/lib/X11/xdm/xdm-config
++.I XDMDIR/xdm-config
+ the default configuration file
+ .TP 20
+ .I $HOME/.Xauthority
+@@ -1359,7 +1359,7 @@ the default server
+ .I __projectroot__/bin/xterm
+ the default session program and failsafe client
+ .TP 20
+-.I __projectroot__/lib/X11/xdm/A<display>\-<suffix>
++.I XDMAUTHDIR/authdir/authfiles/A<display>\-<suffix>
+ the default place for authorization files
+ .TP 20
+ .I /tmp/K5C<display>
diff --git a/x11/xorg-libs/patches/patch-ao b/x11/xorg-libs/patches/patch-ao
new file mode 100644
index 00000000000..c2fca7d2147
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ao
@@ -0,0 +1,60 @@
+$NetBSD: patch-ao,v 1.3 2004/10/20 14:33:30 reed Exp $
+
+--- programs/xdm/config/Imakefile.orig	2004-07-26 23:24:47.000000000 -0700
++++ programs/xdm/config/Imakefile
+@@ -23,9 +23,9 @@ DEFAULTVT=vt7
+ # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm
+ #endif
+ 
+-CHOOSERPATH = $(XDMDIR)/chooser
++CHOOSERPATH = $(BINDIR)/chooser
+ 
+-XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\
++XPM_DEFINES=-DXPM -DBITMAPDIR=$(INCDIR)/X11/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\
+ 	-DXDM_BWPIXMAP=XdmbwPixmap
+ 
+ XDMLOGDIR = $(LOGDIRECTORY)
+@@ -42,21 +42,22 @@ SU = su
+ #endif
+ 
+ CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
+-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
++CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
+ CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
+ 
+ LinkFile(Xservers,Xservers.$(SERVERSTYPE))
+ 
+ #if InstallXdmConfig
+-InstallNonExecFile(xdm-config,$(XDMDIR))
+-InstallNonExecFile(Xresources,$(XDMDIR))
+-InstallNonExecFile(Xservers,$(XDMDIR))
+-InstallNonExecFile(Xaccess,$(XDMDIR))
+-InstallNamedProg(Xsession,Xsession,$(XDMDIR))
+-InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR))
+-InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR))
+-InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR))
+-InstallNamedProg(Xwilling,Xwilling,$(XDMDIR))
++XDMEGDIR = XdmEgDir
++InstallNonExecFile(xdm-config,$(XDMEGDIR))
++InstallNonExecFile(Xresources,$(XDMEGDIR))
++InstallNonExecFile(Xservers,$(XDMEGDIR))
++InstallNonExecFile(Xaccess,$(XDMEGDIR))
++InstallNamedProg(Xsession,Xsession,$(XDMEGDIR))
++InstallNamedProg(GiveConsole,GiveConsole,$(XDMEGDIR))
++InstallNamedProg(TakeConsole,TakeConsole,$(XDMEGDIR))
++InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMEGDIR))
++InstallNamedProg(Xwilling,Xwilling,$(XDMEGDIR))
+ #else
+ InstallNonExecFileNoClobber(xdm-config,$(XDMDIR))
+ InstallNonExecFileNoClobber(Xresources,$(XDMDIR))
+@@ -70,8 +71,8 @@ InstallNamedProgNoClobber(Xwilling,Xwill
+ #endif
+ 
+ #if InstallXdmConfig
+-InstallNonExecFile(XdmPixmap,$(XDMDIR)/pixmaps)
+-InstallNonExecFile(XdmbwPixmap,$(XDMDIR)/pixmaps)
++InstallNonExecFile(XdmPixmap,$(INCDIR)/X11/pixmaps)
++InstallNonExecFile(XdmbwPixmap,$(INCDIR)/X11/pixmaps)
+ #else
+ InstallNonExecFileNoClobber(XdmPixmap,$(XDMDIR)/pixmaps)
+ InstallNonExecFileNoClobber(XdmbwPixmap,$(XDMDIR)/pixmaps)
diff --git a/x11/xorg-libs/patches/patch-ap b/x11/xorg-libs/patches/patch-ap
new file mode 100644
index 00000000000..a78599115bc
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.3 2004/10/20 14:33:30 reed Exp $
+
+--- programs/xdm/config/xdm-conf.cpp.orig	2004-04-23 12:54:43.000000000 -0700
++++ programs/xdm/config/xdm-conf.cpp
+@@ -11,6 +11,7 @@ DisplayManager.keyFile:		XDMDIR/xdm-keys
+ DisplayManager.servers:		XDMDIR/Xservers
+ DisplayManager.accessFile:	XDMDIR/Xaccess
+ DisplayManager.willing:		SU nobody -c XDMDIR/Xwilling
++DisplayManager.authDir		XDMAUTHDIR
+ ! All displays should use authorization, but we cannot be sure
+ ! X terminals may not be configured that way, so they will require
+ ! individual resource settings.