From owner-cvs-all@FreeBSD.ORG Fri Jul 11 15:04:25 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF40337B401; Fri, 11 Jul 2003 15:04:25 -0700 (PDT) Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E26843FB1; Fri, 11 Jul 2003 15:04:24 -0700 (PDT) (envelope-from nork@FreeBSD.org) Received: from nd250009.gab.xdsl.ne.jp (nadesico.ninth-nine.com [192.168.36.3]) by sakura.ninth-nine.com (8.12.9/8.12.9/NinthNine) with SMTP id h6BM4NBL022714; Sat, 12 Jul 2003 07:04:24 +0900 (JST) (envelope-from nork@FreeBSD.org) Date: Sat, 12 Jul 2003 07:04:23 +0900 (JST) Message-Id: <200307112204.h6BM4NBL022714@sakura.ninth-nine.com> From: Norikatsu Shigemura To: Kris Kennaway In-Reply-To: <20030711205717.GF54445@rot13.obsecurity.org> References: <200307111833.h6BIXuou053972@repoman.freebsd.org> <20030711205717.GF54445@rot13.obsecurity.org> X-Mailer: Sylpheed version 0.9.3 (GTK+ 1.2.10; i386-portbld-freebsd5.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit cc: cvs-ports@FreeBSD.org cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org Subject: Re: 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2003 22:04:26 -0000 On Fri, 11 Jul 2003 13:57:17 -0700 Kris Kennaway 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -