cvs commit: ports/x11/wdm Makefile distinfo pkg-plist ports/x11/wdm/files patch-Login.c patch-ab patch-ad patch-ag patch-ai patch-al patch-am patch-an patch-configs::wdm-config.in patch-src::wdm::loghelpers.c

[Norikatsu Shigemura]

On Fri, 11 Jul 2003 13:57:17 -0700
Kris Kennaway <kris at obsecurity.org> wrote:
> On Fri, Jul 11, 2003 at 11:33:56AM -0700, Norikatsu Shigemura wrote:
> > nork        2003/07/11 11:33:56 PDT
> >   FreeBSD ports repository
> >   Modified files:
> >     x11/wdm              Makefile distinfo pkg-plist 
> >   Added files:
> >     x11/wdm/files        patch-configs::wdm-config.in 
> >                          patch-src::wdm::loghelpers.c 
> >   Removed files:
> >     x11/wdm/files        patch-Login.c patch-ab patch-ad patch-ag 
> >                          patch-ai patch-al patch-am patch-an 
> >   Log:
> >   Update to 1.25.
> Actually, when I tested this locally I ran into strange problems (and
> it doesn't work on sparc64), which is why I didn't commit it yet.
> Specifically, after logging in with wdm 1.25 I couldn't launch any
> local X clients, making the X experience somewhat limited.

	Hum.. My environment didn't causes this problem.  I checked
	with clean environment.  Yes.  There is a problem.  This is
	a different from `type' command in /usr/X11R6/lib/X11/wdm/Xclients.
	If you are ok, I'll commit following patch...

	I'll check on sparc64, now.

files/configs-Xclients.in
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- configs/Xclients.in.orig	Fri Jun  6 23:48:46 2003
+++ configs/Xclients.in	Sat Jul 12 06:55:35 2003
@@ -186,7 +186,7 @@
 # with both fvwm95 and fvwm2
 # (try fvwm95 first, then fvwm2).
 for FVWMVER in 95 95-2 2; do
-    if [ -n "$(type -path fvwm${FVWMVER})" ]; then
+    if [ -n "$(which fvwm${FVWMVER})" ]; then
         env > "$HOME"/Xrootenv.0
         # if this works, we stop here
         eval "exec fvwm${FVWMVER} ${FVWMOPTIONS}" > "$HOME"/.FVWM${FVWMVER}-errors 2>&1
@@ -195,7 +195,7 @@
 
 # gosh, neither fvwm95 nor fvwm2 is available;
 # let's try regular fvwm (AnotherLevel doesn't work with fvwm1).
-if [ -n "$(type -path fvwm)" ]; then
+if [ -n "$(which fvwm)" ]; then
     # if this works, we stop here
     exec fvwm
 fi
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -