Don't hard code path to xorg/bin/xterm, just expect it in PATH.

This affects startx, xinitrc and xdm. Bump revision.

5 files changed, 47 insertions, 5 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index aab085e7906..00b51b42e4b 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/02/12 15:29:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2006/02/14 15:54:55 joerg Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-clients-${XORG_VER}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz \
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index da603035dd5..56d58b5744d 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2006/02/01 20:21:59 joerg Exp $
+$NetBSD: distinfo,v 1.33 2006/02/14 15:54:55 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -10,6 +10,7 @@ SHA1 (X11R6.9.0-src3.tar.gz) = 0c8a0d6f9471ec022e12e2688d1991c985a1efb2
 RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
 Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
+SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
 SHA1 (patch-ac) = 682191f790eddb94917c486ec63818756fee8e8e
 SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a
 SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
@@ -17,7 +18,7 @@ SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
 SHA1 (patch-ag) = d300aa92052bdfe13e799223cf055c7955e7bb8f
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
-SHA1 (patch-aj) = 19133076565ce786f5d018abd054c3f1e6f96a06
+SHA1 (patch-aj) = 6d7db52f30f22e67576f591fd97f474bdd2f1550
 SHA1 (patch-ak) = c62ba3fe5ad42828e509e7e812a1c1b3fe32b211
 SHA1 (patch-al) = edfea125a835e564ba179a50b210f98d0f8e0402
 SHA1 (patch-am) = 9321d85cabb8b04b6bd236557f8f4e893d5559f6
@@ -31,6 +32,7 @@ SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd
 SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151
 SHA1 (patch-av) = bfcdb21557e8e6f8c24399ad0077b75d4a5215c6
 SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7
+SHA1 (patch-ax) = d0331ab8d2aa70930f541d6e6eea0d6028169a4c
 SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5
 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6
 SHA1 (patch-ba) = bf99c7ea9c07f048b8338f0a1f6b92e9f692879e
diff --git a/x11/xorg-libs/patches/patch-ab b/x11/xorg-libs/patches/patch-ab
new file mode 100644
index 00000000000..b6442ed6a4d
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/02/14 15:54:55 joerg Exp $
+
+--- programs/xinit/Imakefile.orig	2006-02-12 16:27:32.000000000 +0100
++++ programs/xinit/Imakefile
+@@ -50,7 +50,7 @@ ComplexProgramTarget_1(xinit,$(LOCAL_LIB
+         XMODMAP = $(BINDIR)/xmodmap
+             TWM = $(BINDIR)/twm
+          XCLOCK = $(BINDIR)/xclock
+-          XTERM = $(BINDIR)/xterm
++          XTERM = xterm
+         XSERVER = $(BINDIR)/X
+           XAUTH = $(BINDIR)/xauth
+           XINIT = $(BINDIR)/xinit
diff --git a/x11/xorg-libs/patches/patch-aj b/x11/xorg-libs/patches/patch-aj
index b81fd8df9f2..79fada2082f 100644
--- a/x11/xorg-libs/patches/patch-aj
+++ b/x11/xorg-libs/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.4 2006/01/20 17:53:32 xtraeme Exp $
+$NetBSD: patch-aj,v 1.5 2006/02/14 15:54:55 joerg Exp $
 
 --- programs/xdm/Imakefile.orig	2005-12-06 12:35:11.000000000 +0100
 +++ programs/xdm/Imakefile	2005-12-06 12:38:07.000000000 +0100
@@ -45,6 +45,20 @@ $NetBSD: patch-aj,v 1.4 2006/01/20 17:53:32 xtraeme Exp $
  
  XCOMM
  XCOMM Special definitions for compiling default resources; these parameters
+@@ -298,11 +307,11 @@ DEF_SYSTEM_PATH = DefaultSystemPath	/* i
+ BOURNE_SHELL = DefaultSystemShell
+ RES_DEFINES = '-DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"' \
+ 		  '-DXRDB_PROGRAM="$(BINDIR)/xrdb"' \
+-		  '-DDEF_SESSION="$(BINDIR)/xterm -ls"' \
++		  '-DDEF_SESSION="xterm -ls"' \
+ 		  '-DDEF_USER_PATH="$(DEF_USER_PATH)"' \
+ 		  '-DDEF_SYSTEM_PATH="$(DEF_SYSTEM_PATH)"' \
+ 		  '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
+-		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
++		  '-DDEF_FAILSAFE_CLIENT="xterm"' \
+ 		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
+ 		  '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
+ 		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
 @@ -331,7 +340,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES
  #if BuildChooser
  SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
diff --git a/x11/xorg-libs/patches/patch-ax b/x11/xorg-libs/patches/patch-ax
new file mode 100644
index 00000000000..bfbfa74fa04
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.3 2006/02/14 15:54:55 joerg Exp $
+
+--- programs/xdm/config/Xsession.cpp.orig	2006-02-12 16:32:25.000000000 +0100
++++ programs/xdm/config/Xsession.cpp
+@@ -18,7 +18,7 @@ case $# in
+ 1)
+ 	case $1 in
+ 	failsafe)
+-		exec BINDIR/xterm -geometry 80x24-0-0
++		exec xterm -geometry 80x24-0-0
+ 		;;
+ 	esac
+ esac