ports/87448: wdm Xsession script does not load Xresources

[Adrian Filipi]

>Number:         87448
>Category:       ports
>Synopsis:       wdm Xsession script does not load Xresources
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 17:00:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Adrian Filipi <adrian at ubergeeks.com>
>Release:        FreeBSD 6.0-RC1 i386
>Organization:
Ubergeeks Consulting
>Environment:
System: FreeBSD nsa.cs.virginia.edu 6.0-RC1 FreeBSD 6.0-RC1 #0: Sun Oct 9 20:32:57 UTC 2005 root at x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386

>Description:
	"xrdb" is missing from the Xsession script and causes user's
	.Xresources files not to be loaded.

>How-To-Repeat:
	Install wdm using the package found at
	ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-current/Latest/wdm.tbz

	Login and look in .xsession-errors for "-load: not found".

>Fix:

	Not sure, but it's probably in how the port is being
	configured.  Then again it could be how X11 is installed
	since I believe it references X11 configuration info through
	xmkmf or imake.

	In the end, this changes in the diff below are what should
	happen:


--- Xsession	Fri Aug  5 10:05:26 2005
+++ /usr/X11R6/lib/X11/wdm/Xsession	Fri Oct 14 11:20:42 2005
@@ -9,7 +9,7 @@
 # ~/.Xclients.
 
 # cleanup wdm resources
-         -load /dev/null
+        /usr/X11R6/bin/xrdb -load /dev/null
 
 
 case $# in
@@ -70,7 +70,7 @@
 resources=$HOME/.Xresources
 
 if [ -f $resources ]; then
-         -load $resources
+        /usr/X11R6/bin/xrdb -load $resources
 fi
 
 if [ -x $startup ]; then
>Release-Note:
>Audit-Trail:
>Unformatted: