>Number:         18413
>Category:       pkg
>Synopsis:       x11/xkbset does not install with xpkgwedge installed
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 25 00:09:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Robert Elz
>Release:        NetBSD 1.6F pkgsrc of 20020924
>Organization:
	Prince of Songkla University
>Environment:
	
	
System: NetBSD fuchsia.cs.mu.OZ.AU 1.6F NetBSD 1.6F (FUCHSIA) #16: Sat Aug 24 14:26:40 ICT 2002 kre@fuchsia.cs.mu.OZ.AU:/usr/obj/sys/FUCHSIA i386
Architecture: i386
Machine: i386
>Description:
	x11/xkbset wants to install in /usr/X11R6 (X11BASE) regardless
	of whether xpkgwedge is installed or not.
>How-To-Repeat:
	Suck it and see.
>Fix:
	Replace patches/patch-aa with the following


--- Makefile.orig	Sun May 13 11:09:39 2001
+++ Makefile	Tue Sep 24 23:57:07 2002
@@ -1,10 +1,10 @@
 # The following are for XFree86 on FreeBSD
-INC_PATH=-I/usr/X11R6/include
-LIB_PATH=-L/usr/X11R6/lib
+INC_PATH=-I${X11BASE}/include
+LIB_PATH= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 LIBS=-lX11
 CC=cc ${INC_PATH} ${LIB_PATH} -Wall
-INSTALL_BIN=/usr/X11R6/bin
-INSTALL_MAN1=/usr/X11R6/man/man1
+INSTALL_BIN=${X11PREFIX}/bin
+INSTALL_MAN1=${X11PREFIX}/man/man1
 
 all: xkbset xkbset.1
 
>Release-Note:
>Audit-Trail:
>Unformatted: