>Number:         26357
>Category:       xsrc
>Synopsis:       XFILESEARCHPATH should have /usr/pkg
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    xsrc-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 18 11:33:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Noriyuki Soda
>Release:        NetBSD 1.6.2
>Organization:
	Software Research Associates, Inc.
>Environment:
System: NetBSD boaz 1.6.2 NetBSD 1.6.2 (GENERIC_LAPTOP) #0: Tue Feb 10 22:02:37 UTC 2004 autobuild@tgm.netbsd.org:/autobuild/netbsd-1-6-PATCH002/i386/OBJ/autobuild/netbsd-1-6-PATCH002/src/sys/arch/i386/compile/GENERIC_LAPTOP i386
Architecture: i386
Machine: i386
>Description:
	Because xpkgwedge is now default in xpkgsrc, X11 applications
	should search /usr/pkg as well as /usr/X11R6 by default.

	Users can workaround this problem by setting 
		XFILESEARCHPATH=/usr/pkg/lib/X11/%L/%T/%N%C%S:/usr/pkg/lib/X11/%l/%T/%N%C%S:/usr/pkg/lib/X11/%T/%N%C%S:/usr/pkg/lib/X11/%L/%T/%N%S:/usr/pkg/lib/X11/%l/%T/%N%S:/usr/pkg/lib/X11/%T/%N%S:/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S
	(I guess only setting XAPPLRESDIR may have problem with
	 some applications.)
	But this is ugly and too much complicated, IMHO.

>How-To-Repeat:
	Let novice users install some X11 packages, and see
	they miss the installation message of xpkgwedge.

>Fix:
	apply the following patch.

	The reason why I put /usr/pkg before /usr/X11R6
	is because DefaultUserPath has /usr/pkg/bin before $(BINDIR).

Index: xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvsroot/xsrc/xc/config/cf/NetBSD.cf,v
retrieving revision 1.109
diff -c -r1.109 NetBSD.cf
*** xc/config/cf/NetBSD.cf	23 Dec 2003 16:30:20 -0000	1.109
--- xc/config/cf/NetBSD.cf	18 Jul 2004 11:13:09 -0000
***************
*** 949,951 ****
--- 949,957 ----
  #ifndef UseRgbTxt
  #define UseRgbTxt	NO
  #endif
+ 
+ /*
+  * for xpkgwedge
+  */
+ #define PackageBaseDir		/usr/pkg
+ #define XFileSearchPathDefault	Concat4(PackageBaseDir/%L/%T/%N%C,%S:PackageBaseDir/%l/%T/%N%C,%S:PackageBaseDir/%T/%N%C,%S:PackageBaseDir/%L/%T/%N%S:PackageBaseDir/%l/%T/%N%S:PackageBaseDir/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
Index: xfree/xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/config/cf/NetBSD.cf,v
retrieving revision 1.59
diff -c -r1.59 NetBSD.cf
*** xfree/xc/config/cf/NetBSD.cf	27 Dec 2003 08:46:58 -0000	1.59
--- xfree/xc/config/cf/NetBSD.cf	18 Jul 2004 11:13:10 -0000
***************
*** 747,749 ****
--- 747,755 ----
  #define HasDevRandom		YES
  #define RandomDeviceFile	/dev/urandom
  #endif
+ 
+ /*
+  * for xpkgwedge
+  */
+ #define PackageBaseDir		/usr/pkg
+ #define XFileSearchPathDefault	Concat4(PackageBaseDir/%L/%T/%N%C,%S:PackageBaseDir/%l/%T/%N%C,%S:PackageBaseDir/%T/%N%C,%S:PackageBaseDir/%L/%T/%N%S:PackageBaseDir/%l/%T/%N%S:PackageBaseDir/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
>Release-Note:
>Audit-Trail:
>Unformatted: