From owner-cvs-ports@FreeBSD.ORG  Fri Jul 11 15:47:38 2003
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 713F137B401; Fri, 11 Jul 2003 15:47:38 -0700 (PDT)
Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 51CFF43F93; Fri, 11 Jul 2003 15:47:37 -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 h6BMlaBL023304; Sat, 12 Jul 2003 07:47:36 +0900 (JST) (envelope-from
	nork@FreeBSD.org)
Date: Sat, 12 Jul 2003 07:47:36 +0900 (JST)
Message-Id: <200307112247.h6BMlaBL023304@sakura.ninth-nine.com>
From: Norikatsu Shigemura <nork@FreeBSD.org>
To: Kris Kennaway <kris@obsecurity.org>
In-Reply-To: <20030711223048.GA55957@rot13.obsecurity.org>
References: <200307111833.h6BIXuou053972@repoman.freebsd.org>
	<20030711205717.GF54445@rot13.obsecurity.org>
	<200307112204.h6BM4NBL022714@sakura.ninth-nine.com>
	<20030711221355.GA55693@rot13.obsecurity.org>
	<200307112227.h6BMRWBL022791@sakura.ninth-nine.com>
	<20030711223048.GA55957@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-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jul 2003 22:47:39 -0000

On Fri, 11 Jul 2003 15:30:48 -0700
Kris Kennaway <kris@obsecurity.org> wrote:
> > 	Yes. I don't have, too.  wdm must fall back to twm&xterm.
> > 	I confirmed following stream:
> > 		wdm
> > 		/usr/X11R6/lib/X11/wdm/Xsession
> > 		~/.xsession			if you have
> > 		~/.Xclients			if you have
> > 		/usr/X11R6/lib/X11/wdm/Xclients	if system has
> > 		xsm				fall back
> I'll try it again when I get the chance..

	Humm.. Sorry, I noticed that wdm didn't depend on twm/xterm.
	Maybe I hope to fix....
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/wdm/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	11 Jul 2003 18:33:56 -0000	1.57
+++ Makefile	11 Jul 2003 22:37:20 -0000
@@ -19,6 +19,12 @@
 MAINTAINER=	kris@FreeBSD.org
 COMMENT=	WINGs Display Manager; an xdm replacement
 
+.include <bsd.port.pre.mk>
+.if defined(XFREE86_VERSION) && ${XFREE86_VERSION} == 3
+RUN_DEPENDS=	twm:${PORTSDIR}/x11/XFree86
+.else
+RUN_DEPENDS=	twm:${PORTSDIR}/x11/XFree86-4-clients
+.endif
 LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
 
 USE_BZIP2=	yes
@@ -50,8 +56,6 @@
 WDMDIR=		${PREFIX}/lib/X11/wdm
 
 DAEMONPICS=	beastie.xpm daemon1-HQ-1280x960.jpg
-
-.include <bsd.port.pre.mk>
 
 .if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM)
 WITH_PAM=	yes
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -